diff options
author | xSooDx <soodsaurabh95@gmail.com> | 2015-07-21 17:13:24 +0530 |
---|---|---|
committer | xSooDx <soodsaurabh95@gmail.com> | 2015-07-21 17:13:24 +0530 |
commit | ef9a1c23f3add291979db7ebcaf9d29643169364 (patch) | |
tree | f55ce9572168b58ff7d59fc31427698a8e0bd097 | |
parent | d41c5bbbc15428f82e16c2c3f931bbb058a2e6f8 (diff) | |
download | open-keychain-ef9a1c23f3add291979db7ebcaf9d29643169364.tar.gz open-keychain-ef9a1c23f3add291979db7ebcaf9d29643169364.tar.bz2 open-keychain-ef9a1c23f3add291979db7ebcaf9d29643169364.zip |
-No longer appends the links to the keybase_narratives
-Now uses '%s' to insert the names in the keybase_narratives
-added '%s' to keybase_narrative_* in the string.xml file
NOTE:Have not modified for other languages
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java | 12 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 16 |
2 files changed, 17 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java index 6052eec16..b62806cc7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java @@ -249,8 +249,6 @@ public class ViewKeyTrustFragment extends LoaderFragment implements Proof[] proofsFor = proofs.get(proofType).toArray(x); if (proofsFor.length > 0) { SpannableStringBuilder ssb = new SpannableStringBuilder(); - ssb.append(getProofNarrative(proofType)).append(" "); - int i = 0; while (i < proofsFor.length - 1) { appendProofLinks(ssb, fingerprint, proofsFor[i]); @@ -258,7 +256,7 @@ public class ViewKeyTrustFragment extends LoaderFragment implements i++; } appendProofLinks(ssb, fingerprint, proofsFor[i]); - proofList.add(ssb); + proofList.add(insertLinks(ssb,getProofNarrative(proofType))); } } @@ -268,6 +266,14 @@ public class ViewKeyTrustFragment extends LoaderFragment implements return new ResultPage(getString(R.string.key_trust_results_prefix), proofList); } + private SpannableStringBuilder insertLinks(SpannableStringBuilder proofLinks,String proofType){ + SpannableStringBuilder ssb = new SpannableStringBuilder(); + ssb.append(proofType); + int i = proofType.indexOf("%s"); + ssb.replace(i,i+2,proofLinks); + return ssb; + } + private SpannableStringBuilder appendProofLinks(SpannableStringBuilder ssb, final String fingerprint, final Proof proof) throws KeybaseException { int startAt = ssb.length(); String handle = proof.getHandle(); diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 26f1216be..a62df862f 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -580,14 +580,14 @@ <string name="key_trust_header_text">"Note: Keybase.io proofs are an experimental feature of OpenKeychain. We encourage you to scan QR Codes or exchange keys via NFC in addition to confirming them."</string> <!-- keybase proof stuff --> - <string name="keybase_narrative_twitter">"Posts to Twitter as"</string> - <string name="keybase_narrative_github">"Is known on GitHub as"</string> - <string name="keybase_narrative_dns">"Controls the domain name(s)"</string> - <string name="keybase_narrative_web_site">"Can post to the Web site(s)"</string> - <string name="keybase_narrative_reddit">"Posts to Reddit as"</string> - <string name="keybase_narrative_coinbase">"Is known on Coinbase as"</string> - <string name="keybase_narrative_hackernews">"Posts to Hacker News as"</string> - <string name="keybase_narrative_unknown">"Unknown proof type"</string> + <string name="keybase_narrative_twitter">"Posts to Twitter as %s"</string> + <string name="keybase_narrative_github">"Is known on GitHub as %s"</string> + <string name="keybase_narrative_dns">"Controls the domain name(s) %s"</string> + <string name="keybase_narrative_web_site">"Can post to the Web site(s) %s"</string> + <string name="keybase_narrative_reddit">"Posts to Reddit as %s"</string> + <string name="keybase_narrative_coinbase">"Is known on Coinbase as %s"</string> + <string name="keybase_narrative_hackernews">"Posts to Hacker News as %s"</string> + <string name="keybase_narrative_unknown">"Unknown proof type %s"</string> <string name="keybase_proof_failure">"Unfortunately this proof cannot be verified."</string> <string name="keybase_unknown_proof_failure">"Unrecognized problem with proof checker"</string> <string name="keybase_problem_fetching_evidence">"Problem with proof"</string> |