From c1e6b6b086cb125d72818dd9d5d815407b6fb7e1 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 2 Dec 2019 23:32:54 -0500 Subject: [PATCH] Add better Loader performance logs. --- .../securesms/conversation/ConversationActivity.java | 2 -- .../securesms/conversation/ConversationFragment.java | 4 ---- .../thoughtcrime/securesms/util/AbstractCursorLoader.java | 6 ++++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 4b3c878e5a..d669a487f4 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -364,8 +364,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity @Override protected void onCreate(Bundle state, boolean ready) { - Log.i(TAG, "onCreate()"); - RecipientId recipientId = getIntent().getParcelableExtra(RECIPIENT_EXTRA); if (recipientId == null) { diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java index dc2b03c622..8ddf6cec1f 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -146,7 +146,6 @@ public class ConversationFragment extends Fragment private int previousOffset; private int activeOffset; private boolean firstLoad; - private long loaderStartTime; private ActionMode actionMode; private Locale locale; private RecyclerView list; @@ -654,7 +653,6 @@ public class ConversationFragment extends Fragment @Override public @NonNull Loader onCreateLoader(int id, Bundle args) { Log.i(TAG, "onCreateLoader"); - loaderStartTime = System.currentTimeMillis(); int limit = args.getInt(KEY_LIMIT, PARTIAL_CONVERSATION_LIMIT); int offset = 0; @@ -668,9 +666,7 @@ public class ConversationFragment extends Fragment @Override public void onLoadFinished(@NonNull Loader cursorLoader, Cursor cursor) { - long loadTime = System.currentTimeMillis() - loaderStartTime; int count = cursor.getCount(); - Log.i(TAG, "onLoadFinished - took " + loadTime + " ms to load a cursor of size " + count); ConversationLoader loader = (ConversationLoader)cursorLoader; ConversationAdapter adapter = getListAdapter(); diff --git a/src/org/thoughtcrime/securesms/util/AbstractCursorLoader.java b/src/org/thoughtcrime/securesms/util/AbstractCursorLoader.java index b8fbef3803..7eedfea698 100644 --- a/src/org/thoughtcrime/securesms/util/AbstractCursorLoader.java +++ b/src/org/thoughtcrime/securesms/util/AbstractCursorLoader.java @@ -5,6 +5,8 @@ import android.content.Context; import android.database.Cursor; import androidx.loader.content.AsyncTaskLoader; +import org.thoughtcrime.securesms.logging.Log; + /** * A Loader similar to CursorLoader that doesn't require queries to go through the ContentResolver * to get the benefits of reloading when content has changed. @@ -71,11 +73,15 @@ public abstract class AbstractCursorLoader extends AsyncTaskLoader { @Override public Cursor loadInBackground() { + long startTime = System.currentTimeMillis(); + Cursor newCursor = getCursor(); if (newCursor != null) { newCursor.getCount(); newCursor.registerContentObserver(observer); } + + Log.d(TAG, "[" + getClass().getSimpleName() + "] Cursor load time: " + (System.currentTimeMillis() - startTime) + " ms"); return newCursor; }