diff --git a/App/build.gradle b/App/build.gradle index 3366e67..bb710da 100644 --- 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 index 87d020e..67b12b6 100644 --- a/App/src/main/AndroidManifest.xml +++ b/App/src/main/AndroidManifest.xml @@ -25,8 +25,10 @@ - - + + - diff --git a/App/src/main/java/com/threethan/browser/browser/GeckoView/Delegate/ExtensionPromptDelegate.java b/App/src/main/java/com/threethan/browser/browser/GeckoView/Delegate/ExtensionPromptDelegate.java index 19ad5cc..d43327f 100644 --- a/App/src/main/java/com/threethan/browser/browser/GeckoView/Delegate/ExtensionPromptDelegate.java +++ b/App/src/main/java/com/threethan/browser/browser/GeckoView/Delegate/ExtensionPromptDelegate.java @@ -33,6 +33,24 @@ public GeckoResult onInstallPrompt(@NonNull WebExtension extension) return GeckoResult.fromValue(AllowOrDeny.ALLOW); } + @Nullable + @Override + public GeckoResult onInstallPrompt(@NonNull WebExtension extension, @NonNull String[] permissions, @NonNull String[] origins) { + return GeckoResult.fromValue(AllowOrDeny.ALLOW); + } + + @Nullable + @Override + public GeckoResult onOptionalPrompt(@NonNull WebExtension extension, @NonNull String[] permissions, @NonNull String[] origins) { + return GeckoResult.fromValue(AllowOrDeny.ALLOW); + } + + @Nullable + @Override + public GeckoResult 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 index 160b5fc..60d17d9 100644 --- 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