Updated java.library.path.

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidExecutorImpl.java

@@ -0,0 +1,78 @@
+package org.briarproject.bramble.system;
+
+import android.app.Application;
+import android.os.Handler;
+import android.os.Looper;
+
+import org.briarproject.bramble.api.system.AndroidExecutor;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.inject.Inject;
+
+class AndroidExecutorImpl implements AndroidExecutor {
+
+	private final Handler uiHandler;
+	private final Runnable loop;
+	private final AtomicBoolean started = new AtomicBoolean(false);
+	private final CountDownLatch startLatch = new CountDownLatch(1);
+
+	private volatile Handler backgroundHandler = null;
+
+	@Inject
+	AndroidExecutorImpl(Application app) {
+		uiHandler = new Handler(app.getApplicationContext().getMainLooper());
+		loop = new Runnable() {
+			@Override
+			public void run() {
+				Looper.prepare();
+				backgroundHandler = new Handler();
+				startLatch.countDown();
+				Looper.loop();
+			}
+		};
+	}
+
+	private void startIfNecessary() {
+		if (!started.getAndSet(true)) {
+			Thread t = new Thread(loop, "AndroidExecutor");
+			t.setDaemon(true);
+			t.start();
+		}
+		try {
+			startLatch.await();
+		} catch (InterruptedException e) {
+			throw new RejectedExecutionException(e);
+		}
+	}
+
+	@Override
+	public <V> Future<V> runOnBackgroundThread(Callable<V> c) {
+		FutureTask<V> f = new FutureTask<>(c);
+		runOnBackgroundThread(f);
+		return f;
+	}
+
+	@Override
+	public void runOnBackgroundThread(Runnable r) {
+		startIfNecessary();
+		backgroundHandler.post(r);
+	}
+
+	@Override
+	public <V> Future<V> runOnUiThread(Callable<V> c) {
+		FutureTask<V> f = new FutureTask<>(c);
+		runOnUiThread(f);
+		return f;
+	}
+
+	@Override
+	public void runOnUiThread(Runnable r) {
+		uiHandler.post(r);
+	}
+}

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidLocationUtils.java

@@ -0,0 +1,72 @@
+package org.briarproject.bramble.system;
+
+import android.annotation.SuppressLint;
+import android.app.Application;
+import android.content.Context;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.system.LocationUtils;
+
+import java.util.Locale;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import static android.content.Context.TELEPHONY_SERVICE;
+
+@NotNullByDefault
+class AndroidLocationUtils implements LocationUtils {
+
+	private static final Logger LOG =
+			Logger.getLogger(AndroidLocationUtils.class.getName());
+
+	private final Context appContext;
+
+	@Inject
+	AndroidLocationUtils(Application app) {
+		appContext = app.getApplicationContext();
+	}
+
+	/**
+	 * This guesses the current country from the first of these sources that
+	 * succeeds (also in order of likelihood of being correct):
+	 *
+	 * <ul>
+	 * <li>Phone network. This works even when no SIM card is inserted, or a
+	 *     foreign SIM card is inserted.</li>
+	 * <li>SIM card. This is only an heuristic and assumes the user is not
+	 *     roaming.</li>
+	 * <li>User locale. This is an even worse heuristic.</li>
+	 * </ul>
+	 *
+	 * Note: this is very similar to <a href="https://android.googlesource.com/platform/frameworks/base/+/cd92588%5E/location/java/android/location/CountryDetector.java">
+	 * this API</a> except it seems that Google doesn't want us to use it for
+	 * some reason - both that class and {@code Context.COUNTRY_CODE} are
+	 * annotated {@code @hide}.
+	 */
+	@Override
+	@SuppressLint("DefaultLocale")
+	public String getCurrentCountry() {
+		String countryCode = getCountryFromPhoneNetwork();
+		if (!TextUtils.isEmpty(countryCode)) return countryCode.toUpperCase();
+		LOG.info("Falling back to SIM card country");
+		countryCode = getCountryFromSimCard();
+		if (!TextUtils.isEmpty(countryCode)) return countryCode.toUpperCase();
+		LOG.info("Falling back to user-defined locale");
+		return Locale.getDefault().getCountry();
+	}
+
+	private String getCountryFromPhoneNetwork() {
+		Object o = appContext.getSystemService(TELEPHONY_SERVICE);
+		TelephonyManager tm = (TelephonyManager) o;
+		return tm.getNetworkCountryIso();
+	}
+
+	private String getCountryFromSimCard() {
+		Object o = appContext.getSystemService(TELEPHONY_SERVICE);
+		TelephonyManager tm = (TelephonyManager) o;
+		return tm.getSimCountryIso();
+	}
+}

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSeedProvider.java

@@ -0,0 +1,42 @@
+package org.briarproject.bramble.system;
+
+import android.app.Application;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.os.Build;
+import android.provider.Settings;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import javax.annotation.concurrent.Immutable;
+import javax.inject.Inject;
+
+import static android.provider.Settings.Secure.ANDROID_ID;
+
+@Immutable
+@NotNullByDefault
+class AndroidSeedProvider extends LinuxSeedProvider {
+
+	private final Context appContext;
+
+	@Inject
+	AndroidSeedProvider(Application app) {
+		appContext = app.getApplicationContext();
+	}
+
+	@Override
+	void writeToEntropyPool(DataOutputStream out) throws IOException {
+		out.writeInt(android.os.Process.myPid());
+		out.writeInt(android.os.Process.myTid());
+		out.writeInt(android.os.Process.myUid());
+		if (Build.FINGERPRINT != null) out.writeUTF(Build.FINGERPRINT);
+		if (Build.SERIAL != null) out.writeUTF(Build.SERIAL);
+		ContentResolver contentResolver = appContext.getContentResolver();
+		String id = Settings.Secure.getString(contentResolver, ANDROID_ID);
+		if (id != null) out.writeUTF(id);
+		super.writeToEntropyPool(out);
+	}
+}

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSystemModule.java

@@ -0,0 +1,33 @@
+package org.briarproject.bramble.system;
+
+import android.app.Application;
+
+import org.briarproject.bramble.api.system.AndroidExecutor;
+import org.briarproject.bramble.api.system.LocationUtils;
+import org.briarproject.bramble.api.system.SeedProvider;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class AndroidSystemModule {
+
+	@Provides
+	@Singleton
+	SeedProvider provideSeedProvider(Application app) {
+		return new AndroidSeedProvider(app);
+	}
+
+	@Provides
+	LocationUtils provideLocationUtils(Application app) {
+		return new AndroidLocationUtils(app);
+	}
+
+	@Provides
+	@Singleton
+	AndroidExecutor provideAndroidExecutor(Application app) {
+		return new AndroidExecutorImpl(app);
+	}
+}