Merge pull request #941 from Wikinaut/add-new-string-ViewIdentityActivity_my_identity_fingerprint

add new string ViewIdentityActivity_my_identity_fingerprint
This commit is contained in:
Moxie Marlinspike 2014-03-02 15:50:18 -08:00
commit 977765c80f
2 changed files with 2 additions and 2 deletions

View File

@ -331,6 +331,7 @@
<string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">The scanned key matches!</string> <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">The scanned key matches!</string>
<string name="ViewIdentityActivity_verified_exclamation">Verified!</string> <string name="ViewIdentityActivity_verified_exclamation">Verified!</string>
<string name="ViewIdentityActivity_identity_fingerprint">Identity Fingerprint</string> <string name="ViewIdentityActivity_identity_fingerprint">Identity Fingerprint</string>
<string name="ViewIdentityActivity_my_identity_fingerprint">My Identity Fingerprint</string>
<!-- KeyExchangeInitiator --> <!-- KeyExchangeInitiator -->
<string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Initiate Despite Existing Request?</string> <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Initiate Despite Existing Request?</string>

View File

@ -46,8 +46,7 @@ public class ViewLocalIdentityActivity extends ViewIdentityActivity {
this.masterSecret = getIntent().getParcelableExtra("master_secret"); this.masterSecret = getIntent().getParcelableExtra("master_secret");
getIntent().putExtra("identity_key", IdentityKeyUtil.getIdentityKey(this, Curve.DJB_TYPE)); getIntent().putExtra("identity_key", IdentityKeyUtil.getIdentityKey(this, Curve.DJB_TYPE));
getIntent().putExtra("title", getString(R.string.ApplicationPreferencesActivity_my) + " " + getIntent().putExtra("title", getString(R.string.ViewIdentityActivity_my_identity_fingerprint));
getString(R.string.ViewIdentityActivity_identity_fingerprint));
super.onCreate(bundle); super.onCreate(bundle);
} }