diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index c6795d9f7..7247077d9 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -726,6 +726,16 @@ + + + + @@ -741,11 +751,9 @@ - - + + . + */ + +package org.sufficientlysecure.keychain.ui; + +import android.content.DialogInterface; +import android.content.Intent; +import android.os.Bundle; +import android.support.v7.app.AlertDialog; + + +import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.ui.base.BaseActivity; + +public class RedirectImportKeysActivity extends BaseActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + startQrCodeCaptureActivity(); + } + + private void startQrCodeCaptureActivity() { + final Intent intent = new Intent(this, QrCodeCaptureActivity.class); + + new AlertDialog.Builder(this) + .setTitle(R.string.redirect_import_key_title) + .setMessage(R.string.redirect_import_key_message) + .setPositiveButton(R.string.redirect_import_key_yes, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + // intent directly to ImportKeyChain activity + startActivity(intent); + finish(); + } + }) + .setNegativeButton(R.string.redirect_import_key_no, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + // close window + finish(); + } + }) + .setIcon(android.R.drawable.ic_dialog_alert) + .show(); + } +} \ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index e322baebd..387522fc1 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1752,4 +1752,9 @@ 50 EUR 100 EUR + "Import key attempt" + "You scanned a fingerprint with another app, please scan with Openkeychain directly to be safe" + "Scan again" + "Close" + "Key import redirection"