Bump version numbers for 1.0.7 release.

Watch for creation rather than updating of Tor cookie file

See merge request akwizgran/briar!825

bramble-android/build.gradle

@@ -8,8 +8,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 26
-		versionCode 10006
+		versionCode 10007
-		versionName "1.0.6"
+		versionName "1.0.7"
 		consumerProguardFiles 'proguard-rules.txt'
 	}
 

bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java

@@ -185,18 +185,15 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		if (used.getAndSet(true)) throw new IllegalStateException();
 		// Install or update the assets if necessary
 		if (!assetsAreUpToDate()) installAssets();
-		LOG.info("Starting Tor");
+		// Watch for the auth cookie file being created
-		// Watch for the auth cookie file being updated
+		if (cookieFile.getParentFile().mkdirs())
-		try {
+			LOG.info("Created directory for cookie file");
-			cookieFile.getParentFile().mkdirs();
+		if (cookieFile.delete()) LOG.info("Deleted old cookie file");
-			cookieFile.createNewFile();
-		} catch (IOException e) {
-			throw new PluginException(e);
-		}
 		CountDownLatch latch = new CountDownLatch(1);
-		FileObserver obs = new WriteObserver(cookieFile, latch);
+		FileObserver obs = new CreateObserver(cookieFile, latch);
 		obs.startWatching();
 		// Start a new Tor process
+		LOG.info("Starting Tor");
 		String torPath = torFile.getAbsolutePath();
 		String configPath = configFile.getAbsolutePath();
 		String pid = String.valueOf(android.os.Process.myPid());
@@ -364,7 +361,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			File[] children = f.listFiles();
 			if (children != null) for (File child : children) listFiles(child);
 		} else {
-			LOG.info(f.getAbsolutePath());
+			LOG.info(f.getAbsolutePath() + " " + f.length());
 		}
 	}
 
@@ -641,22 +638,6 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			LOG.info("Descriptor uploaded");
 	}
 
-	private static class WriteObserver extends FileObserver {
-
-		private final CountDownLatch latch;
-
-		private WriteObserver(File file, CountDownLatch latch) {
-			super(file.getAbsolutePath(), CLOSE_WRITE);
-			this.latch = latch;
-		}
-
-		@Override
-		public void onEvent(int event, @Nullable String path) {
-			stopWatching();
-			latch.countDown();
-		}
-	}
-
 	@Override
 	public void eventOccurred(Event e) {
 		if (e instanceof SettingsUpdatedEvent) {
@@ -717,6 +698,26 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		if (oldConnectivityCheck != null) oldConnectivityCheck.cancel(false);
 	}
 
+	private static class CreateObserver extends FileObserver {
+
+		private final File file;
+		private final CountDownLatch latch;
+
+		private CreateObserver(File file, CountDownLatch latch) {
+			super(file.getParentFile().getAbsolutePath(), CREATE | MOVED_TO);
+			this.file = file;
+			this.latch = latch;
+		}
+
+		@Override
+		public void onEvent(int event, @Nullable String path) {
+			if (file.exists()) {
+				stopWatching();
+				latch.countDown();
+			}
+		}
+	}
+
 	private class NetworkStateReceiver extends BroadcastReceiver {
 
 		@Override

briar-android/build.gradle

@@ -238,15 +238,16 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 26
-		versionCode 10006
+		versionCode 10007
-		versionName "1.0.6"
+		versionName "1.0.7"
 		applicationId "org.briarproject.briar.android"
 		resValue "string", "app_package", "org.briarproject.briar.android"
 		resValue "string", "app_name", "Briar"
 		buildConfigField "String", "GitHash",
 				"\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\""
+		def now = (long) (System.currentTimeMillis() / 1000)
 		buildConfigField "Long", "BuildTimestamp",
-				"${getStdout(['git', 'log', '-n', '1', '--format=%ct'], 0)}000L"
+				"${getStdout(['git', 'log', '-n', '1', '--format=%ct'], now)}000L"
 	}
 
 	buildTypes {

briar-android/src/main/java/org/briarproject/briar/android/logging/BriefLogFormatter.java

@@ -42,6 +42,22 @@ public class BriefLogFormatter extends Formatter {
 		tag = tag.substring(tag.lastIndexOf('.') + 1);
 		sb.append(tag).append(": ");
 		sb.append(record.getMessage());
+		Throwable t = record.getThrown();
+		if (t != null) {
+			sb.append('\n');
+			appendThrowable(sb, t);
+		}
 		return sb.toString();
 	}
+
+	private void appendThrowable(StringBuilder sb, Throwable t) {
+		sb.append(t);
+		for (StackTraceElement e : t.getStackTrace())
+			sb.append("\n        at ").append(e);
+		Throwable cause = t.getCause();
+		if (cause != null) {
+			sb.append("\n     Caused by: ");
+			appendThrowable(sb, cause);
+		}
+	}
 }