1 files changed, 7 insertions, 9 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index cabdfc8fa..eb09fe859 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -830,7 +830,8 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
                 showJoinConferenceDialog(invite.getJid().asBareJid().toString());
                 return false;
             }
-        } else if (contacts.size() == 0) {
+        } else if (contacts.size() == 0) { //TODO or init mode
+            //TODO if init mode; prefill dialog with account jid
             showCreateContactDialog(invite.getJid().toString(), invite);
             return false;
         } else if (contacts.size() == 1) {
@@ -1232,7 +1233,8 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
 
     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));
+            final String invite = from.getStringExtra(EXTRA_INVITE_URI);
+            to.putExtra(EXTRA_INVITE_URI, invite);
         }
     }
 
@@ -1240,17 +1242,13 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
 
         public String account;
 
-        public boolean forceDialog = false;
+        boolean forceDialog = false;
 
-        public Invite(final Uri uri) {
+        Invite(final String uri) {
             super(uri);
         }
 
-        public Invite(final String uri) {
-            super(uri);
-        }
-
-        public Invite(Uri uri, boolean safeSource) {
+        Invite(Uri uri, boolean safeSource) {
             super(uri, safeSource);
         }