From 4f58bc11a173f50ac4e6662713d334c552bc4dd2 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Mon, 7 Oct 2019 10:06:19 +1100
Subject: [PATCH] Update for new username API

---
 AndroidManifest.xml                                  |  2 +-
 .../securesms/CreateProfileActivity.java             | 11 +++++++++++
 ...ountDetailsActivity.kt => DisplayNameActivity.kt} | 12 +++++++++++-
 .../securesms/loki/LokiGroupChatPoller.kt            |  2 +-
 src/org/thoughtcrime/securesms/loki/SeedActivity.kt  |  2 +-
 5 files changed, 25 insertions(+), 4 deletions(-)
 rename src/org/thoughtcrime/securesms/loki/{AccountDetailsActivity.kt => DisplayNameActivity.kt} (70%)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index eb3550d48c..c30e4385da 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -464,7 +464,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <!-- Loki -->
-    <activity android:name="org.thoughtcrime.securesms.loki.AccountDetailsActivity"
+    <activity android:name="org.thoughtcrime.securesms.loki.DisplayNameActivity"
               android:launchMode="singleTask"
               android:theme="@style/TextSecure.DarkRegistrationTheme"
               android:windowSoftInputMode="stateUnchanged"
diff --git a/src/org/thoughtcrime/securesms/CreateProfileActivity.java b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
index 58f2a65f15..7a3b7a3dc4 100644
--- a/src/org/thoughtcrime/securesms/CreateProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
@@ -35,11 +35,15 @@ import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider;
 import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.database.Address;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.jobs.MultiDeviceProfileKeyUpdateJob;
 import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.loki.LokiAPIDatabase;
+import org.thoughtcrime.securesms.loki.LokiUserDatabase;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
@@ -57,6 +61,7 @@ import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.crypto.ProfileCipher;
 import org.whispersystems.signalservice.api.util.StreamDetails;
+import org.whispersystems.signalservice.loki.api.LokiGroupChatAPI;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -368,6 +373,12 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
 
         TextSecurePreferences.setProfileName(context, name);
 
+        String userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(context);
+        byte[] userPrivateKey = IdentityKeyUtil.getIdentityKeyPair(context).getPrivateKey().serialize();
+        LokiAPIDatabase apiDatabase = DatabaseFactory.getLokiAPIDatabase(context);
+        LokiUserDatabase userDatabase = DatabaseFactory.getLokiUserDatabase(context);
+        new LokiGroupChatAPI(userHexEncodedPublicKey, userPrivateKey, apiDatabase, userDatabase).setDisplayName(name, LokiGroupChatAPI.getPublicChatServer());
+
         // Loki - Original code
         // ========
 //        try {
diff --git a/src/org/thoughtcrime/securesms/loki/AccountDetailsActivity.kt b/src/org/thoughtcrime/securesms/loki/DisplayNameActivity.kt
similarity index 70%
rename from src/org/thoughtcrime/securesms/loki/AccountDetailsActivity.kt
rename to src/org/thoughtcrime/securesms/loki/DisplayNameActivity.kt
index 0d8e581611..43dc678c00 100644
--- a/src/org/thoughtcrime/securesms/loki/AccountDetailsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/DisplayNameActivity.kt
@@ -8,10 +8,13 @@ import network.loki.messenger.R
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.BaseActionBarActivity
 import org.thoughtcrime.securesms.ConversationListActivity
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
+import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.api.crypto.ProfileCipher
+import org.whispersystems.signalservice.loki.api.LokiGroupChatAPI
 
-class AccountDetailsActivity : BaseActionBarActivity() {
+class DisplayNameActivity : BaseActionBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -38,5 +41,12 @@ class AccountDetailsActivity : BaseActionBarActivity() {
         application.startLongPollingIfNeeded()
         startActivity(Intent(this, ConversationListActivity::class.java))
         finish()
+        val userHexEncodedPublicKey = TextSecurePreferences.getLocalNumber(this)
+        val userPrivateKey = IdentityKeyUtil.getIdentityKeyPair(this).privateKey.serialize()
+        val apiDatabase = DatabaseFactory.getLokiAPIDatabase(this)
+        val userDatabase = DatabaseFactory.getLokiUserDatabase(this)
+        if (name != null) {
+            LokiGroupChatAPI(userHexEncodedPublicKey, userPrivateKey, apiDatabase, userDatabase).setDisplayName(name, LokiGroupChatAPI.publicChatServer)
+        }
     }
 }
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt b/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt
index 4a39c71c0c..294a9249e8 100644
--- a/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt
+++ b/src/org/thoughtcrime/securesms/loki/LokiGroupChatPoller.kt
@@ -34,9 +34,9 @@ class LokiGroupChatPoller(private val context: Context, private val group: LokiG
 
     private val api: LokiGroupChatAPI
         get() = {
+            val userPrivateKey = IdentityKeyUtil.getIdentityKeyPair(context).privateKey.serialize()
             val lokiAPIDatabase = DatabaseFactory.getLokiAPIDatabase(context)
             val lokiUserDatabase = DatabaseFactory.getLokiUserDatabase(context)
-            val userPrivateKey = IdentityKeyUtil.getIdentityKeyPair(context).privateKey.serialize()
             LokiGroupChatAPI(userHexEncodedPublicKey, userPrivateKey, lokiAPIDatabase, lokiUserDatabase)
         }()
     // endregion
diff --git a/src/org/thoughtcrime/securesms/loki/SeedActivity.kt b/src/org/thoughtcrime/securesms/loki/SeedActivity.kt
index c9b6f44954..03a1d03ba5 100644
--- a/src/org/thoughtcrime/securesms/loki/SeedActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/SeedActivity.kt
@@ -161,7 +161,7 @@ class SeedActivity : BaseActionBarActivity() {
             Mode.Register -> Analytics.shared.track("Seed Created")
             Mode.Restore -> Analytics.shared.track("Seed Restored")
         }
-        startActivity(Intent(this, AccountDetailsActivity::class.java))
+        startActivity(Intent(this, DisplayNameActivity::class.java))
         finish()
     }
     // endregion