cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prevent deletion of last keyserver in preference

Browse Source
This commit is contained in:
Adithya Abraham Philip
2015-07-02 05:43:23 +05:30
parent 3510275a7f
commit 7b5c35ee87
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsKeyserverFragment.java
View File

@@ -45,7 +45,6 @@ import org.sufficientlysecure.keychain.ui.util.recyclerview.ItemTouchHelperViewH
import org.sufficientlysecure.keychain.ui.util.recyclerview.ItemTouchHelperDragCallback; import org.sufficientlysecure.keychain.ui.util.recyclerview.ItemTouchHelperDragCallback;
import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.ui.util.Notify;
import org.sufficientlysecure.keychain.ui.util.recyclerview.RecyclerItemClickListener; import org.sufficientlysecure.keychain.ui.util.recyclerview.RecyclerItemClickListener;
import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.Preferences; import org.sufficientlysecure.keychain.util.Preferences;
import java.util.ArrayList; import java.util.ArrayList;
@@ -146,7 +145,7 @@ public class SettingsKeyserverFragment extends Fragment implements RecyclerItemC
if (deleted) { if (deleted) {
Notify.create(getActivity(), Notify.create(getActivity(),
getActivity().getString( getActivity().getString(
R.string.keyserver_deleted, mKeyservers.get(position)), R.string.keyserver_preference_deleted, mKeyservers.get(position)),
Notify.Style.OK) Notify.Style.OK)
.show(); .show();
deleteKeyserver(position); deleteKeyserver(position);
@@ -222,6 +221,11 @@ public class SettingsKeyserverFragment extends Fragment implements RecyclerItemC
} }
private void deleteKeyserver(int position) { 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); mKeyservers.remove(position);
// we use this // we use this
mAdapter.notifyItemRemoved(position); mAdapter.notifyItemRemoved(position);

3
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -685,7 +685,8 @@
<string name="add_keyserver_without_verification">"Keyserver added without verification."</string> <string name="add_keyserver_without_verification">"Keyserver added without verification."</string>
<string name="add_keyserver_invalid_url">"Invalid URL!"</string> <string name="add_keyserver_invalid_url">"Invalid URL!"</string>
<string name="add_keyserver_connection_failed">"Failed to connect to keyserver. Please check the URL and your internet connection."</string> <string name="add_keyserver_connection_failed">"Failed to connect to keyserver. Please check the URL and your internet connection."</string>
<string name="keyserver_deleted">"%s deleted"</string> <string name="keyserver_preference_deleted">"%s deleted"</string>
<string name="keyserver_preference_cannot_delete_last">"Cannot delete last keyserver. At least one is required!"</string>
<!-- Navigation Drawer --> <!-- Navigation Drawer -->
<string name="nav_keys">"Keys"</string> <string name="nav_keys">"Keys"</string>