Merge branch 'devel' of https://github.com/henrichg/PhoneProfilesPlus

henrichg · Jul 20, 2024 · 486d349 · 486d349
2 parents 9327faf + 54bdd93
commit 486d349
Showing 1 changed file with 22 additions and 12 deletions.
diff --git a/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PreferenceAllowed.java b/phoneProfilesPlus/src/main/java/sk/henrichg/phoneprofilesplus/PreferenceAllowed.java
@@ -2622,20 +2622,30 @@ static void isProfilePreferenceAllowed_PREF_PROFILE_SOUND_NOTIFICATION_CHANGE_SI
                                 preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
                                 preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_SETTINGS_NOT_FOUND;
                             }
-                        } else
-                        if ((!rootRequired) && ppppsInstalled) {
-                            if (profile != null) {
-                                if ((profile._soundNotificationChangeSIM1 != 0) ||
-                                        (profile._soundNotificationChangeSIM2 != 0))
-                                    preferenceAllowed.allowed = PREFERENCE_ALLOWED;
-                            } else
-                                preferenceAllowed.allowed = PREFERENCE_ALLOWED;
                         } else {
-                            if (profile != null) {
-                                preferenceAllowed.notAllowedPPPPS = true;
+                            if (rootRequired) {
+                                preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                                preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_ROOTED;
+                            } else {
+                                if (ppppsInstalled) {
+                                    if (profile != null) {
+                                        if ((profile._soundNotificationChangeSIM1 != 0) ||
+                                                (profile._soundNotificationChangeSIM2 != 0))
+                                            preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                                    } else
+                                        preferenceAllowed.allowed = PREFERENCE_ALLOWED;
+                                }
+                                else {
+                                    if (profile != null) {
+                                        if ((profile._soundNotificationChangeSIM1 != 0) ||
+                                                (profile._soundNotificationChangeSIM2 != 0)) {
+                                            preferenceAllowed.notAllowedPPPPS = true;
+                                        }
+                                    }
+                                    preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
+                                    preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_INSTALLED_PPPPS;
+                                }
                             }
-                            preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;
-                            preferenceAllowed.notAllowedReason = PREFERENCE_NOT_ALLOWED_NOT_INSTALLED_PPPPS;
                         }
                     } else {
                         preferenceAllowed.allowed = PREFERENCE_NOT_ALLOWED;