diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-29 21:32:21 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-29 21:32:21 +0200 |
| commit | 0b16a4edfd102972b48b96b4de1ce30e029a47b5 (patch) | |
| tree | bb4c3df979f22325995dacaced7cfbb1ff1ba2ac /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui | |
| parent | 7f547afe42da896697ae605dbfb6e4734ac42c36 (diff) | |
| parent | f7fe236bd535e62f60a7f76768b7455ef102255e (diff) | |
| download | open-keychain-0b16a4edfd102972b48b96b4de1ce30e029a47b5.tar.gz open-keychain-0b16a4edfd102972b48b96b4de1ce30e029a47b5.tar.bz2 open-keychain-0b16a4edfd102972b48b96b4de1ce30e029a47b5.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
OpenKeychain/src/main/AndroidManifest.xml
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
3 files changed, 2 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java index dd035c78f..c4c6c383e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java @@ -97,7 +97,6 @@ public abstract class DecryptFragment extends Fragment { intent.putExtra(NfcActivity.EXTRA_PIN, pin); intent.putExtra(NfcActivity.EXTRA_NFC_ENC_SESSION_KEY, encryptedSessionKey); - intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP); startActivityForResult(intent, REQUEST_CODE_NFC_DECRYPT); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java index 9a41f4fbc..58bbcb4f5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java @@ -40,7 +40,6 @@ public abstract class EncryptActivity extends DrawerActivity { intent.putExtra(NfcActivity.EXTRA_PIN, pin); intent.putExtra(NfcActivity.EXTRA_NFC_HASH_TO_SIGN, hashToSign); intent.putExtra(NfcActivity.EXTRA_NFC_HASH_ALGO, hashAlgo); - intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP); startActivityForResult(intent, REQUEST_CODE_NFC); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java index 7aa09e801..20283fc96 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcActivity.java @@ -111,9 +111,8 @@ public class NfcActivity extends ActionBarActivity { Log.d(Constants.TAG, "NfcActivity mEncryptedSessionKey as hex: " + getHex(mEncryptedSessionKey)); Log.d(Constants.TAG, "NfcActivity mServiceIntent: " + mServiceIntent.toString()); } else if (NfcAdapter.ACTION_TAG_DISCOVERED.equals(action)) { - Log.e(Constants.TAG, "This should not happen, but there is a bug in Android!"); - - toast("This should not happen, but there is a bug in Android! Clear all app tasks and start app from launcher again!"); + Log.e(Constants.TAG, "This should not happen! NfcActivity.onCreate() is being called instead of onNewIntent()!"); + toast("This should not happen! Please create a new bug report that the NFC screen is restarted!"); finish(); } else { Log.d(Constants.TAG, "Action not supported: " + action); |