diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java index bde9c3b0d..44f10c8c4 100644 --- a/src/org/thoughtcrime/securesms/ApplicationContext.java +++ b/src/org/thoughtcrime/securesms/ApplicationContext.java @@ -13,6 +13,8 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.util.Log; + import androidx.annotation.NonNull; import androidx.multidex.MultiDexApplication; @@ -58,6 +60,8 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi // } // LeakCanary.install(this); + Log.i("DeltaChat", "++++++++++++++++++ ApplicationContext.onCreate() ++++++++++++++++++"); + System.loadLibrary("native-utils"); dcContext = new ApplicationDcContext(this); diff --git a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java index f0096898c..6af73bee2 100644 --- a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java +++ b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java @@ -116,6 +116,7 @@ public class ApplicationDcContext extends DcContext { } public void maybeStartIo() { + Log.i("DeltaChat", "++++++++++++++++++ ApplicationDcContext.maybeStartIo() ++++++++++++++++++"); if (isConfigured()!=0) { startIo(); } diff --git a/src/org/thoughtcrime/securesms/connect/FetchWorker.java b/src/org/thoughtcrime/securesms/connect/FetchWorker.java index 78b4850ba..45986333f 100644 --- a/src/org/thoughtcrime/securesms/connect/FetchWorker.java +++ b/src/org/thoughtcrime/securesms/connect/FetchWorker.java @@ -25,7 +25,7 @@ public class FetchWorker extends Worker { // therefore we do not stopIo() here. @Override public @NonNull Result doWork() { - Log.i("DeltaChat", "-------------------- FetchWorker.doWork() started --------------------"); + Log.i("DeltaChat", "++++++++++++++++++ FetchWorker.doWork() started ++++++++++++++++++"); ApplicationDcContext dcContext = DcHelper.getContext(context); dcContext.maybeStartIo(); @@ -36,7 +36,7 @@ public class FetchWorker extends Worker { // however, we should not wait too long here to avoid getting bad battery ratings. Util.sleep(60 * 1000); - Log.i("DeltaChat", "-------------------- FetchWorker.doWork() done --------------------"); + Log.i("DeltaChat", "++++++++++++++++++ FetchWorker.doWork() will return ++++++++++++++++++"); return Result.success(); } } diff --git a/src/org/thoughtcrime/securesms/connect/ForegroundDetector.java b/src/org/thoughtcrime/securesms/connect/ForegroundDetector.java index 8a8e31320..558ec0eb2 100644 --- a/src/org/thoughtcrime/securesms/connect/ForegroundDetector.java +++ b/src/org/thoughtcrime/securesms/connect/ForegroundDetector.java @@ -5,6 +5,7 @@ import android.app.Activity; import android.app.Application; import android.content.Intent; import android.os.Bundle; +import android.util.Log; import org.thoughtcrime.securesms.ApplicationContext; @@ -36,9 +37,14 @@ public class ForegroundDetector implements Application.ActivityLifecycleCallback @Override public void onActivityStarted(Activity activity) { if (refs == 0) { + Log.i("DeltaChat", "++++++++++++++++++ first ForegroundDetector.onActivityStarted() ++++++++++++++++++"); application.dcContext.maybeStartIo(); if (application.dcContext.isNetworkConnected()) { - new Thread(() -> application.dcContext.maybeNetwork()).start(); + new Thread(() -> { + Log.i("DeltaChat", "calling maybeNetwork()"); + application.dcContext.maybeNetwork(); + Log.i("DeltaChat", "maybeNetwork() returned"); + }).start(); } } @@ -49,10 +55,15 @@ public class ForegroundDetector implements Application.ActivityLifecycleCallback @Override public void onActivityStopped(Activity activity) { if( refs <= 0 ) { + Log.w("DeltaChat", "invalid call to ForegroundDetector.onActivityStopped()"); return; } refs--; + + if (refs == 0) { + Log.i("DeltaChat", "++++++++++++++++++ last ForegroundDetector.onActivityStopped() ++++++++++++++++++"); + } } @Override