diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-17 02:09:58 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-17 02:09:58 +0200 |
commit | b430ba51eb1df64c3386a824fe8fbddcc9c00ece (patch) | |
tree | f85b366ea817babd2bd2bc9055b79c32a56fbb3d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base | |
parent | bd8e45b55680d71190c5c565dc144dc5d940ea89 (diff) | |
download | open-keychain-b430ba51eb1df64c3386a824fe8fbddcc9c00ece.tar.gz open-keychain-b430ba51eb1df64c3386a824fe8fbddcc9c00ece.tar.bz2 open-keychain-b430ba51eb1df64c3386a824fe8fbddcc9c00ece.zip |
do nfc dispatching in MainActivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java | 4 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java index 0e752881f..847d76f30 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java @@ -44,7 +44,9 @@ public abstract class BaseActivity extends AppCompatActivity { initToolbar(); } - protected abstract void initLayout(); + protected void initLayout() { + + } protected void initToolbar() { mToolbar = (Toolbar) findViewById(R.id.toolbar); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java index d1101f35c..7ddde2fb7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java @@ -241,22 +241,18 @@ public abstract class BaseNfcActivity extends BaseActivity { KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(subKeyId)); long masterKeyId = ring.getMasterKeyId(); - Intent intent = new Intent( - BaseNfcActivity.this, ViewKeyActivity.class); + Intent intent = new Intent(this, ViewKeyActivity.class); intent.setData(KeyRings.buildGenericKeyRingUri(masterKeyId)); intent.putExtra(ViewKeyActivity.EXTRA_NFC_AID, nfcAid); intent.putExtra(ViewKeyActivity.EXTRA_NFC_USER_ID, nfcUserId); intent.putExtra(ViewKeyActivity.EXTRA_NFC_FINGERPRINTS, nfcFingerprints); startActivity(intent); - finish(); } catch (PgpKeyNotFoundException e) { - Intent intent = new Intent( - BaseNfcActivity.this, CreateKeyActivity.class); + Intent intent = new Intent(this, CreateKeyActivity.class); intent.putExtra(CreateKeyActivity.EXTRA_NFC_AID, nfcAid); intent.putExtra(CreateKeyActivity.EXTRA_NFC_USER_ID, nfcUserId); intent.putExtra(CreateKeyActivity.EXTRA_NFC_FINGERPRINTS, nfcFingerprints); startActivity(intent); - finish(); } } |