Catch exceptions when launching PDF viewer.

Closes #8
CDrummond · Feb 28, 2023 · 7219d4a · 7219d4a
1 parent 2c672b2
commit 7219d4a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/fastlane/metadata/android/en-US/changelogs/401.txt b/fastlane/metadata/android/en-US/changelogs/401.txt
@@ -0,0 +1,3 @@
+Fixed
+
+• Catch exceptions when launching PDF viewer.
diff --git a/lms-material/build.gradle b/lms-material/build.gradle
@@ -13,8 +13,8 @@ android {
         minSdkVersion 21
         // Need to target 28, or lower, to allow WiFi to be enabled...
         targetSdkVersion 28
-        versionCode  400
-        versionName "0.4.0"
+        versionCode  401
+        versionName "0.4.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/lms-material/src/main/java/com/craigd/lmsmaterial/app/MainActivity.java b/lms-material/src/main/java/com/craigd/lmsmaterial/app/MainActivity.java
@@ -642,7 +642,13 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 if (null!=path && path.toLowerCase().endsWith(".pdf")) {
                     intent.setDataAndType(uri, "application/pdf");
                 }
-                startActivity(intent);
+                try {
+                    startActivity(intent);
+                } catch (Exception e) {
+                    StyleableToast.makeText(getApplicationContext(),
+                            getApplicationContext().getResources().getString(R.string.no_termux_run_perms),
+                            Toast.LENGTH_SHORT, R.style.toast).show();
+                }
                 return true;
             }
 

diff --git a/lms-material/src/main/res/values/strings.xml b/lms-material/src/main/res/values/strings.xml
@@ -64,4 +64,5 @@
     <string name="menu_start_player_summary">Show an entry in the main menu to start chosen player app.</string>
     <string name="stopping_player">Stopping local player</string>
     <string name="no_termux_run_perms">Do not have permission to run Termux commands</string>
+    <string name="failed_start_activity">Failed to start activity</string>
 </resources>