diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java index 1470276bb2962e31260a2cc5377bebca5352a262..111730a90d4aaddcc731cbadc76f8e2cbb41f06d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/BaseActivity.java @@ -34,6 +34,7 @@ import org.briarproject.briar.api.android.ScreenFilterMonitor.AppDetails; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.logging.Logger; import javax.annotation.Nullable; import javax.inject.Inject; @@ -42,6 +43,8 @@ import static android.arch.lifecycle.Lifecycle.State.STARTED; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.WindowManager.LayoutParams.FLAG_SECURE; import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT; +import static java.util.logging.Level.INFO; +import static java.util.logging.Logger.getLogger; import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS; /** @@ -51,6 +54,8 @@ import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOT public abstract class BaseActivity extends AppCompatActivity implements DestroyableContext, OnTapFilteredListener { + private final static Logger LOG = getLogger(BaseActivity.class.getName()); + @Inject protected ScreenFilterMonitor screenFilterMonitor; @@ -119,6 +124,8 @@ public abstract class BaseActivity extends AppCompatActivity @Override protected void onStart() { super.onStart(); + if (LOG.isLoggable(INFO)) + LOG.info("Starting " + this.getClass().getSimpleName()); for (ActivityLifecycleController alc : lifecycleControllers) { alc.onActivityStart(); } @@ -137,6 +144,8 @@ public abstract class BaseActivity extends AppCompatActivity @Override protected void onStop() { super.onStop(); + if (LOG.isLoggable(INFO)) + LOG.info("Stopping " + this.getClass().getSimpleName()); for (ActivityLifecycleController alc : lifecycleControllers) { alc.onActivityStop(); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java index 61e6bffebc63328f1f9a4d941ecf95e24af18dd4..7e25d93222b2f3f8e8de8d1f6c4c782221a9383d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java @@ -20,17 +20,12 @@ import android.widget.TextView; import org.briarproject.briar.R; -import java.util.logging.Logger; - import javax.annotation.Nullable; import static org.briarproject.briar.android.util.UiUtils.MIN_DATE_RESOLUTION; public class BriarRecyclerView extends FrameLayout { - private static final Logger LOG = - Logger.getLogger(BriarRecyclerView.class.getName()); - private final Handler handler = new Handler(Looper.getMainLooper()); private RecyclerView recyclerView; @@ -39,6 +34,7 @@ public class BriarRecyclerView extends FrameLayout { private TextView emptyText, emptyAction; private ProgressBar progressBar; private RecyclerView.AdapterDataObserver emptyObserver; + @Nullable private Runnable refresher = null; private boolean isScrollingToEnd = false; @@ -217,18 +213,15 @@ public class BriarRecyclerView extends FrameLayout { throw new IllegalStateException("Need to call setAdapter() first!"); } refresher = () -> { - LOG.info("Updating Content..."); Adapter adapter = recyclerView.getAdapter(); adapter.notifyItemRangeChanged(0, adapter.getItemCount()); handler.postDelayed(refresher, MIN_DATE_RESOLUTION); }; - LOG.info("Adding Handler Callback"); handler.postDelayed(refresher, MIN_DATE_RESOLUTION); } public void stopPeriodicUpdate() { if (refresher != null) { - LOG.info("Removing Handler Callback"); handler.removeCallbacks(refresher); refresher = null; }