-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

1 files changed, 9 insertions, 3 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();