Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into warn-when-stripping-master-key

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyDialogFragment.java

@@ -75,7 +75,22 @@ public class EditSubkeyDialogFragment extends DialogFragment {
                         sendMessageToHandler(MESSAGE_REVOKE, null);
                         break;
                     case 2:
-                        sendMessageToHandler(MESSAGE_STRIP, null);
+                        CustomAlertDialogBuilder stripAlertDialog = new CustomAlertDialogBuilder(getActivity());
+                        stripAlertDialog.setTitle(getResources().getString(R.string.title_alert_strip)).
+                        setMessage(R.string.alert_strip).setCancelable(true);
+                        stripAlertDialog.setPositiveButton(R.string.strip, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+                                sendMessageToHandler(MESSAGE_STRIP, null);
+                            }
+                        });
+                        stripAlertDialog.setNegativeButton(R.string.btn_do_not_save, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+                                dismiss();
+                            }
+                        });
+                        stripAlertDialog.show();
                         break;
                     case 3:
                         sendMessageToHandler(MESSAGE_MOVE_KEY_TO_CARD, null);

OpenKeychain/src/main/res/values/strings.xml

@@ -40,6 +40,7 @@
     <string name="title_advanced_key_info">"Advanced"</string>
     <string name="title_delete_secret_key">"Delete YOUR key '%s'?"</string>
     <string name="title_manage_my_keys">"Manage my keys"</string>
+    <string name="title_alert_strip">"Strip this Subkey"</string>
 
     <!-- section -->
     <string name="section_user_ids">"Identities"</string>
@@ -292,6 +293,7 @@
     <string name="error_message">"Error: %s"</string>
     <string name="theme_dark">"Dark"</string>
     <string name="theme_light">"Light"</string>
+    <string name="strip">"Strip it"</string>
 
     <!-- key flags -->
     <string name="flag_certify">"Certify"</string>
@@ -332,6 +334,7 @@
     <string name="public_key_deletetion_confirmation">"Delete key '%s'?"</string>
     <string name="also_export_secret_keys">"Also export secret keys"</string>
     <string name="reinstall_openkeychain">"You encountered a known bug with Android. Please reinstall OpenKeychain if you want to link your contacts with keys."</string>
+    <string name="alert_strip">"Stripping this Subkey will render it useless."</string>
 
     <string name="key_exported">"Successfully exported 1 key."</string>
     <string name="keys_exported">"Successfully exported %d keys."</string>