Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-24 00:59:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Include source origin in string key name.

Browse Source 
This should help eliminate string duplicates, as well as provide
visibility into where strings in a resource file are being used.
This commit is contained in:
Moxie Marlinspike
2012-09-19 19:56:04 -07:00
parent faad1e57ea
commit bb0ec65744
63 changed files with 579 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/ViewIdentityActivity.java
+7 -7
View File
@@ -47,7 +47,7 @@ public class ViewIdentityActivity extends KeyScanningActivity {
private void initializeFingerprint() {
if (identityKey == null) {
identityFingerprint.setText(R.string.you_do_not_have_an_identity_key2);
identityFingerprint.setText(R.string.ViewIdentityActivity_you_do_not_have_an_identity_key);
} else {
identityFingerprint.setText(identityKey.getFingerprint());
}
@@ -79,12 +79,12 @@ public class ViewIdentityActivity extends KeyScanningActivity {
@Override
protected String getScanString() {
return getString(R.string.scan_to_compare2);
return getString(R.string.ViewIdentityActivity_scan_to_compare);
}
@Override
protected String getDisplayString() {
return getString(R.string.get_scanned_to_compare2);
return getString(R.string.ViewIdentityActivity_get_scanned_to_compare);
}
@Override
@@ -99,21 +99,21 @@ public class ViewIdentityActivity extends KeyScanningActivity {
@Override
protected String getNotVerifiedMessage() {
return getString(R.string.warning_the_scanned_key_does_not_match_exclamation2);
return getString(R.string.ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation);
}
@Override
protected String getNotVerifiedTitle() {
return getString(R.string.not_verified_exclamation4);
return getString(R.string.ViewIdentityActivity_not_verified_exclamation);
}
@Override
protected String getVerifiedMessage() {
return getString(R.string.the_scanned_key_matches_exclamation2);
return getString(R.string.ViewIdentityActivity_the_scanned_key_matches_exclamation);
}
@Override
protected String getVerifiedTitle() {
return getString(R.string.verified_exclamation4);
return getString(R.string.ViewIdentityActivity_verified_exclamation);
}
}