cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(fix accidental use of api level 23 method)

Browse Source
This commit is contained in:
Vincent Breitmoser
2016-01-05 20:33:37 +01:00
parent b093365747
commit e0f8d07862
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@@ -931,7 +931,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements
mStatusImage.setVisibility(View.VISIBLE); mStatusImage.setVisibility(View.VISIBLE);
KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
State.REVOKED, R.color.icons, true); 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); mActionEncryptFile.setVisibility(View.INVISIBLE);
mActionEncryptText.setVisibility(View.INVISIBLE); mActionEncryptText.setVisibility(View.INVISIBLE);
@@ -947,7 +948,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements
mStatusImage.setVisibility(View.VISIBLE); mStatusImage.setVisibility(View.VISIBLE);
KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
State.EXPIRED, R.color.icons, true); 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); mActionEncryptFile.setVisibility(View.INVISIBLE);
mActionEncryptText.setVisibility(View.INVISIBLE); mActionEncryptText.setVisibility(View.INVISIBLE);
@@ -957,7 +959,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements
} else if (mIsSecret) { } else if (mIsSecret) {
mStatusText.setText(R.string.view_key_my_key); mStatusText.setText(R.string.view_key_my_key);
mStatusImage.setVisibility(View.GONE); 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 // reload qr code only if the fingerprint changed
if (!mFingerprintString.equals(mQrCodeLoaded)) { if (!mFingerprintString.equals(mQrCodeLoaded)) {
loadQrCode(mFingerprintString); loadQrCode(mFingerprintString);
@@ -1009,7 +1012,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements
mStatusImage.setVisibility(View.VISIBLE); mStatusImage.setVisibility(View.VISIBLE);
KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
State.VERIFIED, R.color.icons, true); 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); photoTask.execute(mMasterKeyId);
hideFab(); hideFab();
@@ -1018,7 +1022,8 @@ public class ViewKeyActivity extends BaseNfcActivity implements
mStatusImage.setVisibility(View.VISIBLE); mStatusImage.setVisibility(View.VISIBLE);
KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText,
State.UNVERIFIED, R.color.icons, true); 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(); showFab();
} }