diff --git a/android-refimpl-app/app/src/androidTest/java/com/zoffcc/applications/trifa/JavaFriendTester.java b/android-refimpl-app/app/src/androidTest/java/com/zoffcc/applications/trifa/JavaFriendTester.java index f1c268de3..93754079b 100644 --- a/android-refimpl-app/app/src/androidTest/java/com/zoffcc/applications/trifa/JavaFriendTester.java +++ b/android-refimpl-app/app/src/androidTest/java/com/zoffcc/applications/trifa/JavaFriendTester.java @@ -72,7 +72,6 @@ public class JavaFriendTester @Rule public GrantPermissionRule grantPermissionRule = GrantPermissionRule.grant(Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, - Manifest.permission.POST_NOTIFICATIONS, Manifest.permission.WRITE_EXTERNAL_STORAGE); private static Activity currentActivity = null; @@ -360,16 +359,6 @@ public void grant_permissions() ArrayList permissions = new ArrayList<>(); permissions.add(Manifest.permission.CAMERA); permissions.add(Manifest.permission.RECORD_AUDIO); - try - { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) - { - permissions.add(Manifest.permission.POST_NOTIFICATIONS); - } - } - catch(Exception e) - { - } permissions.add(Manifest.permission.WRITE_EXTERNAL_STORAGE); for (int i = 0; i < permissions.size(); i++) { diff --git a/android-refimpl-app/app/src/androidTest/java/com/zoffcc/applications/trifa/StartExportImportTest.java b/android-refimpl-app/app/src/androidTest/java/com/zoffcc/applications/trifa/StartExportImportTest.java index c2465afa0..1c172c079 100644 --- a/android-refimpl-app/app/src/androidTest/java/com/zoffcc/applications/trifa/StartExportImportTest.java +++ b/android-refimpl-app/app/src/androidTest/java/com/zoffcc/applications/trifa/StartExportImportTest.java @@ -72,7 +72,6 @@ public class StartExportImportTest @Rule public GrantPermissionRule grantPermissionRule = GrantPermissionRule.grant(Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO, - Manifest.permission.POST_NOTIFICATIONS, Manifest.permission.WRITE_EXTERNAL_STORAGE); private Activity currentActivity = null; @@ -450,16 +449,6 @@ public void grant_permissions() ArrayList permissions = new ArrayList<>(); permissions.add(Manifest.permission.CAMERA); permissions.add(Manifest.permission.RECORD_AUDIO); - try - { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) - { - permissions.add(Manifest.permission.POST_NOTIFICATIONS); - } - } - catch(Exception e) - { - } permissions.add(Manifest.permission.WRITE_EXTERNAL_STORAGE); for (int i = 0; i < permissions.size(); i++) { diff --git a/android-refimpl-app/app/src/androidTest/java/com/zoffcc/applications/trifa/StartMainActivityWrapperTest.java b/android-refimpl-app/app/src/androidTest/java/com/zoffcc/applications/trifa/StartMainActivityWrapperTest.java index 66fc156f3..9b3f5b3b6 100644 --- a/android-refimpl-app/app/src/androidTest/java/com/zoffcc/applications/trifa/StartMainActivityWrapperTest.java +++ b/android-refimpl-app/app/src/androidTest/java/com/zoffcc/applications/trifa/StartMainActivityWrapperTest.java @@ -2,6 +2,7 @@ import android.Manifest; import android.app.Activity; +import android.app.UiAutomation; import android.content.Context; import android.content.SharedPreferences; import android.os.Build; @@ -71,10 +72,11 @@ public class StartMainActivityWrapperTest StartMainActivityWrapper.class); // @Rule - public GrantPermissionRule grantPermissionRule = GrantPermissionRule.grant(Manifest.permission.CAMERA, - Manifest.permission.RECORD_AUDIO, - Manifest.permission.POST_NOTIFICATIONS, - Manifest.permission.WRITE_EXTERNAL_STORAGE); + public GrantPermissionRule grantPermissionRule = + GrantPermissionRule.grant(Manifest.permission.CAMERA, + Manifest.permission.RECORD_AUDIO, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ); private Activity currentActivity = null; @Test @@ -441,16 +443,6 @@ public void grant_permissions() ArrayList permissions = new ArrayList<>(); permissions.add(Manifest.permission.CAMERA); permissions.add(Manifest.permission.RECORD_AUDIO); - try - { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) - { - permissions.add(Manifest.permission.POST_NOTIFICATIONS); - } - } - catch(Exception e) - { - } permissions.add(Manifest.permission.WRITE_EXTERNAL_STORAGE); for (int i = 0; i < permissions.size(); i++) {