Merge pull request #114 from nextcloud/fixE2EuserID

Use provided user ID
nextcloud · Jan 29, 2018 · 5f6494c · 5f6494c
2 parents 8cf0959 + eefab41
commit 5f6494c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/com/owncloud/android/lib/resources/users/GetPublicKeyOperation.java b/src/com/owncloud/android/lib/resources/users/GetPublicKeyOperation.java
@@ -49,6 +49,12 @@ public class GetPublicKeyOperation extends RemoteOperation {
     private static final String NODE_PUBLIC_KEYS = "public-keys";
 
     private static final String JSON_FORMAT = "?format=json";
+
+    private String userID;
+
+    public GetPublicKeyOperation(String userID) {
+        this.userID = userID;
+    }
 
     /**
      * @param client Client object
@@ -69,10 +75,9 @@ protected RemoteOperationResult run(OwnCloudClient client) {
                 String response = getMethod.getResponseBodyAsString();
 
                 // Parse the response
-                String username = client.getCredentials().getUsername();
                 JSONObject respJSON = new JSONObject(response);
                 String key = (String) respJSON.getJSONObject(NODE_OCS).getJSONObject(NODE_DATA)
-                        .getJSONObject(NODE_PUBLIC_KEYS).get(username);
+                        .getJSONObject(NODE_PUBLIC_KEYS).get(userID);
 
                 result = new RemoteOperationResult(true, getMethod);
                 ArrayList<Object> keys = new ArrayList<>();