From ba3e6ffba2d27470c448be3c3e28c06b8932b8ee Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Thu, 15 Nov 2018 20:44:00 +0100 Subject: refactored some ManageAccount, WelcomeActivity and a few other things --- src/main/java/de/pixart/messenger/ui/WelcomeActivity.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src/main/java/de/pixart/messenger/ui/WelcomeActivity.java') diff --git a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java index cdb6a63a2..60461f1b6 100644 --- a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java +++ b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java @@ -43,7 +43,6 @@ import de.pixart.messenger.utils.XmppUri; public class WelcomeActivity extends XmppActivity { - public static final String EXTRA_INVITE_URI = "eu.siacs.conversations.invite_uri"; boolean importSuccessful = false; @Override @@ -329,19 +328,7 @@ public class WelcomeActivity extends XmppActivity { } public void addInviteUri(Intent intent) { - addInviteUri(intent, getIntent()); - } - - public static void addInviteUri(Intent intent, XmppUri uri) { - if (uri.isJidValid()) { - intent.putExtra(EXTRA_INVITE_URI, uri.toString()); - } - } - - public static void addInviteUri(Intent to, Intent from) { - if (from != null && from.hasExtra(EXTRA_INVITE_URI)) { - to.putExtra(EXTRA_INVITE_URI, from.getStringExtra(EXTRA_INVITE_URI)); - } + StartConversationActivity.addInviteUri(intent, getIntent()); } public static void launch(AppCompatActivity activity) { -- cgit v1.2.3