Implement rough onboarding redesign

src/org/thoughtcrime/securesms/ApplicationContext.java

@@ -603,7 +603,12 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
 
   public void updatePublicChatProfileAvatarIfNeeded() {
     AsyncTask.execute(() -> {
-      LokiPublicChatAPI publicChatAPI = getLokiPublicChatAPI();
+      LokiPublicChatAPI publicChatAPI = null;
+      try {
+        publicChatAPI = getLokiPublicChatAPI();
+      } catch (Exception e) {
+        // Do nothing
+      }
       if (publicChatAPI != null) {
         byte[] profileKey = ProfileKeyUtil.getProfileKey(this);
         String url = TextSecurePreferences.getProfileAvatarUrl(this);

src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java

@@ -5,7 +5,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.annotation.IdRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -14,9 +13,9 @@ import android.support.v4.app.Fragment;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.loki.redesign.LandingActivity;
 import org.thoughtcrime.securesms.loki.SeedActivity;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
-import org.thoughtcrime.securesms.registration.WelcomeActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
@@ -182,7 +181,7 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
   }
 
   private Intent getWelcomeIntent() {
-    return getRoutedIntent(WelcomeActivity.class, getPushRegistrationIntent());
+    return getRoutedIntent(LandingActivity.class, getPushRegistrationIntent());
   }
 
   private Intent getPushRegistrationIntent() {

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

@@ -0,0 +1,19 @@
+package org.thoughtcrime.securesms.loki.redesign
+
+import android.os.Bundle
+import kotlinx.android.synthetic.main.activity_display_name_v2.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.BaseActionBarActivity
+
+class DisplayNameActivity : BaseActionBarActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_display_name_v2)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        displayNameEditText.requestFocus()
+    }
+}

src/org/thoughtcrime/securesms/loki/redesign/LandingActivity.kt

@@ -0,0 +1,27 @@
+package org.thoughtcrime.securesms.loki.redesign
+
+import android.content.Intent
+import android.os.Bundle
+import kotlinx.android.synthetic.main.activity_landing.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.BaseActionBarActivity
+
+class LandingActivity : BaseActionBarActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_landing)
+        registerButton.setOnClickListener { register() }
+        restoreButton.setOnClickListener { restore() }
+    }
+
+    private fun register() {
+        val intent = Intent(this, RegisterActivity::class.java)
+        startActivity(intent)
+    }
+
+    private fun restore() {
+        val intent = Intent(this, RestoreActivity::class.java)
+        startActivity(intent)
+    }
+}

src/org/thoughtcrime/securesms/loki/redesign/RegisterActivity.kt

@@ -0,0 +1,21 @@
+package org.thoughtcrime.securesms.loki.redesign
+
+import android.content.Intent
+import android.os.Bundle
+import kotlinx.android.synthetic.main.activity_register.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.BaseActionBarActivity
+
+class RegisterActivity : BaseActionBarActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_register)
+        registerButton.setOnClickListener { register() }
+    }
+
+    private fun register() {
+        val intent = Intent(this, DisplayNameActivity::class.java)
+        startActivity(intent)
+    }
+}

src/org/thoughtcrime/securesms/loki/redesign/RestoreActivity.kt

@@ -0,0 +1,19 @@
+package org.thoughtcrime.securesms.loki.redesign
+
+import android.os.Bundle
+import kotlinx.android.synthetic.main.activity_restore.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.BaseActionBarActivity
+
+class RestoreActivity : BaseActionBarActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_restore)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        mnemonicEditText.requestFocus()
+    }
+}