aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-09-04 21:03:05 +0200
committerChristian Schneppe <christian@pix-art.de>2017-09-04 21:03:05 +0200
commita2058be1110e07fc196df47fa416d733b6b94b27 (patch)
tree9ef8a2b2525e9e0dd2cb885b7d9f7017c2962d5c
parenta785a3009f580f397a999a93b6ae488876e78fb8 (diff)
get rid of uneccessary 'own omemo fingerprint' string
-rw-r--r--src/main/java/de/pixart/messenger/ui/EditAccountActivity.java2
-rw-r--r--src/main/res/layout/activity_edit_account.xml2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
index 92e933186..dc8b12f57 100644
--- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
@@ -1028,8 +1028,10 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
this.mAxolotlFingerprintBox.setVisibility(View.VISIBLE);
if (ownAxolotlFingerprint.equals(messageFingerprint)) {
this.mOwnFingerprintDesc.setTextColor(ContextCompat.getColor(this, R.color.accent));
+ this.mOwnFingerprintDesc.setText(R.string.omemo_fingerprint_selected_message);
} else {
this.mOwnFingerprintDesc.setTextColor(getSecondaryTextColor());
+ this.mOwnFingerprintDesc.setText(R.string.omemo_fingerprint);
}
this.mAxolotlFingerprint.setText(CryptoHelper.prettifyFingerprint(ownAxolotlFingerprint.substring(2)));
this.mAxolotlFingerprintToClipboardButton
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 78f1ccf6e..55e4900ac 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -613,7 +613,7 @@
android:id="@+id/own_fingerprint_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/this_device_omemo_fingerprint"
+ android:text="@string/omemo_fingerprint"
android:textColor="@color/black54"
android:textSize="?attr/TextSizeInfo" />
</LinearLayout>