Merge branch 'develop' into fix/attachment-ui

app/src/main/java/chat/rocket/android/service/ddp/base/ActiveUsersSubscriber.java

@@ -3,6 +3,9 @@ package chat.rocket.android.service.ddp.base;
 import android.content.Context;
 import io.realm.RealmObject;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import chat.rocket.android.api.DDPClientWrapper;
 import chat.rocket.android.model.ddp.User;
 import chat.rocket.android.realm_helper.RealmHelper;
@@ -30,4 +33,24 @@ public class ActiveUsersSubscriber extends AbstractBaseSubscriber {
   protected Class<? extends RealmObject> getModelClass() {
     return User.class;
   }
+
+  @Override
+  protected JSONObject customizeFieldJson(JSONObject json) throws JSONException {
+    json = super.customizeFieldJson(json);
+
+    // The user object may have some children without a proper primary key (ex.: settings)
+    // Here we identify this and add a local key
+    // Only happens here when the logged user receives its own data
+    if (json.has("settings")) {
+      final JSONObject settingsJson = json.getJSONObject("settings");
+      settingsJson.put("id", json.getString("_id"));
+
+      if (settingsJson.has("preferences")) {
+        final JSONObject preferencesJson = settingsJson.getJSONObject("preferences");
+        preferencesJson.put("id", json.getString("_id"));
+      }
+    }
+
+    return json;
+  }
 }