aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/OmemoActivity.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-04-05 20:22:47 +0200
committerChristian Schneppe <christian@pix-art.de>2017-04-05 22:21:41 +0200
commit1e246bbce11d9e57e70092d809143b5d048c7392 (patch)
treec31bf09a0b0173d1db89455e01ba0326206a5421 /src/main/java/de/pixart/messenger/ui/OmemoActivity.java
parentd6eef4842c29a27b0f0424519b135217fb1dd207 (diff)
Changes the deprecated getColor() method
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/OmemoActivity.java')
-rw-r--r--src/main/java/de/pixart/messenger/ui/OmemoActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/OmemoActivity.java b/src/main/java/de/pixart/messenger/ui/OmemoActivity.java
index dfef4e200..499654cba 100644
--- a/src/main/java/de/pixart/messenger/ui/OmemoActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/OmemoActivity.java
@@ -5,6 +5,7 @@ import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
import android.view.ContextMenu;
import android.view.MenuItem;
import android.view.View;
@@ -228,7 +229,7 @@ public abstract class OmemoActivity extends XmppActivity {
keyType.setVisibility(View.GONE);
}
if (highlight) {
- keyType.setTextColor(getResources().getColor(R.color.accent));
+ keyType.setTextColor(ContextCompat.getColor(this, R.color.accent));
keyType.setText(getString(x509 ? R.string.omemo_fingerprint_x509_selected_message : R.string.omemo_fingerprint_selected_message));
} else {
keyType.setText(getString(x509 ? R.string.omemo_fingerprint_x509 : R.string.omemo_fingerprint));