From 8e5767f967646412a03563c966c3bb5b7c26e0fa Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Tue, 27 May 2014 20:17:49 +0200
Subject: Store origin with ImportKeysListEntry

---
 .../sufficientlysecure/keychain/keyimport/HkpKeyserver.java   |  1 +
 .../keychain/keyimport/ImportKeysListEntry.java               | 11 +++++++++++
 .../keychain/keyimport/KeybaseKeyserver.java                  |  1 +
 3 files changed, 13 insertions(+)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
index 2041548f3..fbe38c30a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
@@ -244,6 +244,7 @@ public class HkpKeyserver extends Keyserver {
         while (matcher.find()) {
             final ImportKeysListEntry entry = new ImportKeysListEntry();
             entry.setQuery(query);
+            entry.setOrigin("hkp:"+mHost+":"+mPort);
 
             entry.setBitStrength(Integer.parseInt(matcher.group(3)));
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
index 04b86e295..8af41a8a3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
@@ -52,6 +52,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
     public String mPrimaryUserId;
     private String mExtraData;
     private String mQuery;
+    private String mOrigin;
 
     private boolean mSelected;
 
@@ -77,6 +78,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
         dest.writeInt(mBytes.length);
         dest.writeByteArray(mBytes);
         dest.writeString(mExtraData);
+        dest.writeString(mOrigin);
     }
 
     public static final Creator<ImportKeysListEntry> CREATOR = new Creator<ImportKeysListEntry>() {
@@ -97,6 +99,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
             vr.mBytes = new byte[source.readInt()];
             source.readByteArray(vr.mBytes);
             vr.mExtraData = source.readString();
+            vr.mOrigin = source.readString();
 
             return vr;
         }
@@ -218,6 +221,14 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
         mQuery = query;
     }
 
+    public String getOrigin() {
+        return mOrigin;
+    }
+
+    public void setOrigin(String origin) {
+        mOrigin = origin;
+    }
+
     /**
      * Constructor for later querying from keyserver
      */
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
index f9b6abf18..43c0b12fd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/KeybaseKeyserver.java
@@ -87,6 +87,7 @@ public class KeybaseKeyserver extends Keyserver {
 
         final ImportKeysListEntry entry = new ImportKeysListEntry();
         entry.setQuery(mQuery);
+        entry.setOrigin("keybase.io");
 
         String keybaseId = JWalk.getString(match, "components", "username", "val");
         String fullName = JWalk.getString(match, "components", "full_name", "val");
-- 
cgit v1.2.3