Эх сурвалжийг харах

hide e2e options after removing local e2e setup

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 2 жил өмнө
parent
commit
f49252c87e

+ 8 - 2
app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java

@@ -447,7 +447,9 @@ public class SettingsActivity extends PreferenceActivity
         Preference preference = findPreference("setup_e2e_keys_exist");
         Preference preference = findPreference("setup_e2e_keys_exist");
 
 
         if (preference != null) {
         if (preference != null) {
-            if (!CapabilityUtils.getCapability(this).getEndToEndEncryptionKeysExist().isTrue()) {
+            if (!CapabilityUtils.getCapability(this).getEndToEndEncryptionKeysExist().isTrue() ||
+                (CapabilityUtils.getCapability(this).getEndToEndEncryptionKeysExist().isTrue() &&
+                    FileOperationsHelper.isEndToEndEncryptionSetup(this, user))) {
                 preferenceCategoryMore.removePreference(preference);
                 preferenceCategoryMore.removePreference(preference);
             } else {
             } else {
                 preference.setOnPreferenceClickListener(p -> {
                 preference.setOnPreferenceClickListener(p -> {
@@ -501,10 +503,14 @@ public class SettingsActivity extends PreferenceActivity
                         .setCancelable(true)
                         .setCancelable(true)
                         .setNegativeButton(R.string.common_cancel, ((dialog, i) -> dialog.dismiss()))
                         .setNegativeButton(R.string.common_cancel, ((dialog, i) -> dialog.dismiss()))
                         .setPositiveButton(R.string.confirm_removal, (dialog, which) -> {
                         .setPositiveButton(R.string.confirm_removal, (dialog, which) -> {
-                            // do something
                             EncryptionUtils.removeE2E(arbitraryDataProvider, user);
                             EncryptionUtils.removeE2E(arbitraryDataProvider, user);
                             preferenceCategoryMore.removePreference(preference);
                             preferenceCategoryMore.removePreference(preference);
 
 
+                            Preference pMnemonic = findPreference("mnemonic");
+                            if (pMnemonic != null) {
+                                preferenceCategoryMore.removePreference(pMnemonic);
+                            }
+
                             dialog.dismiss();
                             dialog.dismiss();
                         })
                         })
                         .create();
                         .create();