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

use ContextCompat instead of deprecated methods

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-07-12 13:39:13 +02:00
parent 639b6994ce
commit 00caf28ee2
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,7 @@ import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.FloatingActionButton; import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.CardView; import android.support.v7.widget.CardView;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
@@ -712,7 +713,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
} }
photoView.setImageBitmap(photo); photoView.setImageBitmap(photo);
photoView.setColorFilter(getResources().getColor(R.color.toolbar_photo_tint), photoView.setColorFilter(ContextCompat.getColor(ViewKeyActivity.this, R.color.toolbar_photo_tint),
PorterDuff.Mode.SRC_ATOP); PorterDuff.Mode.SRC_ATOP);
photoLayout.setVisibility(View.VISIBLE); photoLayout.setVisibility(View.VISIBLE);
} }
@@ -739,8 +740,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
statusImage.setVisibility(View.VISIBLE); statusImage.setVisibility(View.VISIBLE);
KeyFormattingUtils.setStatusImage(this, statusImage, statusText, KeyFormattingUtils.setStatusImage(this, statusImage, statusText,
State.REVOKED, R.color.icons, true); State.REVOKED, R.color.icons, true);
// noinspection deprecation, fix requires api level 23 color = ContextCompat.getColor(this, R.color.key_flag_red);
color = getResources().getColor(R.color.key_flag_red);
actionEncryptFile.setVisibility(View.INVISIBLE); actionEncryptFile.setVisibility(View.INVISIBLE);
actionEncryptText.setVisibility(View.INVISIBLE); actionEncryptText.setVisibility(View.INVISIBLE);
@@ -750,8 +750,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
statusImage.setVisibility(View.VISIBLE); statusImage.setVisibility(View.VISIBLE);
KeyFormattingUtils.setStatusImage(this, statusImage, statusText, KeyFormattingUtils.setStatusImage(this, statusImage, statusText,
State.EXPIRED, R.color.icons, true); State.EXPIRED, R.color.icons, true);
// noinspection deprecation, fix requires api level 23 color = ContextCompat.getColor(this, R.color.key_flag_red);
color = getResources().getColor(R.color.key_flag_red);
actionEncryptFile.setVisibility(View.INVISIBLE); actionEncryptFile.setVisibility(View.INVISIBLE);
actionEncryptText.setVisibility(View.INVISIBLE); actionEncryptText.setVisibility(View.INVISIBLE);
@@ -761,8 +760,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
statusImage.setVisibility(View.VISIBLE); statusImage.setVisibility(View.VISIBLE);
KeyFormattingUtils.setStatusImage(this, statusImage, statusText, KeyFormattingUtils.setStatusImage(this, statusImage, statusText,
State.INSECURE, R.color.icons, true); State.INSECURE, R.color.icons, true);
// noinspection deprecation, fix requires api level 23 color = ContextCompat.getColor(this, R.color.key_flag_red);
color = getResources().getColor(R.color.key_flag_red);
actionEncryptFile.setVisibility(View.INVISIBLE); actionEncryptFile.setVisibility(View.INVISIBLE);
actionEncryptText.setVisibility(View.INVISIBLE); actionEncryptText.setVisibility(View.INVISIBLE);
@@ -770,8 +768,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
qrCodeLayout.setVisibility(View.GONE); qrCodeLayout.setVisibility(View.GONE);
} else if (unifiedKeyInfo.has_any_secret()) { } else if (unifiedKeyInfo.has_any_secret()) {
statusImage.setVisibility(View.GONE); statusImage.setVisibility(View.GONE);
// noinspection deprecation, fix requires api level 23 color = ContextCompat.getColor(this, R.color.key_flag_green);
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 (!Arrays.equals(unifiedKeyInfo.fingerprint(), qrCodeLoaded)) { if (!Arrays.equals(unifiedKeyInfo.fingerprint(), qrCodeLoaded)) {
loadQrCode(unifiedKeyInfo.fingerprint()); loadQrCode(unifiedKeyInfo.fingerprint());
@@ -803,8 +800,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
actionEncryptText.setVisibility(View.VISIBLE); actionEncryptText.setVisibility(View.VISIBLE);
showFab(); showFab();
// noinspection deprecation (no getDrawable with theme at current minApi level 15!) floatingActionButton.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_repeat_white_24dp));
floatingActionButton.setImageDrawable(getResources().getDrawable(R.drawable.ic_repeat_white_24dp));
} else { } else {
actionEncryptFile.setVisibility(View.VISIBLE); actionEncryptFile.setVisibility(View.VISIBLE);
actionEncryptText.setVisibility(View.VISIBLE); actionEncryptText.setVisibility(View.VISIBLE);
@@ -815,8 +811,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
statusImage.setVisibility(View.VISIBLE); statusImage.setVisibility(View.VISIBLE);
KeyFormattingUtils.setStatusImage(this, statusImage, statusText, KeyFormattingUtils.setStatusImage(this, statusImage, statusText,
State.VERIFIED, R.color.icons, true); State.VERIFIED, R.color.icons, true);
// noinspection deprecation, fix requires api level 23 color = ContextCompat.getColor(this, R.color.key_flag_green);
color = getResources().getColor(R.color.key_flag_green);
photoTask.execute(unifiedKeyInfo.master_key_id()); photoTask.execute(unifiedKeyInfo.master_key_id());
hideFab(); hideFab();
@@ -825,8 +820,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
statusImage.setVisibility(View.VISIBLE); statusImage.setVisibility(View.VISIBLE);
KeyFormattingUtils.setStatusImage(this, statusImage, statusText, KeyFormattingUtils.setStatusImage(this, statusImage, statusText,
State.UNVERIFIED, R.color.icons, true); State.UNVERIFIED, R.color.icons, true);
// noinspection deprecation, fix requires api level 23 color = ContextCompat.getColor(this, R.color.key_flag_orange);
color = getResources().getColor(R.color.key_flag_orange);
showFab(); showFab();
} }
@@ -849,7 +843,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
mPreviousColor = color; mPreviousColor = color;
} }
//noinspection deprecation
statusImage.setAlpha(80); statusImage.setAlpha(80);
} }