diff --git a/src/cheogram/AndroidManifest.xml b/src/cheogram/AndroidManifest.xml
index d529680aaa63e26fa39eba97ae31e924f2e2a46e..2488fe193a4cc4144782e7d05438a01cdd721131 100644
--- a/src/cheogram/AndroidManifest.xml
+++ b/src/cheogram/AndroidManifest.xml
@@ -26,11 +26,11 @@
android:launchMode="singleTask" />
{
- final Intent intent = new Intent(this, PickServerActivity.class);
+ final Intent intent = new Intent(this, MagicCreateActivity.class);
addInviteUri(intent);
startActivity(intent);
});
@@ -139,7 +139,20 @@ public class WelcomeActivity extends XmppActivity implements XmppConnectionServi
addInviteUri(intent);
startActivity(intent);
});
-
+ binding.useSnikket.setOnClickListener(v -> {
+ final List accounts = xmppConnectionService.getAccounts();
+ Intent intent = new Intent(WelcomeActivity.this, EditAccountActivity.class);
+ intent.putExtra(EditAccountActivity.EXTRA_FORCE_REGISTER, false);
+ intent.putExtra("snikket", true);
+ if (accounts.size() == 1) {
+ intent.putExtra("jid", accounts.get(0).getJid().asBareJid().toString());
+ intent.putExtra("init", true);
+ } else if (accounts.size() >= 1) {
+ intent = new Intent(WelcomeActivity.this, ManageAccountActivity.class);
+ }
+ addInviteUri(intent);
+ startActivity(intent);
+ });
}
@Override
diff --git a/src/cheogram/res/drawable/getjid.xml b/src/cheogram/res/drawable/getjid.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1bad821a19495989f91b684b96049f526ce968dc
--- /dev/null
+++ b/src/cheogram/res/drawable/getjid.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/cheogram/res/drawable/havejid.xml b/src/cheogram/res/drawable/havejid.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ff9218192aa67540375a4914773c9e32d9f66e51
--- /dev/null
+++ b/src/cheogram/res/drawable/havejid.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/cheogram/res/drawable/snikket.xml b/src/cheogram/res/drawable/snikket.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0a50380e33f53427a282007b4a258a0c88c85c29
--- /dev/null
+++ b/src/cheogram/res/drawable/snikket.xml
@@ -0,0 +1,192 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/cheogram/res/layout/activity_welcome.xml b/src/cheogram/res/layout/activity_welcome.xml
index 33076858adae30fef5889598b12ccd4f03ef1547..c507da2523493363a1fb4d5ba26615881290d669 100644
--- a/src/cheogram/res/layout/activity_welcome.xml
+++ b/src/cheogram/res/layout/activity_welcome.xml
@@ -15,77 +15,78 @@
android:layout_height="match_parent"
android:fillViewport="true">
-
+
+
+
+
+
-
-
-
-
-
-
-
+ android:textColor="?colorAccent" />
-
-
-
-
+ android:layout_gravity="center"
+ android:drawableLeft="@drawable/snikket"
+ android:text="@string/i_am_snikket_user"
+ android:textColor="?colorAccent" />
+
+
-
\ No newline at end of file
+
diff --git a/src/cheogram/res/values/strings.xml b/src/cheogram/res/values/strings.xml
index 3ab98f61064f7886ec5d225b36841df86eda56e0..bea9739aa05c1207f58090f1824007fcd5f94b23 100644
--- a/src/cheogram/res/values/strings.xml
+++ b/src/cheogram/res/values/strings.xml
@@ -2,9 +2,13 @@
Pick your Jabber serviceUse ChatterboxTown
- Create new account
+ Get Jabber ID
+ I need to sign up for a new Jabber ID
+ I already have a Jabber ID
+ I am a Snikket userDo you already have a Jabber ID? This might be the case if you are already using a different Jabber client or have used Cheogram Android, Conversations, or Snikket before. If not you can create a new Jabber ID right now.Jabber is a provider independent instant messaging network, powered by the XMPP protocol. You can use this client with whatever Jabber service you choose.
+ You will be able to communicate with users of other providers by giving them your full Jabber ID.You have been invited to %1$s. We will guide you through the process of creating an account.\nWhen picking %1$s as a provider you will be able to communicate with users of other providers by giving them your full Jabber ID.You have been invited to %1$s. A username has already been picked for you. We will guide you through the process of creating an account.\nYou will be able to communicate with users of other providers by giving them your full Jabber ID.Your server invitation
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index b2d62e6ee0a7c11b3080764499dcc34b38c45363..03091fbe7feaf81ec70332f9ef16684624273db3 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -743,6 +743,9 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
if (mForceRegister != null) {
this.binding.accountRegisterNew.setVisibility(View.GONE);
}
+ if (intent.getBooleanExtra("snikket", false)) {
+ this.binding.accountJidLayout.setHint("Snikket Address");
+ }
}
private void displayVerificationWarningDialog(final XmppUri xmppUri) {