From ef9a1c23f3add291979db7ebcaf9d29643169364 Mon Sep 17 00:00:00 2001 From: xSooDx Date: Tue, 21 Jul 2015 17:13:24 +0530 Subject: -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 --- .../keychain/ui/ViewKeyTrustFragment.java | 12 +++++++++--- 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 @@ "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." - "Posts to Twitter as" - "Is known on GitHub as" - "Controls the domain name(s)" - "Can post to the Web site(s)" - "Posts to Reddit as" - "Is known on Coinbase as" - "Posts to Hacker News as" - "Unknown proof type" + "Posts to Twitter as %s" + "Is known on GitHub as %s" + "Controls the domain name(s) %s" + "Can post to the Web site(s) %s" + "Posts to Reddit as %s" + "Is known on Coinbase as %s" + "Posts to Hacker News as %s" + "Unknown proof type %s" "Unfortunately this proof cannot be verified." "Unrecognized problem with proof checker" "Problem with proof" -- cgit v1.2.3 From 7c15dc0b892fe3f4515f1bfd242cd6f44f774c51 Mon Sep 17 00:00:00 2001 From: xSooDx Date: Tue, 21 Jul 2015 20:57:11 +0530 Subject: -Added failsafe in case '%s' is not in the string -Causes the links to be appended at the end --- .../org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 b62806cc7..a15ec4151 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java @@ -269,8 +269,12 @@ public class ViewKeyTrustFragment extends LoaderFragment implements 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); + if(proofType.contains("%s")){ + int i = proofType.indexOf("%s"); + ssb.replace(i,i+2,proofLinks); + } + else ssb.append(proofLinks); + return ssb; } -- cgit v1.2.3 From ee5343fcb63952469ade90ae005424956aa59aa3 Mon Sep 17 00:00:00 2001 From: xSooDx Date: Tue, 4 Aug 2015 16:24:12 +0530 Subject: renamed the insertLinks() method to formatSpannableString() and added comment about its functionality --- .../org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 a15ec4151..092ab40d6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyTrustFragment.java @@ -256,7 +256,7 @@ public class ViewKeyTrustFragment extends LoaderFragment implements i++; } appendProofLinks(ssb, fingerprint, proofsFor[i]); - proofList.add(insertLinks(ssb,getProofNarrative(proofType))); + proofList.add(formatSpannableString(ssb, getProofNarrative(proofType))); } } @@ -266,7 +266,10 @@ public class ViewKeyTrustFragment extends LoaderFragment implements return new ResultPage(getString(R.string.key_trust_results_prefix), proofList); } - private SpannableStringBuilder insertLinks(SpannableStringBuilder proofLinks,String proofType){ + private SpannableStringBuilder formatSpannableString(SpannableStringBuilder proofLinks,String proofType){ + //Formatting SpannableStringBuilder with String.format() causes the links to stop working. + //This method is to insert the links while reserving the links + SpannableStringBuilder ssb = new SpannableStringBuilder(); ssb.append(proofType); if(proofType.contains("%s")){ -- cgit v1.2.3