diff --git a/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTest.java b/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTest.java index d4566bca..001facd6 100644 --- a/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTest.java +++ b/app/src/androidTest/java/com/beemdevelopment/aegis/AegisTest.java @@ -1,7 +1,5 @@ package com.beemdevelopment.aegis; -import android.Manifest; -import android.os.Build; import android.view.View; import androidx.annotation.Nullable; @@ -64,9 +62,10 @@ public abstract class AegisTest { private static GrantPermissionRule getGrantPermissionRule() { List perms = new ArrayList<>(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + // NOTE: Disabled for now. See issue: #1047 + /*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { perms.add(Manifest.permission.POST_NOTIFICATIONS); - } + }*/ return GrantPermissionRule.grant(perms.toArray(new String[0])); } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5a6616bf..5ede274d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,7 +4,10 @@ + + + = Build.VERSION_CODES.O) { + // NOTE: Disabled for now. See issue: #1047 + /*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { initNotificationChannels(); - } + }*/ } @RequiresApi(api = Build.VERSION_CODES.N_MR1) diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java index 4be95a03..53640bb2 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java @@ -1,6 +1,5 @@ package com.beemdevelopment.aegis.ui; -import android.Manifest; import android.content.Context; import android.content.Intent; import android.os.Build; @@ -32,7 +31,6 @@ import com.beemdevelopment.aegis.crypto.MasterKey; import com.beemdevelopment.aegis.helpers.BiometricsHelper; import com.beemdevelopment.aegis.helpers.EditTextHelper; import com.beemdevelopment.aegis.helpers.MetricsHelper; -import com.beemdevelopment.aegis.helpers.PermissionHelper; import com.beemdevelopment.aegis.helpers.UiThreadExecutor; import com.beemdevelopment.aegis.ui.dialogs.Dialogs; import com.beemdevelopment.aegis.ui.tasks.PasswordSlotDecryptTask; @@ -97,9 +95,11 @@ public class AuthActivity extends AegisActivity { // A persistent notification is shown to let the user know that the vault is unlocked. Permission // to do so is required since API 33, so for existing users, we have to request permission here // in order to be able to show the notification after unlock. - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + // + // NOTE: Disabled for now. See issue: #1047 + /*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { PermissionHelper.request(this, CODE_PERM_NOTIFICATIONS, Manifest.permission.POST_NOTIFICATIONS); - } + }*/ } else { _inhibitBioPrompt = savedInstanceState.getBoolean("inhibitBioPrompt", false); } diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/IntroActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/IntroActivity.java index 520ddbeb..8ab26fe8 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ui/IntroActivity.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ui/IntroActivity.java @@ -5,8 +5,6 @@ import static com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide.CRYPT_TYPE import static com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide.CRYPT_TYPE_NONE; import static com.beemdevelopment.aegis.ui.slides.SecurityPickerSlide.CRYPT_TYPE_PASS; -import android.Manifest; -import android.os.Build; import android.os.Bundle; import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; @@ -16,7 +14,6 @@ import androidx.annotation.Nullable; import com.beemdevelopment.aegis.R; import com.beemdevelopment.aegis.ThemeMap; -import com.beemdevelopment.aegis.helpers.PermissionHelper; import com.beemdevelopment.aegis.ui.dialogs.Dialogs; import com.beemdevelopment.aegis.ui.intro.IntroBaseActivity; import com.beemdevelopment.aegis.ui.intro.SlideFragment; @@ -80,11 +77,13 @@ public class IntroActivity extends IntroBaseActivity { protected void onAfterSlideChanged(@Nullable Class oldSlide, @NonNull Class newSlide) { // If the user has enabled encryption, we need to request permission to show notifications // in order to be able to show the "Vault unlocked" notification. - if (newSlide == DoneSlide.class && getState().getSerializable("creds") != null) { + // + // NOTE: Disabled for now. See issue: #1047 + /*if (newSlide == DoneSlide.class && getState().getSerializable("creds") != null) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { PermissionHelper.request(this, CODE_PERM_NOTIFICATIONS, Manifest.permission.POST_NOTIFICATIONS); } - } + }*/ } @Override diff --git a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultManager.java b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultManager.java index 61cdc970..1a70396f 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/vault/VaultManager.java +++ b/app/src/main/java/com/beemdevelopment/aegis/vault/VaultManager.java @@ -1,6 +1,5 @@ package com.beemdevelopment.aegis.vault; -import android.Manifest; import android.app.Activity; import android.app.backup.BackupManager; import android.content.ActivityNotFoundException; @@ -15,7 +14,6 @@ import com.beemdevelopment.aegis.Preferences; import com.beemdevelopment.aegis.R; import com.beemdevelopment.aegis.crypto.KeyStoreHandle; import com.beemdevelopment.aegis.crypto.KeyStoreHandleException; -import com.beemdevelopment.aegis.helpers.PermissionHelper; import com.beemdevelopment.aegis.services.NotificationService; import com.beemdevelopment.aegis.ui.dialogs.Dialogs; @@ -351,13 +349,15 @@ public class VaultManager { } private void startNotificationService() { - if (PermissionHelper.granted(_context, Manifest.permission.POST_NOTIFICATIONS)) { + // NOTE: Disabled for now. See issue: #1047 + /*if (PermissionHelper.granted(_context, Manifest.permission.POST_NOTIFICATIONS)) { _context.startService(getNotificationServiceIntent()); - } + }*/ } private void stopNotificationService() { - _context.stopService(getNotificationServiceIntent()); + // NOTE: Disabled for now. See issue: #1047 + //_context.stopService(getNotificationServiceIntent()); } private Intent getNotificationServiceIntent() {