diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2016-01-05 20:33:37 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2016-01-05 20:33:37 +0100 |
| commit | e0f8d078629dcd04dced3a59bc45209b27a27b8b (patch) | |
| tree | 936cb04053294ba88243331d8bd92b5a7a4bbe79 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |
| parent | b09336574769ea4098a29d52fa8cd4303b1f0500 (diff) | |
| download | open-keychain-e0f8d078629dcd04dced3a59bc45209b27a27b8b.tar.gz open-keychain-e0f8d078629dcd04dced3a59bc45209b27a27b8b.tar.bz2 open-keychain-e0f8d078629dcd04dced3a59bc45209b27a27b8b.zip | |
(fix accidental use of api level 23 method)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index 4de89d859..e379831c1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -931,7 +931,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements mStatusImage.setVisibility(View.VISIBLE); KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, State.REVOKED, R.color.icons, true); - color = getResources().getColor(R.color.key_flag_red, null); + // noinspection deprecation, fix requires api level 23 + color = getResources().getColor(R.color.key_flag_red); mActionEncryptFile.setVisibility(View.INVISIBLE); mActionEncryptText.setVisibility(View.INVISIBLE); @@ -947,7 +948,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements mStatusImage.setVisibility(View.VISIBLE); KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, State.EXPIRED, R.color.icons, true); - color = getResources().getColor(R.color.key_flag_red, null); + // noinspection deprecation, fix requires api level 23 + color = getResources().getColor(R.color.key_flag_red); mActionEncryptFile.setVisibility(View.INVISIBLE); mActionEncryptText.setVisibility(View.INVISIBLE); @@ -957,7 +959,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements } else if (mIsSecret) { mStatusText.setText(R.string.view_key_my_key); mStatusImage.setVisibility(View.GONE); - color = getResources().getColor(R.color.key_flag_green, null); + // noinspection deprecation, fix requires api level 23 + color = getResources().getColor(R.color.key_flag_green); // reload qr code only if the fingerprint changed if (!mFingerprintString.equals(mQrCodeLoaded)) { loadQrCode(mFingerprintString); @@ -1009,7 +1012,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements mStatusImage.setVisibility(View.VISIBLE); KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, State.VERIFIED, R.color.icons, true); - color = getResources().getColor(R.color.key_flag_green, null); + // noinspection deprecation, fix requires api level 23 + color = getResources().getColor(R.color.key_flag_green); photoTask.execute(mMasterKeyId); hideFab(); @@ -1018,7 +1022,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements mStatusImage.setVisibility(View.VISIBLE); KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, State.UNVERIFIED, R.color.icons, true); - color = getResources().getColor(R.color.key_flag_orange, null); + // noinspection deprecation, fix requires api level 23 + color = getResources().getColor(R.color.key_flag_orange); showFab(); } |