Require the user to pick a display name

res/layout/activity_display_name.xml

@@ -2,10 +2,8 @@
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="match_parent">
-    tools:context=".loki.AccountDetailsActivity">
 
     <LinearLayout
         android:layout_width="match_parent"

res/values/strings.xml

@@ -1552,7 +1552,7 @@
     <!-- Display name activity -->
     <string name="activity_display_name_title">Create Your Loki Messenger Account</string>
     <string name="activity_display_name_subtitle">Enter a name to be shown to your contacts</string>
-    <string name="activity_display_name_name_edit_text_label">Display Name (Optional)</string>
+    <string name="activity_display_name_name_edit_text_label">Display Name</string>
     <string name="activity_display_name_button_title">Next</string>
     <!-- Key pair activity -->
     <string name="activity_key_pair_title">Create Your Loki Messenger Account</string>

src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java

@@ -157,7 +157,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
       super.onCreate(icicle);
 
       String masterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(getContext());
-      boolean isMasterDevice = (masterHexEncodedPublicKey != null);
+      boolean isMasterDevice = (masterHexEncodedPublicKey == null);
 
       Preference profilePreference = this.findPreference(PREFERENCE_CATEGORY_PROFILE);
       // Hide if this is a slave device

src/org/thoughtcrime/securesms/ConversationListActivity.java

@@ -203,7 +203,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
         int height = profilePictureImageView.getHeight();
         if (width == 0 || height == 0) return true;
         profilePictureImageView.getViewTreeObserver().removeOnPreDrawListener(this);
-        JazzIdenticonDrawable identicon = new JazzIdenticonDrawable(width, height, recipient.getAddress().serialize());
+        JazzIdenticonDrawable identicon = new JazzIdenticonDrawable(width, height, recipient.getAddress().serialize().toLowerCase());
         profilePictureImageView.setImageDrawable(identicon);
         return true;
       }

src/org/thoughtcrime/securesms/CreateProfileActivity.java

@@ -229,7 +229,10 @@ public class CreateProfileActivity extends BaseActionBarActivity implements Inje
       public void onTextChanged(CharSequence s, int start, int before, int count) {}
       @Override
       public void afterTextChanged(Editable s) {
-        if (s.toString().getBytes().length > ProfileCipher.NAME_PADDED_LENGTH) {
+        if (s.toString().isEmpty()) {
+          name.getInput().setError("Invalid");
+          finishButton.setEnabled(false);
+        } else if (s.toString().getBytes().length > ProfileCipher.NAME_PADDED_LENGTH) {
           name.getInput().setError(getString(R.string.CreateProfileActivity_too_long));
           finishButton.setEnabled(false);
         } else if (name.getInput().getError() != null || !finishButton.isEnabled()) {

src/org/thoughtcrime/securesms/components/AvatarImageView.java

@@ -119,7 +119,7 @@ public class AvatarImageView extends AppCompatImageView {
 
       image = new GeneratedContactPhoto(name, R.drawable.ic_profile_default).asDrawable(context, fallbackColor.toAvatarColor(context));
     } else {
-      image = new JazzIdenticonDrawable(w, h, recipient.getAddress().serialize());
+      image = new JazzIdenticonDrawable(w, h, recipient.getAddress().serialize().toLowerCase());
     }
     setImageDrawable(image);
   }

src/org/thoughtcrime/securesms/loki/DisplayNameActivity.kt

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.loki
 import android.content.Intent
 import android.os.Bundle
 import android.view.inputmethod.InputMethodManager
-import kotlinx.android.synthetic.main.activity_account_details.*
+import kotlinx.android.synthetic.main.activity_display_name.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.BaseActionBarActivity
@@ -19,21 +19,21 @@ class DisplayNameActivity : BaseActionBarActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_account_details)
+        setContentView(R.layout.activity_display_name)
         nextButton.setOnClickListener { continueIfPossible() }
         Analytics.shared.track("Display Name Screen Viewed")
     }
 
     private fun continueIfPossible() {
-        val uncheckedName = nameEditText.text.toString()
+        val name = nameEditText.text.toString()
-        val name = if (uncheckedName.isNotEmpty()) { uncheckedName.trim() } else { null }
+        if (name.isEmpty()) {
-        if (name != null) {
+            return nameEditText.input.setError("Invalid")
-            if (name.toByteArray().size > ProfileCipher.NAME_PADDED_LENGTH) {
+        }
-                return nameEditText.input.setError("Too Long")
+        if (name.toByteArray().size > ProfileCipher.NAME_PADDED_LENGTH) {
-            } else {
+            return nameEditText.input.setError("Too Long")
-                Analytics.shared.track("Display Name Updated")
+        } else {
-                TextSecurePreferences.setProfileName(this, name)
+            Analytics.shared.track("Display Name Updated")
-            }
+            TextSecurePreferences.setProfileName(this, name)
         }
         val inputMethodManager = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
         inputMethodManager.hideSoftInputFromWindow(nameEditText.windowToken, 0)
@@ -49,8 +49,6 @@ class DisplayNameActivity : BaseActionBarActivity() {
         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)
-            LokiGroupChatAPI(userHexEncodedPublicKey, userPrivateKey, apiDatabase, userDatabase).setDisplayName(name, LokiGroupChatAPI.publicChatServer)
-        }
     }
 }

src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java

@@ -100,7 +100,7 @@ public class ProfilePreference extends Preference {
         int height = avatarView.getHeight();
         if (width == 0 || height == 0) return true;
         avatarView.getViewTreeObserver().removeOnPreDrawListener(this);
-        JazzIdenticonDrawable identicon = new JazzIdenticonDrawable(width, height, userHexEncodedPublicKey);
+        JazzIdenticonDrawable identicon = new JazzIdenticonDrawable(width, height, userHexEncodedPublicKey.toLowerCase());
         avatarView.setImageDrawable(identicon);
         return true;
       }