Fix build

src/org/thoughtcrime/securesms/ApplicationContext.java

@@ -42,6 +42,7 @@ import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureSessionStore;
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.dependencies.AxolotlStorageModule;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.dependencies.SignalCommunicationModule;
@@ -305,7 +306,8 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     byte[] userPrivateKey = IdentityKeyUtil.getIdentityKeyPair(this).getPrivateKey().serialize();
     LokiAPIDatabase apiDB = DatabaseFactory.getLokiAPIDatabase(this);
     LokiUserDatabase userDB = DatabaseFactory.getLokiUserDatabase(this);
-    publicChatAPI = new PublicChatAPI(userPublicKey, userPrivateKey, apiDB, userDB);
+    GroupDatabase groupDB = DatabaseFactory.getGroupDatabase(this);
+    publicChatAPI = new PublicChatAPI(userPublicKey, userPrivateKey, apiDB, userDB, groupDB);
     return publicChatAPI;
   }
 

src/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -464,12 +464,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       publicChatAPI.getChannelInfo(publicChat.getChannel(), publicChat.getServer()).success(info -> {
         String groupId = GroupUtil.getEncodedOpenGroupId(publicChat.getId().getBytes());
 
-        publicChatAPI.updateOpenGroupProfileIfNeeded(
+        publicChatAPI.updateProfileIfNeeded(
                 publicChat.getChannel(),
                 publicChat.getServer(),
                 groupId,
                 info,
-                DatabaseFactory.getGroupDatabase(this),
                 false);
 
         runOnUiThread(ConversationActivity.this::updateSubtitleTextView);

src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java

@@ -159,6 +159,7 @@ public class SignalCommunicationModule {
                                                           DatabaseFactory.getLokiPreKeyBundleDatabase(context),
                                                           new SessionResetImplementation(context),
                                                           DatabaseFactory.getLokiUserDatabase(context),
+                                                          DatabaseFactory.getGroupDatabase(context),
                                                           ((ApplicationContext)context.getApplicationContext()).broadcaster);
     } else {
       this.messageSender.setMessagePipe(IncomingMessageObserver.getPipe(), IncomingMessageObserver.getUnidentifiedPipe());

src/org/thoughtcrime/securesms/groups/GroupManager.java

@@ -85,7 +85,7 @@ public class GroupManager {
     groupDatabase.create(groupId, name, new LinkedList<>(memberAddresses), null, null, new LinkedList<>(adminAddresses));
 
     if (!mms) {
-      groupDatabase.updateAvatar(groupId, avatarBytes);
+      groupDatabase.updateProfilePicture(groupId, avatarBytes);
       DatabaseFactory.getRecipientDatabase(context).setProfileSharing(groupRecipient, true);
       return sendGroupUpdate(context, groupId, memberAddresses, name, avatarBytes, adminAddresses);
     } else {
@@ -125,7 +125,7 @@ public class GroupManager {
     memberAddresses.add(Address.fromSerialized(TextSecurePreferences.getLocalNumber(context)));
     groupDatabase.create(groupId, name, new LinkedList<>(memberAddresses), null, null, new LinkedList<>());
 
-    groupDatabase.updateAvatar(groupId, avatarBytes);
+    groupDatabase.updateProfilePicture(groupId, avatarBytes);
 
     long threadID = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(groupRecipient, ThreadDatabase.DistributionTypes.CONVERSATION);
     return new GroupActionResult(groupRecipient, threadID);
@@ -148,7 +148,7 @@ public class GroupManager {
     groupDatabase.updateMembers(groupId, new LinkedList<>(memberAddresses));
     groupDatabase.updateAdmins(groupId, new LinkedList<>(adminAddresses));
     groupDatabase.updateTitle(groupId, name);
-    groupDatabase.updateAvatar(groupId, avatarBytes);
+    groupDatabase.updateProfilePicture(groupId, avatarBytes);
 
     if (!GroupUtil.isMmsGroup(groupId)) {
       return sendGroupUpdate(context, groupId, memberAddresses, name, avatarBytes, adminAddresses);

src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java

@@ -95,7 +95,7 @@ public class AvatarDownloadJob extends BaseJob implements InjectableType {
         InputStream                    inputStream = receiver.retrieveAttachment(pointer, attachment, MAX_AVATAR_SIZE);
         Bitmap                         avatar      = BitmapUtil.createScaledBitmap(context, new AttachmentModel(attachment, key, 0, digest), 500, 500);
 
-        database.updateAvatar(groupId, avatar);
+        database.updateProfilePicture(groupId, avatar);
         inputStream.close();
       }
     } catch (BitmapDecodingException | NonSuccessfulResponseCodeException | InvalidMessageException e) {