Merge pull request #457 from hjubb/config_profile_info

Adding profile information to the config sync messages
2025-08-12 06:07:53 +00:00 · 2021-02-24 15:57:35 +11:00
parent c92d04c82e 4033830b15
commit 851efb6f6e
12 changed files with 549 additions and 110 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -50,7 +50,7 @@ import org.thoughtcrime.securesms.sskenvironment.TypingStatusRepository;
 import org.thoughtcrime.securesms.components.TypingStatusSender;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
-import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
+import org.session.libsession.utilities.preferences.ProfileKeyUtil;
 import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
--- a/app/src/main/java/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java
@@ -1,55 +0,0 @@
-package org.thoughtcrime.securesms.crypto;
-
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.session.libsignal.utilities.Base64;
-import org.session.libsession.utilities.TextSecurePreferences;
-import org.session.libsession.utilities.Util;
-
-import java.io.IOException;
-
-public class ProfileKeyUtil {
-
-  public static synchronized boolean hasProfileKey(@NonNull Context context) {
-    return TextSecurePreferences.getProfileKey(context) != null;
-  }
-
-  public static synchronized @NonNull byte[] getProfileKey(@NonNull Context context) {
-    try {
-      String encodedProfileKey = TextSecurePreferences.getProfileKey(context);
-
-      if (encodedProfileKey == null) {
-        encodedProfileKey = Util.getSecret(32);
-        TextSecurePreferences.setProfileKey(context, encodedProfileKey);
-      }
-
-      return Base64.decode(encodedProfileKey);
-    } catch (IOException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  public static synchronized @NonNull byte[] getProfileKeyFromEncodedString(String encodedProfileKey) {
-    try {
-      return Base64.decode(encodedProfileKey);
-    } catch (IOException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  public static synchronized @NonNull byte[] rotateProfileKey(@NonNull Context context) {
-    TextSecurePreferences.setProfileKey(context, null);
-    return getProfileKey(context);
-  }
-
-  public static synchronized @NonNull String generateEncodedProfileKey(@NonNull Context context) {
-    return Util.getSecret(32);
-  }
-
-  public static synchronized void setEncodedProfileKey(@NonNull Context context, @Nullable String key) {
-    TextSecurePreferences.setProfileKey(context, key);
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java
@@ -6,6 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;

+import org.session.libsession.utilities.preferences.ProfileKeyUtil;
 import org.session.libsignal.metadata.SignalProtos;
 import org.session.libsignal.metadata.certificate.CertificateValidator;
 import org.session.libsignal.metadata.certificate.InvalidCertificateException;
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
@@ -18,7 +18,7 @@ import org.session.libsession.utilities.Util;
 import org.greenrobot.eventbus.EventBus;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.contactshare.ContactModelMapper;
-import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
+import org.session.libsession.utilities.preferences.ProfileKeyUtil;
 import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
@@ -17,25 +17,26 @@ import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
+import androidx.core.view.isVisible
 import kotlinx.android.synthetic.main.activity_settings.*
 import network.loki.messenger.BuildConfig
 import network.loki.messenger.R
 import nl.komponents.kovenant.Promise
 import nl.komponents.kovenant.all
 import nl.komponents.kovenant.deferred
+import nl.komponents.kovenant.functional.bind
+import nl.komponents.kovenant.task
 import nl.komponents.kovenant.ui.alwaysUi
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.avatar.AvatarSelection
-import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
+import org.session.libsession.utilities.preferences.ProfileKeyUtil
 import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.dialogs.ChangeUiModeDialog
 import org.thoughtcrime.securesms.loki.dialogs.ClearAllDataDialog
 import org.thoughtcrime.securesms.loki.dialogs.SeedDialog
 import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities
-import org.thoughtcrime.securesms.loki.utilities.fadeIn
-import org.thoughtcrime.securesms.loki.utilities.fadeOut
 import org.thoughtcrime.securesms.loki.utilities.push
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.mms.GlideRequests
@@ -48,6 +49,7 @@ import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.service.api.crypto.ProfileCipher
 import org.session.libsignal.service.api.util.StreamDetails
 import org.session.libsignal.service.loki.api.fileserver.FileServerAPI
+import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol
 import java.io.ByteArrayInputStream
 import java.io.File
 import java.security.SecureRandom
@@ -177,7 +179,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
    }

    private fun updateProfile(isUpdatingProfilePicture: Boolean) {
-        loader.fadeIn()
+        loader.isVisible = true
        val promises = mutableListOf<Promise<*, Exception>>()
        val displayName = displayNameToBeUploaded
        if (displayName != null) {
@@ -204,7 +206,17 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
            }
            promises.add(deferred.promise)
        }
-        all(promises).alwaysUi {
+
+        all(promises).bind {
+            // updating the profile name or picture
+            if (profilePicture != null || displayName != null) {
+                task {
+                    MultiDeviceProtocol.forceSyncConfigurationNowIfNeeded(this@SettingsActivity)
+                }
+            } else {
+                Promise.of(Unit)
+            }
+        }.alwaysUi {
            if (displayName != null) {
                btnGroupNameDisplay.text = displayName
            }
@@ -217,7 +229,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
                profilePictureView.update()
            }
            profilePictureToBeUploaded = null
-            loader.fadeOut()
+            loader.isVisible = false
        }
    }
    // endregion
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt
@@ -90,6 +90,7 @@ object MultiDeviceProtocol {
            if (allOpenGroups.contains(openGroup)) continue
            OpenGroupUtilities.addGroup(context, openGroup, 1)
        }
+        // TODO: handle new configuration message fields or handle in new pipeline
        TextSecurePreferences.setConfigurationMessageSynced(context, true)
    }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import androidx.annotation.WorkerThread
 import org.greenrobot.eventbus.EventBus
 import org.thoughtcrime.securesms.ApplicationContext
-import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
+import org.session.libsession.utilities.preferences.ProfileKeyUtil
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.groups.GroupManager
 import org.session.libsession.utilities.GroupUtil
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -250,22 +250,26 @@

    </ScrollView>

-    <RelativeLayout
-        android:id="@+id/loader"
+    <FrameLayout
+        android:animateLayoutChanges="true"
        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#A4000000"
-        android:visibility="gone"
-        android:alpha="0">
+        android:layout_height="match_parent">
+        <RelativeLayout
+            android:id="@+id/loader"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#A4000000"
+            android:visibility="gone">

-        <com.github.ybq.android.spinkit.SpinKitView
-            style="@style/SpinKitView.Large.ThreeBounce"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_centerInParent="true"
-            app:SpinKit_Color="@android:color/white" />
+            <com.github.ybq.android.spinkit.SpinKitView
+                style="@style/SpinKitView.Large.ThreeBounce"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_centerInParent="true"
+                app:SpinKit_Color="@android:color/white" />

-    </RelativeLayout>
+        </RelativeLayout>

+    </FrameLayout>
 </RelativeLayout>