load currently open conversation faster

4 files changed, 81 insertions, 6 deletions

diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
index f76711857..010dbbceb 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
@@ -1013,7 +1013,6 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
                             } else {
                                 fetchDeviceListStatus.put(jid, false);
                             }
-                            Log.d(Config.LOGTAG, response.toString());
                             if (callbacks1 != null) {
                                 for (OnDeviceIdsFetched callback1 : callbacks1) {
                                     callback1.fetched(jid, null);
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 07a1fcca8..a6e798bc8 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -117,6 +117,7 @@ import de.pixart.messenger.utils.Namespace;
 import de.pixart.messenger.utils.OnPhoneContactsLoadedListener;
 import de.pixart.messenger.utils.PRNGFixes;
 import de.pixart.messenger.utils.PhoneHelper;
+import de.pixart.messenger.utils.QuickLoader;
 import de.pixart.messenger.utils.ReplacingSerialSingleThreadExecutor;
 import de.pixart.messenger.utils.ReplacingTaskManager;
 import de.pixart.messenger.utils.Resolver;
@@ -1581,11 +1582,17 @@ public class XmppConnectionService extends Service {
                 loadPhoneContacts();
                 Log.d(Config.LOGTAG, "restoring messages...");
                 final long startMessageRestore = SystemClock.elapsedRealtime();
-                for (Conversation conversation : conversations) {
-                    conversation.addAll(0, databaseBackend.getMessages(conversation, Config.PAGE_SIZE));
-                    checkDeletedFiles(conversation);
-                    conversation.findUnsentTextMessages(message -> markMessage(message, Message.STATUS_WAITING));
-                    conversation.findUnreadMessages(message -> mNotificationService.pushFromBacklog(message));
+                final Conversation quickLoad = QuickLoader.get(this.conversations);
+                if (quickLoad != null) {
+                    restoreMessages(quickLoad);
+                    updateConversationUi();
+                    final long diffMessageRestore = SystemClock.elapsedRealtime() - startMessageRestore;
+                    Log.d(Config.LOGTAG, "quickly restored " + quickLoad.getName() + " after " + diffMessageRestore + "ms");
+                }
+                for (Conversation conversation : this.conversations) {
+                    if (quickLoad != conversation) {
+                        restoreMessages(conversation);
+                    }
                 }
                 mNotificationService.finishBacklog(false);
                 restoredFromDatabaseLatch.countDown();
@@ -1597,6 +1604,13 @@ public class XmppConnectionService extends Service {
         }
     }
 
+    private void restoreMessages(Conversation conversation) {
+        conversation.addAll(0, databaseBackend.getMessages(conversation, Config.PAGE_SIZE));
+        checkDeletedFiles(conversation);
+        conversation.findUnsentTextMessages(message -> markMessage(message, Message.STATUS_WAITING));
+        conversation.findUnreadMessages(message -> mNotificationService.pushFromBacklog(message));
+    }
+
     public void loadPhoneContacts() {
         mContactMergerExecutor.execute(() -> PhoneHelper.loadPhoneContacts(XmppConnectionService.this, new OnPhoneContactsLoadedListener() {
             @Override
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 1f03dc778..823eacf55 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -107,6 +107,7 @@ import de.pixart.messenger.utils.FileUtils;
 import de.pixart.messenger.utils.MenuDoubleTabUtil;
 import de.pixart.messenger.utils.MessageUtils;
 import de.pixart.messenger.utils.NickValidityChecker;
+import de.pixart.messenger.utils.QuickLoader;
 import de.pixart.messenger.utils.StylingHelper;
 import de.pixart.messenger.utils.UIHelper;
 import de.pixart.messenger.xmpp.XmppConnection;
@@ -2084,6 +2085,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         String uuid = savedInstanceState.getString(STATE_CONVERSATION_UUID);
         pendingLastMessageUuid.push(savedInstanceState.getString(STATE_LAST_MESSAGE_UUID, null));
         if (uuid != null) {
+            QuickLoader.set(uuid);
             this.pendingConversationsUuid.push(uuid);
             String takePhotoUri = savedInstanceState.getString(STATE_PHOTO_URI);
             if (takePhotoUri != null) {
@@ -2153,6 +2155,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
     }
 
     public void reInit(Conversation conversation, Bundle extras) {
+        QuickLoader.set(conversation.getUuid());
         this.saveMessageDraftStopAudioPlayer();
         if (this.reInit(conversation, extras != null)) {
             if (extras != null) {
diff --git a/src/main/java/de/pixart/messenger/utils/QuickLoader.java b/src/main/java/de/pixart/messenger/utils/QuickLoader.java
new file mode 100644
index 000000000..f7d1964c2
--- /dev/null
+++ b/src/main/java/de/pixart/messenger/utils/QuickLoader.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2018, Daniel Gultsch All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package de.pixart.messenger.utils;
+
+import java.util.List;
+
+import de.pixart.messenger.entities.Conversation;
+
+public class QuickLoader {
+
+    private static String CONVERSATION_UUID = null;
+    private static Object LOCK = new Object();
+
+    public static void set(final String uuid) {
+        synchronized (LOCK) {
+            CONVERSATION_UUID = uuid;
+        }
+    }
+
+    public static Conversation get(List<Conversation> haystack) {
+        synchronized (LOCK) {
+            if (CONVERSATION_UUID == null) {
+                return null;
+            }
+            for (Conversation conversation : haystack) {
+                if (conversation.getUuid().equals(CONVERSATION_UUID)) {
+                    return conversation;
+                }
+            }
+        }
+        return null;
+    }
+}
\ No newline at end of file