Merge branch 'dev' into ui

app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java

@@ -308,6 +308,13 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
     databaseHelper.getWritableDatabase().update(TABLE_NAME, contents, GROUP_ID + " = ?", new String[] {groupId});
   }
 
+  public void updateFormationTimestamp(String groupId, Long formationTimestamp) {
+    ContentValues contents = new ContentValues();
+    contents.put(TIMESTAMP, formationTimestamp);
+
+    databaseHelper.getWritableDatabase().update(TABLE_NAME, contents, GROUP_ID + " = ?", new String[] {groupId});
+  }
+
   public void removeMember(String groupId, Address source) {
     List<Address> currentMembers = getCurrentMembers(groupId, false);
     currentMembers.remove(source);

app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt

@@ -428,6 +428,11 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
         DatabaseFactory.getLokiAPIDatabase(context).removeAllClosedGroupEncryptionKeyPairs(groupPublicKey)
     }
 
+    override fun updateFormationTimestamp(groupID: String, formationTimestamp: Long) {
+        DatabaseFactory.getGroupDatabase(context)
+            .updateFormationTimestamp(groupID, formationTimestamp)
+    }
+
     override fun setExpirationTimer(groupID: String, duration: Int) {
         val recipient = Recipient.from(context, fromSerialized(groupID), false)
         DatabaseFactory.getRecipientDatabase(context).setExpireMessages(recipient, duration);

app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt

@@ -56,6 +56,8 @@ class EditClosedGroupMembersAdapter(
 
         if (unlocked) {
             viewHolder.view.setOnClickListener { this.memberClickListener?.invoke(member) }
+        } else {
+            viewHolder.view.setOnClickListener(null)
         }
     }