Merge branch 'dev' into release

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.fongmi.android.tv"
         minSdk 21
         targetSdk 33
-        versionCode 48
-        versionName "1.4.8"
+        versionCode 49
+        versionName "1.4.9"
         ndk { abiFilters "armeabi-v7a" }
     }
 

app/src/main/java/com/fongmi/android/tv/api/JarLoader.java

@@ -93,7 +93,7 @@ public class JarLoader {
             spider.init(App.get(), ext);
             spiders.put(spKey, spider);
             return spider;
-        } catch (Exception e) {
+        } catch (Throwable e) {
             e.printStackTrace();
             return new SpiderNull();
         }

app/src/main/java/com/fongmi/android/tv/api/JsLoader.java

@@ -23,7 +23,7 @@ public class JsLoader {
     private void init() {
         try {
             new Loader().init(App.get());
-        } catch (Exception e) {
+        } catch (Throwable e) {
             e.printStackTrace();
         }
     }
@@ -35,7 +35,7 @@ public class JsLoader {
             spider.init(App.get(), ext);
             spiders.put(key, spider);
             return spider;
-        } catch (Exception e) {
+        } catch (Throwable e) {
             e.printStackTrace();
             return null;
         }

app/src/main/java/com/fongmi/android/tv/api/PyLoader.java

@@ -26,7 +26,7 @@ public class PyLoader {
     private void init() {
         try {
             loader = Class.forName("com.undcover.freedom.pyramid.Loader").newInstance();
-        } catch (Exception e) {
+        } catch (Throwable e) {
             e.printStackTrace();
         }
     }
@@ -39,7 +39,7 @@ public class PyLoader {
             spider.init(App.get(), ext);
             spiders.put(key, spider);
             return spider;
-        } catch (Exception e) {
+        } catch (Throwable e) {
             e.printStackTrace();
             return new SpiderNull();
         }

app/src/main/java/com/fongmi/android/tv/api/Updater.java

@@ -99,7 +99,7 @@ public class Updater implements View.OnClickListener {
 
     private void checkActivity(String version, String desc) {
         if (dialog != null) dialog.dismiss();
-        if (activity.get().isFinishing()) install();
+        if (activity.get() == null || activity.get().isFinishing()) install();
         else showDialog(version, desc);
     }
 

drpy/src/main/java/com/hiker/drpy/Loader.java

@@ -8,7 +8,10 @@ import com.whl.quickjs.wrapper.JSModule;
 public class Loader {
 
     static {
-        QuickJSLoader.init();
+        try {
+            QuickJSLoader.init();
+        } catch (Throwable ignored) {
+        }
     }
 
     public void init(Context context) {