From 86f409d0bfa164986ac5e6a6c21aa072d5cb4c5b Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Fri, 6 May 2016 09:22:34 +0100
Subject: [PATCH] Don't send dev reports until transport is enabled.
---
.../org/briarproject/plugins/tor/TorPlugin.java | 14 +++++++++-----
.../briarproject/api/reporting/DevReporter.java | 1 -
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java b/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
index a09af47243..0f7aaf65c1 100644
--- a/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
+++ b/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
@@ -233,7 +233,6 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
if (phase != null && phase.contains("PROGRESS=100")) {
LOG.info("Tor has already bootstrapped");
connectionStatus.setBootstrapped();
- sendDevReports();
}
}
// Register to receive network status events
@@ -615,7 +614,10 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
connectionStatus.getAndSetCircuitBuilt()) {
LOG.info("First circuit built");
backoff.reset();
- if (isRunning()) callback.transportEnabled();
+ if (isRunning()) {
+ sendDevReports();
+ callback.transportEnabled();
+ }
}
}
@@ -641,9 +643,11 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
if (LOG.isLoggable(INFO)) LOG.info(severity + " " + msg);
if (severity.equals("NOTICE") && msg.startsWith("Bootstrapped 100%")) {
connectionStatus.setBootstrapped();
- sendDevReports();
backoff.reset();
- if (isRunning()) callback.transportEnabled();
+ if (isRunning()) {
+ sendDevReports();
+ callback.transportEnabled();
+ }
}
}
@@ -688,7 +692,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
Object o = appContext.getSystemService(CONNECTIVITY_SERVICE);
ConnectivityManager cm = (ConnectivityManager) o;
NetworkInfo net = cm.getActiveNetworkInfo();
- boolean online = net != null && net.isConnected();
+ boolean online = net != null && net.isConnected();
boolean wifi = online && net.getType() == TYPE_WIFI;
String country = locationUtils.getCurrentCountry();
boolean blocked = TorNetworkMetadata.isTorProbablyBlocked(
diff --git a/briar-api/src/org/briarproject/api/reporting/DevReporter.java b/briar-api/src/org/briarproject/api/reporting/DevReporter.java
index f4b17820c1..7c0f14aa01 100644
--- a/briar-api/src/org/briarproject/api/reporting/DevReporter.java
+++ b/briar-api/src/org/briarproject/api/reporting/DevReporter.java
@@ -2,7 +2,6 @@ package org.briarproject.api.reporting;
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.IOException;
/**
* A task for reporting back to the developers.
--
GitLab