Fix: Extensions would not install correctly

threethan · Oct 14, 2024 · 95f6f7c · 95f6f7c
1 parent ffc28a2
commit 95f6f7c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/App/build.gradle b/App/build.gradle
@@ -4,14 +4,14 @@ android {
     defaultConfig {
         compileSdk 34
         minSdkVersion 23
-        versionCode 1200
-        versionName "1.2.0"
+        versionCode 1210
+        versionName "1.2.1"
 
         ndk {
             //noinspection ChromeOsAbiSupport
-            abiFilters "arm64-v8a"
+//            abiFilters "arm64-v8a"
             //noinspection ChromeOsAbiSupport
-//            abiFilters "armeabi-v7a"
+            abiFilters "armeabi-v7a"
             // Note: On x86/x86_64 geckoview can crash erratically
         }
     }

diff --git a/App/src/main/AndroidManifest.xml b/App/src/main/AndroidManifest.xml
@@ -25,8 +25,10 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE"
+        tools:ignore="SystemPermissionTypo" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"
+        tools:ignore="SystemPermissionTypo" />
 
     <application
         android:icon="@drawable/ic_app_icon"
@@ -132,7 +134,6 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
         </provider>
-
     </application>
 
 </manifest>
diff --git a/...c/main/java/com/threethan/browser/browser/GeckoView/Delegate/ExtensionPromptDelegate.java b/...c/main/java/com/threethan/browser/browser/GeckoView/Delegate/ExtensionPromptDelegate.java
@@ -33,6 +33,24 @@ public GeckoResult<AllowOrDeny> onInstallPrompt(@NonNull WebExtension extension)
         return GeckoResult.fromValue(AllowOrDeny.ALLOW);
     }
 
+    @Nullable
+    @Override
+    public GeckoResult<AllowOrDeny> onInstallPrompt(@NonNull WebExtension extension, @NonNull String[] permissions, @NonNull String[] origins) {
+        return GeckoResult.fromValue(AllowOrDeny.ALLOW);
+    }
+
+    @Nullable
+    @Override
+    public GeckoResult<AllowOrDeny> onOptionalPrompt(@NonNull WebExtension extension, @NonNull String[] permissions, @NonNull String[] origins) {
+        return GeckoResult.fromValue(AllowOrDeny.ALLOW);
+    }
+
+    @Nullable
+    @Override
+    public GeckoResult<AllowOrDeny> onUpdatePrompt(@NonNull WebExtension currentlyInstalled, @NonNull WebExtension updatedExtension, @NonNull String[] newPermissions, @NonNull String[] newOrigins) {
+        return GeckoResult.fromValue(AllowOrDeny.ALLOW);
+    }
+
     public void showList() {
 
         final Activity activity = Dialog.getActivityContext();

diff --git a/App/src/main/java/com/threethan/browser/updater/AppUpdater.java b/App/src/main/java/com/threethan/browser/updater/AppUpdater.java
@@ -94,8 +94,10 @@ private void showAppUpdateDialog(String currentVersion, String newVersion) {
 
             updateDialogBuilder.setPositiveButton(R.string.update_button, (dialog, which) ->
                     downloadPackage(getAppPackage(newVersion)));
-            updateDialogBuilder.setNegativeButton(R.string.update_skip_button, (dialog, which) ->
-                    skipAppUpdate(newVersion));
+            updateDialogBuilder.setNegativeButton(R.string.update_skip_button, (dialog, which) -> {
+                dialog.dismiss();
+                skipAppUpdate(newVersion);
+            });
 
             updateDialogBuilder.show();
         } catch (Exception ignored) {} // This is not critical, and may fail if the launcher window isn't visible