From 43213d73d4605ae1bdc30cc44e90b3e666de387f Mon Sep 17 00:00:00 2001
From: goapunk <goapunk@riseup.net>
Date: Mon, 2 Jul 2018 18:07:10 +0200
Subject: [PATCH] add debug logging
---
.../keyagreement/KeyAgreementActivity.java | 29 +++++++++++++++++--
.../keyagreement/KeyAgreementFragment.java | 4 +++
2 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/keyagreement/KeyAgreementActivity.java b/mailbox-android/src/main/java/org/briarproject/mailbox/keyagreement/KeyAgreementActivity.java
index ec1da02f0..2b1c1e9c9 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/keyagreement/KeyAgreementActivity.java
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/keyagreement/KeyAgreementActivity.java
@@ -7,6 +7,7 @@ import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
+import android.os.Looper;
import android.support.annotation.UiThread;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.FragmentManager;
@@ -25,6 +26,7 @@ import org.briarproject.mailbox.activity.MailboxActivity;
import org.briarproject.mailbox.fragment.BaseFragment;
import org.briarproject.mailbox.util.UiUtils;
+import java.util.logging.Level;
import java.util.logging.Logger;
import javax.annotation.Nullable;
@@ -38,6 +40,7 @@ import static android.bluetooth.BluetoothAdapter.STATE_ON;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.os.Build.VERSION.SDK_INT;
import static android.widget.Toast.LENGTH_LONG;
+import static java.util.logging.Level.*;
import static org.briarproject.mailbox.R.id;
import static org.briarproject.mailbox.R.layout;
import static org.briarproject.mailbox.R.string;
@@ -115,7 +118,13 @@ public abstract class KeyAgreementActivity extends MailboxActivity implements
isResumed = true;
// Workaround for
// https://code.google.com/p/android/issues/detail?id=190966
- if (canShowQrCodeFragment()) showQrCodeFragment();
+ if (canShowQrCodeFragment()) {
+ LOG.warning("showQrCodeFragment: onPostResume");
+ LOG.log(WARNING, "running on main thread:" +
+ (Looper.getMainLooper().getThread() ==
+ Thread.currentThread()));
+ showQrCodeFragment();
+ }
}
private boolean canShowQrCodeFragment() {
@@ -136,7 +145,14 @@ public abstract class KeyAgreementActivity extends MailboxActivity implements
continueClicked = true;
if (checkPermissions()) {
if (shouldRequestEnableBluetooth()) requestEnableBluetooth();
- else if (canShowQrCodeFragment()) showQrCodeFragment();
+ else if (canShowQrCodeFragment()) {
+ LOG.warning("showQrCodeFragment: showNextScreen");
+ LOG.log(WARNING, "running on main thread:" +
+ (Looper.getMainLooper().getThread() ==
+ Thread.currentThread()));
+ showQrCodeFragment();
+ }
+
}
}
@@ -166,7 +182,13 @@ public abstract class KeyAgreementActivity extends MailboxActivity implements
eventBus.broadcast(new BluetoothEnabledEvent());
enableWasRequested = false;
}
- if (canShowQrCodeFragment()) showQrCodeFragment();
+ if (canShowQrCodeFragment()) {
+ LOG.warning("showQrCodeFragment: showNextScreen");
+ LOG.log(WARNING, "running on main thread:" +
+ (Looper.getMainLooper().getThread() ==
+ Thread.currentThread()));
+ showQrCodeFragment();
+ }
}
@Override
@@ -181,6 +203,7 @@ public abstract class KeyAgreementActivity extends MailboxActivity implements
// FIXME #824
FragmentManager fm = getSupportFragmentManager();
if (fm.findFragmentByTag(KeyAgreementFragment.TAG) == null) {
+ LOG.log(WARNING, "ShowQrCodeFragment");
BaseFragment f = newInstance(this);
fm.beginTransaction()
.replace(id.fragmentContainer, f, f.getUniqueTag())
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/keyagreement/KeyAgreementFragment.java b/mailbox-android/src/main/java/org/briarproject/mailbox/keyagreement/KeyAgreementFragment.java
index 7b3e064fb..61c7262ba 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/keyagreement/KeyAgreementFragment.java
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/keyagreement/KeyAgreementFragment.java
@@ -3,6 +3,7 @@ package org.briarproject.mailbox.keyagreement;
import android.content.Context;
import android.graphics.Bitmap;
import android.os.Bundle;
+import android.os.Looper;
import android.support.annotation.UiThread;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
@@ -95,6 +96,9 @@ public class KeyAgreementFragment extends BaseEventFragment
KeyAgreementEventListener listener) {
Bundle args = new Bundle();
KeyAgreementFragment fragment = new KeyAgreementFragment();
+ LOG.log(WARNING, "running on main thread:" +
+ (Looper.getMainLooper().getThread() == Thread.currentThread()));
+ LOG.log(WARNING, "FragmentListener:" + listener.toString());
fragment.listener = listener;
fragment.setArguments(args);
return fragment;
--
GitLab