If chat opened via shortcut widget, adapter created again, "intent" chat replaced. Fix #108

app/src/main/java/com/xabber/android/ui/ChatViewer.java

@@ -63,6 +63,7 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
     private static final String ACTION_ATTENTION = "com.xabber.android.data.ATTENTION";
     private static final String ACTION_RECENT_CHATS = "com.xabber.android.data.RECENT_CHATS";
     private static final String ACTION_SPECIFIC_CHAT = "com.xabber.android.data.ACTION_SPECIFIC_CHAT";
+    private static final String ACTION_SHORTCUT = "com.xabber.android.data.ACTION_SHORTCUT";
 
     private static final String SAVED_INITIAL_ACCOUNT = "com.xabber.android.ui.ChatViewer.SAVED_INITIAL_ACCOUNT";
     private static final String SAVED_INITIAL_USER = "com.xabber.android.ui.ChatViewer.SAVED_INITIAL_USER";
@@ -135,6 +136,12 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
         return intent;
     }
 
+    public static Intent createShortCutIntent(Context context, String account, String user) {
+        Intent intent = createClearTopIntent(context, account, user);
+        intent.setAction(ACTION_SHORTCUT);
+        return intent;
+    }
+
     /**
      * Create intent to send message.
      * <p/>
@@ -179,6 +186,10 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
             restoreInstanceState(savedInstanceState);
         }
 
+        initChats();
+    }
+
+    private void initChats() {
         if (initialChat != null) {
             chatViewerAdapter = new ChatViewerAdapter(getFragmentManager(), initialChat, this);
         } else {
@@ -223,6 +234,7 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
             case ACTION_SPECIFIC_CHAT:
             case ACTION_ATTENTION:
             case Intent.ACTION_SEND:
+            case ACTION_SHORTCUT:
                 isRecentChatsSelected = false;
                 selectedChat = new BaseEntity(getAccount(intent), getUser(intent));
                 break;
@@ -237,7 +249,13 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
         }
 
         setIntent(intent);
+
         getSelectedPageDataFromIntent();
+
+        if (intent.getAction().equals(ACTION_SHORTCUT)) {
+            getInitialChatFromIntent();
+            initChats();
+        }
     }
 
     private void restoreInstanceState(Bundle savedInstanceState) {

app/src/main/java/com/xabber/android/ui/ContactList.java

@@ -548,7 +548,7 @@ public class ContactList extends ManagedActivity implements OnAccountChangedList
 
     private void createShortcut(AbstractContact abstractContact) {
         Intent intent = new Intent();
-        intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, ChatViewer.createClearTopIntent(this,
+        intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, ChatViewer.createShortCutIntent(this,
                 abstractContact.getAccount(), abstractContact.getUser()));
         intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, abstractContact.getName());
         Bitmap bitmap;