Merge pull request #1400 from open-keychain/keyserver-preference

Fixe Keyserver Preference crash on empty list

1 files changed, 6 insertions, 2 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsKeyserverFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsKeyserverFragment.java
index 20565aa7d..2ae64d90b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsKeyserverFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsKeyserverFragment.java
@@ -83,7 +83,6 @@ public class SettingsKeyserverFragment extends Fragment implements RecyclerItemC
 
         String keyservers[] = getArguments().getStringArray(ARG_KEYSERVER_ARRAY);
         mKeyservers = new ArrayList<>(Arrays.asList(keyservers));
-        saveKeyserverList(); // in case user does not make any changes
 
         mAdapter = new KeyserverListAdapter(mKeyservers);
 
@@ -146,7 +145,7 @@ public class SettingsKeyserverFragment extends Fragment implements RecyclerItemC
                         if (deleted) {
                             Notify.create(getActivity(),
                                     getActivity().getString(
-                                            R.string.keyserver_deleted, mKeyservers.get(position)),
+                                            R.string.keyserver_preference_deleted, mKeyservers.get(position)),
                                     Notify.Style.OK)
                                     .show();
                             deleteKeyserver(position);
@@ -222,6 +221,11 @@ public class SettingsKeyserverFragment extends Fragment implements RecyclerItemC
     }
 
     private void deleteKeyserver(int position) {
+        if (mKeyservers.size() == 1) {
+            Notify.create(getActivity(), R.string.keyserver_preference_cannot_delete_last,
+                    Notify.Style.ERROR).show();
+            return;
+        }
         mKeyservers.remove(position);
         // we use this
         mAdapter.notifyItemRemoved(position);