aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-05-05 14:29:56 +0300
committerDominik Schürmann <dominik@dominikschuermann.de>2016-05-05 14:29:56 +0300
commit4278aa1bf1614d8b41e240a4f99328f85202041b (patch)
tree6d5e2754465cc5c9ad3b33fc4e446a7c7377dfa3
parent6cf3e4c89123284b58796cd7e348799b70fac02e (diff)
downloadopen-keychain-4278aa1bf1614d8b41e240a4f99328f85202041b.tar.gz
open-keychain-4278aa1bf1614d8b41e240a4f99328f85202041b.tar.bz2
open-keychain-4278aa1bf1614d8b41e240a4f99328f85202041b.zip
Revert "Added warning dialog for importing keys"
This reverts commit 9d35dcb0e924a7f8afcfcaa86752efb40799a456. Conflicts: OpenKeychain/src/main/res/values/strings.xml
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java27
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml2
2 files changed, 0 insertions, 29 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 6b3e12761..7d2d30c35 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -18,7 +18,6 @@
package org.sufficientlysecure.keychain.ui;
import android.app.Activity;
-import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
@@ -39,7 +38,6 @@ import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
import org.sufficientlysecure.keychain.ui.base.BaseActivity;
import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
-import org.sufficientlysecure.keychain.ui.dialog.CustomAlertDialogBuilder;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.ui.util.Notify;
import org.sufficientlysecure.keychain.util.Log;
@@ -344,31 +342,6 @@ public class ImportKeysActivity extends BaseActivity
return;
}
- showWarningDialog();
- }
-
- private void showWarningDialog() {
- CustomAlertDialogBuilder warningDialog = new CustomAlertDialogBuilder(this);
- warningDialog.setTitle(R.string.import_warning_title).
- setMessage(R.string.import_warning).setCancelable(true);
- warningDialog.setPositiveButton(R.string.btn_import, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int i) {
- executeImport();
- }
- });
- warningDialog.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int i) {
- }
- });
- warningDialog.show();
- }
-
- private void executeImport() {
- FragmentManager fragMan = getSupportFragmentManager();
- ImportKeysListFragment keyListFragment = (ImportKeysListFragment) fragMan.findFragmentByTag(TAG_FRAG_LIST);
-
mOperationHelper = new CryptoOperationHelper<>(
1, this, this, R.string.progress_importing
);
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 07d2dc8db..2a44307f8 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -526,8 +526,6 @@
<string name="import_qr_code_too_short_fingerprint">"Fingerprint is too short!"</string>
<string name="import_qr_code_button">"Scan QR Code"</string>
<string name="import_qr_code_text">"Place your camera over the QR Code!"</string>
- <string name="import_warning_title">"Warning"</string>
- <string name="import_warning">"Import will overwrite existing keys that have the same IDs!"</string>
<!-- Import from URL -->
<string name="import_url_warn_no_search_parameter">"No search query defined. You can still manually search on this keyserver."</string>