From 2495d8032eb6839a55080b79ac818383c2f75b79 Mon Sep 17 00:00:00 2001
From: Pacien TRAN-GIRARD
Date: Fri, 5 May 2017 01:02:16 +0200
Subject: Import unversioned prototype

---
 app/src/main/AndroidManifest.xml                   |  35 +++++++++
 app/src/main/c/exec.c                              |  34 +++++++++
 .../pacien/tincapp/activities/BaseActivity.java    |  71 ++++++++++++++++++
 .../pacien/tincapp/activities/StartActivity.java   |  82 +++++++++++++++++++++
 .../java/org/pacien/tincapp/commands/Command.java  |  67 +++++++++++++++++
 .../java/org/pacien/tincapp/commands/Executor.java |  44 +++++++++++
 .../pacien/tincapp/commands/PermissionFixer.java   |  34 +++++++++
 .../java/org/pacien/tincapp/commands/Tinc.java     |  60 +++++++++++++++
 .../java/org/pacien/tincapp/commands/Tincd.java    |  28 +++++++
 .../java/org/pacien/tincapp/context/AppInfo.java   |  42 +++++++++++
 .../java/org/pacien/tincapp/context/AppPaths.java  |  75 +++++++++++++++++++
 .../org/pacien/tincapp/service/TincVpnService.java |  51 +++++++++++++
 .../tincapp/service/VpnInterfaceConfigurator.java  |  81 ++++++++++++++++++++
 .../java/org/pacien/tincapp/util/Function.java     |  28 +++++++
 app/src/main/res/drawable/ic_help_primary_24dp.xml |   9 +++
 app/src/main/res/icon.png                          | Bin 0 -> 13933 bytes
 app/src/main/res/icon.svg                          |   1 +
 app/src/main/res/layout/base.xml                   |  47 ++++++++++++
 app/src/main/res/layout/dialog_frame.xml           |  11 +++
 app/src/main/res/layout/page_start.xml             |  43 +++++++++++
 app/src/main/res/menu/menu_base.xml                |  14 ++++
 app/src/main/res/mipmap-hdpi/ic_launcher.png       | Bin 0 -> 1103 bytes
 app/src/main/res/mipmap-mdpi/ic_launcher.png       | Bin 0 -> 777 bytes
 app/src/main/res/mipmap-xhdpi/ic_launcher.png      | Bin 0 -> 1400 bytes
 app/src/main/res/mipmap-xxhdpi/ic_launcher.png     | Bin 0 -> 2312 bytes
 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png    | Bin 0 -> 3425 bytes
 app/src/main/res/values-v21/styles.xml             |   8 ++
 app/src/main/res/values-w820dp/dimens.xml          |   3 +
 app/src/main/res/values/colors.xml                 |   7 ++
 app/src/main/res/values/dimens.xml                 |   9 +++
 app/src/main/res/values/strings.xml                |  33 +++++++++
 app/src/main/res/values/styles.xml                 |  16 ++++
 32 files changed, 933 insertions(+)
 create mode 100644 app/src/main/AndroidManifest.xml
 create mode 100644 app/src/main/c/exec.c
 create mode 100644 app/src/main/java/org/pacien/tincapp/activities/BaseActivity.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/activities/StartActivity.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/commands/Command.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/commands/Executor.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/commands/PermissionFixer.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/commands/Tinc.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/commands/Tincd.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/context/AppInfo.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/context/AppPaths.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/service/TincVpnService.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/service/VpnInterfaceConfigurator.java
 create mode 100644 app/src/main/java/org/pacien/tincapp/util/Function.java
 create mode 100644 app/src/main/res/drawable/ic_help_primary_24dp.xml
 create mode 100644 app/src/main/res/icon.png
 create mode 100644 app/src/main/res/icon.svg
 create mode 100644 app/src/main/res/layout/base.xml
 create mode 100644 app/src/main/res/layout/dialog_frame.xml
 create mode 100644 app/src/main/res/layout/page_start.xml
 create mode 100644 app/src/main/res/menu/menu_base.xml
 create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 create mode 100644 app/src/main/res/values-v21/styles.xml
 create mode 100644 app/src/main/res/values-w820dp/dimens.xml
 create mode 100644 app/src/main/res/values/colors.xml
 create mode 100644 app/src/main/res/values/dimens.xml
 create mode 100644 app/src/main/res/values/strings.xml
 create mode 100644 app/src/main/res/values/styles.xml

(limited to 'app/src/main')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..2822d37
--- /dev/null
+++ b/app/src/main/AndroidManifest.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+		  package="org.pacien.tincapp">
+
+	<uses-permission android:name="android.permission.INTERNET"/>
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
+	<application
+		android:allowBackup="false"
+		android:icon="@mipmap/ic_launcher"
+		android:label="@string/app_label"
+		android:supportsRtl="true"
+		android:theme="@style/AppTheme">
+
+		<activity
+			android:name=".activities.StartActivity"
+			android:label="@string/app_label"
+			android:theme="@style/AppTheme.NoActionBar">
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN"/>
+				<category android:name="android.intent.category.LAUNCHER"/>
+			</intent-filter>
+		</activity>
+
+		<service
+			android:name="org.pacien.tincapp.service.TincVpnService"
+			android:permission="android.permission.BIND_VPN_SERVICE">
+			<intent-filter>
+				<action android:name="android.net.VpnService"/>
+			</intent-filter>
+		</service>
+
+	</application>
+
+</manifest>
diff --git a/app/src/main/c/exec.c b/app/src/main/c/exec.c
new file mode 100644
index 0000000..fdaec0f
--- /dev/null
+++ b/app/src/main/c/exec.c
@@ -0,0 +1,34 @@
+#include <jni.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+static inline const char **to_string_array(JNIEnv *env, jobjectArray ja) {
+	const int len = (*env)->GetArrayLength(env, ja);
+	const char **ca = calloc((size_t) len + 1, sizeof(char *));
+
+	for (int i = 0; i < len; ++i) {
+		jstring jstr = (jstring) (*env)->GetObjectArrayElement(env, ja, i);
+		ca[i] = (*env)->GetStringUTFChars(env, jstr, NULL);
+	}
+
+	ca[len] = NULL;
+	return ca;
+}
+
+static inline void exec(const char **argcv) {
+	execv(argcv[0], (char *const *) argcv);
+	exit(1);
+}
+
+JNIEXPORT jint JNICALL
+Java_org_pacien_tincapp_commands_Executor_forkExec(JNIEnv *env, jclass class, jobjectArray argcv) {
+	pid_t pid = fork();
+	switch (pid) {
+		case 0:
+			exec(to_string_array(env, argcv));
+			return 0;
+
+		default:
+			return pid;
+	}
+}
diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.java b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.java
new file mode 100644
index 0000000..0e6cb95
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.java
@@ -0,0 +1,71 @@
+package org.pacien.tincapp.activities;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.annotation.StringRes;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.ViewGroup;
+
+import org.pacien.tincapp.BuildConfig;
+import org.pacien.tincapp.R;
+import org.pacien.tincapp.context.AppInfo;
+
+/**
+ * @author pacien
+ */
+public abstract class BaseActivity extends AppCompatActivity {
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.base);
+		Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+		setSupportActionBar(toolbar);
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu m) {
+		getMenuInflater().inflate(R.menu.menu_base, m);
+		return true;
+	}
+
+	public void aboutDialog(MenuItem i) {
+		new AlertDialog.Builder(this)
+				.setTitle(BuildConfig.APPLICATION_ID)
+				.setMessage(getResources().getString(R.string.app_short_desc) + "\n\n" +
+						getResources().getString(R.string.app_copyright) + " " +
+						getResources().getString(R.string.app_license) + "\n\n" +
+						AppInfo.all(getResources()))
+				.setNeutralButton(R.string.action_open_project_website, (dialog, which) -> openWebsite(R.string.app_website_url))
+				.setPositiveButton(R.string.action_close, (dialog, which) -> { /* nop */ })
+				.show();
+	}
+
+	protected ViewGroup getContentView() {
+		return (ViewGroup) findViewById(R.id.main_content);
+	}
+
+	protected void openWebsite(@StringRes int url) {
+		startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getResources().getString(url))));
+	}
+
+	protected void notify(@StringRes int msg) {
+		Snackbar.make(findViewById(R.id.activity_base), msg, Snackbar.LENGTH_LONG).show();
+	}
+
+	protected void copyIntoClipboard(String label, String str) {
+		ClipboardManager c = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+		c.setPrimaryClip(ClipData.newPlainText(label, str));
+		notify(R.string.message_text_copied);
+	}
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.java b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.java
new file mode 100644
index 0000000..e469fa0
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.java
@@ -0,0 +1,82 @@
+package org.pacien.tincapp.activities;
+
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+
+import org.pacien.tincapp.R;
+import org.pacien.tincapp.commands.PermissionFixer;
+import org.pacien.tincapp.context.AppPaths;
+import org.pacien.tincapp.service.TincVpnService;
+
+/**
+ * @author pacien
+ */
+public class StartActivity extends BaseActivity {
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		getLayoutInflater().inflate(R.layout.page_start, getContentView());
+	}
+
+	@Override
+	protected void onActivityResult(int request, int result, Intent data) {
+		notify(result == RESULT_OK ? R.string.message_vpn_permissions_granted : R.string.message_vpn_permissions_denied);
+	}
+
+	public void requestVpnPermission(View v) {
+		Intent askPermIntent = TincVpnService.prepare(this);
+
+		if (askPermIntent != null)
+			startActivityForResult(askPermIntent, 0);
+		else
+			onActivityResult(0, RESULT_OK, null);
+	}
+
+	public void startVpnDialog(View v) {
+		final EditText i = new EditText(this);
+		i.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
+		i.setHint(R.string.field_net_name);
+
+		@SuppressLint("InflateParams")
+		ViewGroup vg = (ViewGroup) getLayoutInflater().inflate(R.layout.dialog_frame, null);
+		vg.addView(i);
+
+		new AlertDialog.Builder(this)
+				.setTitle(R.string.title_connect_to_network)
+				.setView(vg)
+				.setPositiveButton(R.string.action_connect, (dialog, which) -> startVpn(i.getText().toString()))
+				.setNegativeButton(R.string.action_close, (dialog, which) -> { /* nop */ })
+				.show();
+	}
+
+	public void confDirDialog(View v) {
+		String confDir = AppPaths.confDir(this).getPath();
+
+		new AlertDialog.Builder(this)
+				.setTitle(R.string.title_tinc_config_dir)
+				.setMessage(confDir)
+				.setNeutralButton(R.string.action_fix_perms, (dialog, which) -> fixPerms())
+				.setNegativeButton(R.string.action_copy,
+						(dialog, which) -> copyIntoClipboard(getResources().getString(R.string.title_tinc_config_dir), confDir))
+				.setPositiveButton(R.string.action_close, (dialog, which) -> { /* nop */ })
+				.show();
+	}
+
+	private void startVpn(String netName) {
+		startService(new Intent(this, TincVpnService.class)
+				.putExtra(TincVpnService.INTENT_EXTRA_NET_NAME, netName));
+	}
+
+	private void fixPerms() {
+		boolean ok = PermissionFixer.makePrivateDirsPublic(getApplicationContext());
+		notify(ok ? R.string.message_perms_fixed : R.string.message_perms_fix_failure);
+	}
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Command.java b/app/src/main/java/org/pacien/tincapp/commands/Command.java
new file mode 100644
index 0000000..28ff226
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/commands/Command.java
@@ -0,0 +1,67 @@
+package org.pacien.tincapp.commands;
+
+import com.annimon.stream.Collectors;
+import com.annimon.stream.Optional;
+import com.annimon.stream.Stream;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * @author pacien
+ */
+class Command {
+
+	static private class Option {
+		final String key;
+		final Optional<java.lang.String> val;
+
+		Option(String key, String val) {
+			this.key = key;
+			this.val = Optional.ofNullable(val);
+		}
+
+		@Override
+		public String toString() {
+			return val.isPresent() ? "--" + key + "=" + val.get() : "--" + key;
+		}
+	}
+
+	final private String cmd;
+	final private List<Option> opts;
+	final private List<String> args;
+
+	public Command(String cmd) {
+		this.cmd = cmd;
+		this.opts = new LinkedList<>();
+		this.args = new LinkedList<>();
+	}
+
+	public Command withOption(String key, String val) {
+		this.opts.add(new Option(key, val));
+		return this;
+	}
+
+	public Command withOption(String key) {
+		return this.withOption(key, null);
+	}
+
+	public Command withArguments(String... args) {
+		this.args.addAll(Arrays.asList(args));
+		return this;
+	}
+
+	public List<String> asList() {
+		return Collections.unmodifiableList(
+				Stream.concat(Stream.of(Collections.singleton(this.cmd)),
+						Stream.concat(Stream.of(this.opts).map(Option::toString), Stream.of(this.args)))
+						.collect(Collectors.toList()));
+	}
+
+	public String[] asArray() {
+		return this.asList().toArray(new String[0]);
+	}
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Executor.java b/app/src/main/java/org/pacien/tincapp/commands/Executor.java
new file mode 100644
index 0000000..edf229c
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/commands/Executor.java
@@ -0,0 +1,44 @@
+package org.pacien.tincapp.commands;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * @author pacien
+ */
+final class Executor {
+
+	private Executor() {
+		// static class
+	}
+
+	static {
+		System.loadLibrary("exec");
+	}
+
+	/**
+	 * @return -1 on error, forked child PID otherwise
+	 */
+	static private native int forkExec(String[] argcv);
+
+	static public void forkExec(Command cmd) throws IOException {
+		if (forkExec(cmd.asArray()) == -1)
+			throw new IOException();
+	}
+
+	static public List<String> call(Command cmd) throws IOException {
+		Process proc = new ProcessBuilder(cmd.asList()).start();
+		BufferedReader outputReader = new BufferedReader(new InputStreamReader(proc.getInputStream()));
+
+		String line;
+		List<String> list = new LinkedList<>();
+		while ((line = outputReader.readLine()) != null) list.add(line);
+
+		return Collections.unmodifiableList(list);
+	}
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/commands/PermissionFixer.java b/app/src/main/java/org/pacien/tincapp/commands/PermissionFixer.java
new file mode 100644
index 0000000..b00d0d6
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/commands/PermissionFixer.java
@@ -0,0 +1,34 @@
+package org.pacien.tincapp.commands;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+
+import com.annimon.stream.Stream;
+
+import org.pacien.tincapp.context.AppPaths;
+
+import java.io.File;
+
+/**
+ * @author pacien
+ */
+final public class PermissionFixer {
+
+	private PermissionFixer() {
+		// static class
+	}
+
+	@SuppressLint({"SetWorldReadable", "SetWorldWritable"})
+	static private Boolean setAllRWXPermissions(File f) {
+		return f.setReadable(true, false)
+				&& f.setWritable(true, false)
+				&& f.setExecutable(true, false);
+	}
+
+	static public Boolean makePrivateDirsPublic(Context ctx) {
+		return Stream.of(AppPaths.confDir(ctx), AppPaths.logDir(ctx), AppPaths.pidDir(ctx))
+				.map(PermissionFixer::setAllRWXPermissions)
+				.reduce((x, y) -> x && y).get();
+	}
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Tinc.java b/app/src/main/java/org/pacien/tincapp/commands/Tinc.java
new file mode 100644
index 0000000..ca11698
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/commands/Tinc.java
@@ -0,0 +1,60 @@
+package org.pacien.tincapp.commands;
+
+import android.content.Context;
+
+import com.annimon.stream.Stream;
+
+import org.pacien.tincapp.context.AppPaths;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author pacien
+ */
+final public class Tinc {
+
+	private Tinc() {
+		// static class
+	}
+
+	static private Command newCommand(Context ctx, String netName) {
+		return new Command(AppPaths.tinc(ctx).getAbsolutePath())
+				.withOption("config", AppPaths.confDir(ctx, netName).getAbsolutePath())
+				.withOption("pidfile", AppPaths.pidFile(ctx, netName).getAbsolutePath());
+	}
+
+	// independently runnable commands
+
+	static public List<String> network(Context ctx) throws IOException {
+		return Executor.call(new Command(AppPaths.tinc(ctx).getAbsolutePath())
+				.withOption("config", AppPaths.confDir(ctx).getAbsolutePath())
+				.withArguments("network"));
+	}
+
+	static public List<String> fsck(Context ctx, String netName, Boolean fix) throws IOException {
+		Command cmd = newCommand(ctx, netName).withArguments("fsck");
+		if (fix) cmd = cmd.withOption("force");
+		return Executor.call(cmd);
+	}
+
+	// commands requiring a running tinc daemon
+
+	static public void stop(Context ctx, String netName) throws IOException {
+		Executor.call(newCommand(ctx, netName).withArguments("stop"));
+	}
+
+	static public List<String> dumpNodes(Context ctx, String netName, Boolean reachable) throws IOException {
+		Command cmd = reachable
+				? newCommand(ctx, netName).withArguments("dump", "reachable", "nodes")
+				: newCommand(ctx, netName).withArguments("dump", "nodes");
+
+		return Executor.call(cmd);
+	}
+
+	static public String info(Context ctx, String netName, String node) throws IOException {
+		List<String> output = Executor.call(newCommand(ctx, netName).withArguments("info", node));
+		return Stream.of(output).reduce((l, r) -> l + '\n' + r).get();
+	}
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Tincd.java b/app/src/main/java/org/pacien/tincapp/commands/Tincd.java
new file mode 100644
index 0000000..07acc3d
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/commands/Tincd.java
@@ -0,0 +1,28 @@
+package org.pacien.tincapp.commands;
+
+import android.content.Context;
+
+import org.pacien.tincapp.context.AppPaths;
+
+import java.io.IOException;
+
+/**
+ * @author pacien
+ */
+final public class Tincd {
+
+	private Tincd() {
+		// static class
+	}
+
+	static public void start(Context ctx, String netName, Integer fd) throws IOException {
+		Executor.forkExec(new Command(AppPaths.tincd(ctx).getAbsolutePath())
+				.withOption("no-detach")
+				.withOption("config", AppPaths.confDir(ctx, netName).getAbsolutePath())
+				.withOption("pidfile", AppPaths.pidFile(ctx, netName).getAbsolutePath())
+				.withOption("logfile", AppPaths.logFile(ctx, netName).getAbsolutePath())
+				.withOption("option", "DeviceType=fd")
+				.withOption("option", "Device=" + fd));
+	}
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppInfo.java b/app/src/main/java/org/pacien/tincapp/context/AppInfo.java
new file mode 100644
index 0000000..075402d
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/context/AppInfo.java
@@ -0,0 +1,42 @@
+package org.pacien.tincapp.context;
+
+import android.content.res.Resources;
+import android.os.Build;
+
+import com.annimon.stream.Stream;
+
+import org.pacien.tincapp.BuildConfig;
+import org.pacien.tincapp.R;
+
+/**
+ * @author pacien
+ */
+final public class AppInfo {
+
+	private AppInfo() {
+		// static class
+	}
+
+	static public String appVersion(Resources r) {
+		return r.getString(R.string.info_version_format,
+				BuildConfig.VERSION_NAME,
+				BuildConfig.BUILD_TYPE);
+	}
+
+	static public String androidVersion(Resources r) {
+		return r.getString(R.string.info_running_on_format,
+				Build.VERSION.CODENAME,
+				Build.VERSION.RELEASE);
+	}
+
+	static public String supportedABIs(Resources r) {
+		return r.getString(R.string.info_supported_abis_format,
+				Stream.of(Build.SUPPORTED_ABIS).reduce((x, y) -> x + "," + y).get());
+	}
+
+	static public String all(Resources r) {
+		return Stream.of(appVersion(r), androidVersion(r), supportedABIs(r))
+				.reduce((x, y) -> x + '\n' + y).get();
+	}
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppPaths.java b/app/src/main/java/org/pacien/tincapp/context/AppPaths.java
new file mode 100644
index 0000000..d854d4e
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/context/AppPaths.java
@@ -0,0 +1,75 @@
+package org.pacien.tincapp.context;
+
+import android.content.Context;
+
+import java.io.File;
+
+/**
+ * @author pacien
+ * @implNote Logs and PID files are stored in the cache directory for easy clean up.
+ */
+final public class AppPaths {
+
+	private AppPaths() {
+		// static class
+	}
+
+	static final private String CONFDIR = "conf";
+	static final private String LOGDIR = "log";
+	static final private String PIDDIR = "pid";
+
+	static final private String TINCD_BIN = "libtincd.so";
+	static final private String TINC_BIN = "libtinc.so";
+
+	static final private String LOGFILE_FORMAT = "tinc.%s.log";
+	static final private String PIDFILE_FORMAT = "tinc.%s.pid";
+
+	static final private String NET_CONF_FILE = "network.conf";
+
+	static private File createDirIfNotExists(File basePath, String newDir) {
+		File f = new File(basePath, newDir);
+		f.mkdirs();
+		return f;
+	}
+
+	static public File confDir(Context ctx) {
+		return ctx.getDir(CONFDIR, Context.MODE_PRIVATE);
+	}
+
+	static public File confDir(Context ctx, String netName) {
+		return new File(confDir(ctx), netName);
+	}
+
+	static public File logDir(Context ctx) {
+		return createDirIfNotExists(ctx.getCacheDir(), LOGDIR);
+	}
+
+	static public File pidDir(Context ctx) {
+		return createDirIfNotExists(ctx.getCacheDir(), PIDDIR);
+	}
+
+	static public File logFile(Context ctx, String netName) {
+		return new File(logDir(ctx), String.format(LOGFILE_FORMAT, netName));
+	}
+
+	static public File pidFile(Context ctx, String netName) {
+		return new File(pidDir(ctx), String.format(PIDFILE_FORMAT, netName));
+	}
+
+	static public File netConfFile(Context ctx, String netName) {
+		return new File(confDir(ctx, netName), NET_CONF_FILE);
+	}
+
+	static public File binDir(Context ctx) {
+		return new File(ctx.getApplicationInfo().nativeLibraryDir);
+	}
+
+	static public File tincd(Context ctx) {
+		return new File(binDir(ctx), TINCD_BIN);
+	}
+
+	static public File tinc(Context ctx) {
+		return new File(binDir(ctx), TINC_BIN);
+	}
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.java b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.java
new file mode 100644
index 0000000..1a6f58f
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.java
@@ -0,0 +1,51 @@
+package org.pacien.tincapp.service;
+
+import android.app.Service;
+import android.content.Intent;
+import android.net.VpnService;
+
+import org.pacien.tincapp.BuildConfig;
+import org.pacien.tincapp.commands.Tinc;
+import org.pacien.tincapp.commands.Tincd;
+import org.pacien.tincapp.context.AppPaths;
+
+import java.io.IOException;
+
+import static org.pacien.tincapp.util.Function.applyIgnoringExcept;
+
+/**
+ * @author pacien
+ */
+public class TincVpnService extends VpnService {
+
+	static final public String INTENT_EXTRA_NET_NAME = "netName";
+
+	private String netName;
+
+	@Override
+	public int onStartCommand(Intent intent, int flags, int startId) {
+		this.netName = intent.getStringExtra(INTENT_EXTRA_NET_NAME);
+
+		Builder net = new Builder().setSession(this.netName);
+		VpnInterfaceConfigurator.applyConfiguration(net, AppPaths.netConfFile(this, this.netName));
+		applyIgnoringExcept(net::addDisallowedApplication, BuildConfig.APPLICATION_ID);
+
+		try {
+			Tincd.start(this, this.netName, net.establish().detachFd());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+		return Service.START_STICKY;
+	}
+
+	@Override
+	public void onDestroy() {
+		try {
+			Tinc.stop(this, this.netName);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/service/VpnInterfaceConfigurator.java b/app/src/main/java/org/pacien/tincapp/service/VpnInterfaceConfigurator.java
new file mode 100644
index 0000000..0bf6ada
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/service/VpnInterfaceConfigurator.java
@@ -0,0 +1,81 @@
+package org.pacien.tincapp.service;
+
+import android.net.VpnService;
+
+import com.annimon.stream.Stream;
+import com.annimon.stream.function.BiFunction;
+import com.annimon.stream.function.Consumer;
+
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.builder.fluent.Configurations;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+
+import java.io.File;
+
+import static org.pacien.tincapp.util.Function.applyIgnoringExcept;
+
+/**
+ * @author pacien
+ */
+final public class VpnInterfaceConfigurator {
+
+	private VpnInterfaceConfigurator() {
+		// static class
+	}
+
+	static final public String KEY_ADDRESSES = "Address";
+	static final public String KEY_ROUTES = "Route";
+	static final public String KEY_DNS_SERVERS = "DNSServer";
+	static final public String KEY_SEARCH_DOMAINS = "SearchDomain";
+	static final public String KEY_ALLOWED_APPLICATIONS = "AllowApplication";
+	static final public String KEY_DISALLOWED_APPLICATIONS = "DisallowApplication";
+	static final public String KEY_ALLOWED_FAMILIES = "AllowFamily";
+	static final public String KEY_ALLOW_BYPASS = "AllowBypass";
+	static final public String KEY_BLOCKING = "Blocking";
+	static final public String KEY_MTU = "MTU";
+
+	static private Stream<String> getStringStream(Configuration cfg, String key) {
+		return Stream.ofNullable(cfg.getList(String.class, key));
+	}
+
+	static private Stream<Integer> getIntegerStream(Configuration cfg, String key) {
+		return Stream.ofNullable(cfg.getList(Integer.class, key));
+	}
+
+	static private void doIf(Configuration cfg, String key, Consumer<Boolean> func) {
+		if (cfg.getBoolean(key, false)) func.accept(true);
+	}
+
+	static private void doWithInt(Configuration cfg, String key, Consumer<Integer> func) {
+		Stream.ofNullable(cfg.getInteger(key, null)).forEach(func);
+	}
+
+	static private <R> R applyAddressNetmask(BiFunction<String, Integer, R> func, String addrStr) {
+		String[] addrParts = addrStr.split("/", 2);
+		return func.apply(addrParts[0], Integer.parseInt(addrParts[1]));
+	}
+
+	static public VpnService.Builder applyConfiguration(VpnService.Builder net, Configuration cfg) {
+		getStringStream(cfg, KEY_ADDRESSES).forEach(str -> applyAddressNetmask(net::addAddress, str));
+		getStringStream(cfg, KEY_ROUTES).forEach(str -> applyAddressNetmask(net::addRoute, str));
+		getStringStream(cfg, KEY_DNS_SERVERS).forEach(net::addDnsServer);
+		getStringStream(cfg, KEY_SEARCH_DOMAINS).forEach(net::addSearchDomain);
+		getStringStream(cfg, KEY_ALLOWED_APPLICATIONS).forEach(str -> applyIgnoringExcept(net::addAllowedApplication, str));
+		getStringStream(cfg, KEY_DISALLOWED_APPLICATIONS).forEach(str -> applyIgnoringExcept(net::addDisallowedApplication, str));
+		getIntegerStream(cfg, KEY_ALLOWED_FAMILIES).forEach(net::allowFamily);
+		doIf(cfg, KEY_ALLOW_BYPASS, v -> net.allowBypass());
+		doIf(cfg, KEY_BLOCKING, net::setBlocking);
+		doWithInt(cfg, KEY_MTU, net::setMtu);
+
+		return net;
+	}
+
+	static public VpnService.Builder applyConfiguration(VpnService.Builder net, File cfg) {
+		try {
+			return applyConfiguration(net, new Configurations().properties(cfg));
+		} catch (ConfigurationException e) {
+			throw new IllegalArgumentException(e.getMessage());
+		}
+	}
+
+}
diff --git a/app/src/main/java/org/pacien/tincapp/util/Function.java b/app/src/main/java/org/pacien/tincapp/util/Function.java
new file mode 100644
index 0000000..3a6e115
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/util/Function.java
@@ -0,0 +1,28 @@
+package org.pacien.tincapp.util;
+
+import com.annimon.stream.function.FunctionalInterface;
+
+/**
+ * @author pacien
+ */
+final public class Function {
+
+	private Function() {
+		// static class
+	}
+
+	@FunctionalInterface
+	public interface CheckedFunction<T, R> {
+		R apply(T t) throws Exception;
+	}
+
+	static public <T, R> R applyIgnoringExcept(CheckedFunction<T, R> func, T parm) {
+		try {
+			return func.apply(parm);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+}
diff --git a/app/src/main/res/drawable/ic_help_primary_24dp.xml b/app/src/main/res/drawable/ic_help_primary_24dp.xml
new file mode 100644
index 0000000..b325098
--- /dev/null
+++ b/app/src/main/res/drawable/ic_help_primary_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/textPrimary"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
+</vector>
diff --git a/app/src/main/res/icon.png b/app/src/main/res/icon.png
new file mode 100644
index 0000000..2e6a55d
Binary files /dev/null and b/app/src/main/res/icon.png differ
diff --git a/app/src/main/res/icon.svg b/app/src/main/res/icon.svg
new file mode 100644
index 0000000..b0a2abc
--- /dev/null
+++ b/app/src/main/res/icon.svg
@@ -0,0 +1 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><defs><linearGradient x1="0" y1="0" x2="0" y2="0" gradientUnits="userSpaceOnUse" id="color-1"><stop offset="0" stop-color="#000000" stop-opacity="0.3"></stop><stop offset="1" stop-color="#000000" stop-opacity="0"></stop></linearGradient><filter id="dropshadow-base"><feColorMatrix type="matrix" values="0 0 0 0 0  0 0 0 0 0  0 0 0 0 0  0 0 0 .8 0"></feColorMatrix> <feOffset dx="0" dy="1"></feOffset> <feGaussianBlur stdDeviation="1"></feGaussianBlur> <feComposite in="SourceGraphic"></feComposite></filter><filter id="dropshadow-banner" x="-10%" y="-10%" width="120%" height="130%"><feColorMatrix type="matrix" values="0 0 0 0 0  0 0 0 0 0  0 0 0 0 0  0 0 0 .4 0"></feColorMatrix> <feOffset dx="0" dy="1"></feOffset> <feGaussianBlur stdDeviation="0.5"></feGaussianBlur> <feComposite in="SourceGraphic"></feComposite></filter></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="none" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M7,43c-1.10457,0 -2,-0.89543 -2,-2v-34c0,-1.10457 0.89543,-2 2,-2h34c1.10457,0 2,0.89543 2,2v34c0,1.10457 -0.89543,2 -2,2z" id="base 1 9" fill="#424242" stroke-width="1"></path><path d="M31.77839,8.44322l40.00014,40.00014l-6.22271,6.22271l-4.66703,-4.66703h-10.88975v6.22271h-3.11136l-33.77743,-33.77743v-9.33407h18.66814z" fill="url(#color-1)" stroke-width="1"></path><path d="M16.22161,16.22161h15.55678v4.66703l6.22271,-6.22271l-6.22271,-6.22271v4.66703h-18.66814v9.33407h3.11136zM31.77839,31.77839h-15.55678v-4.66703l-6.22271,6.22271l6.22271,6.22271v-4.66703h18.66814v-9.33407h-3.11136z" fill="none" stroke-width="0"></path><path d="M16.22161,22.44432h-3.11136v-9.33407h18.66814v-4.66703l6.22271,6.22271l-6.22271,6.22271v-4.66703h-15.55678zM31.77839,25.55568h3.11136v9.33407h-18.66814v4.66703l-6.22271,-6.22271l6.22271,-6.22271v4.66703h15.55678z" fill="#ffffff" stroke-width="0"></path><path d="M2,24c0,-12.15026 9.84974,-22 22,-22c12.15026,0 22,9.84974 22,22c0,12.15026 -9.84974,22 -22,22c-12.15026,0 -22,-9.84974 -22,-22z" id="base 1 5 1" fill="none" stroke-width="1"></path><path d="M2,24c0,-12.15026 9.84974,-22 22,-22c12.15026,0 22,9.84974 22,22c0,12.15026 -9.84974,22 -22,22c-12.15026,0 -22,-9.84974 -22,-22z" id="base 1 1 1" fill="none" stroke-width="1"></path><g fill="#000000" stroke-width="1" font-family="Roboto, sans-serif" font-weight="normal" font-size="14" text-anchor="start"></g><rect x="2" y="2" width="44" height="22" fill="none" stroke-width="1"></rect><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path><g fill="#000000" stroke-width="1" font-family="Roboto, sans-serif" font-weight="normal" font-size="14" text-anchor="start"></g><rect x="2" y="2" width="44" height="22" fill="none" stroke-width="1"></rect><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path><path d="M5,7c0,-1.10457 0.89543,-2 2,-2h34c1.10457,0 2,0.89543 2,2v17h-38z" id="base 1 6 1" fill-opacity="0.1" fill="#000000" stroke-width="1"></path><path d="M2,24v-22h44v22z" fill="none" stroke-width="1"></path></g></svg>
\ No newline at end of file
diff --git a/app/src/main/res/layout/base.xml b/app/src/main/res/layout/base.xml
new file mode 100644
index 0000000..11df049
--- /dev/null
+++ b/app/src/main/res/layout/base.xml
@@ -0,0 +1,47 @@
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+												 xmlns:app="http://schemas.android.com/apk/res-auto"
+												 xmlns:tools="http://schemas.android.com/tools"
+												 android:id="@+id/activity_base"
+												 android:layout_width="match_parent"
+												 android:layout_height="match_parent"
+												 android:fitsSystemWindows="true"
+												 tools:context="org.pacien.tincapp.activities.BaseActivity">
+
+	<android.support.design.widget.AppBarLayout
+		android:id="@+id/appbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingTop="@dimen/appbar_padding_top"
+		android:theme="@style/AppTheme.AppBarOverlay">
+
+		<android.support.v7.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/actionBarSize"
+			android:background="?attr/colorPrimary"
+			app:layout_scrollFlags="enterAlways"
+			app:popupTheme="@style/AppTheme.PopupOverlay">
+
+		</android.support.v7.widget.Toolbar>
+
+	</android.support.design.widget.AppBarLayout>
+
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+		<FrameLayout
+			android:id="@+id/main_content"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:paddingBottom="@dimen/activity_vertical_margin"
+			android:paddingLeft="@dimen/activity_horizontal_margin"
+			android:paddingRight="@dimen/activity_horizontal_margin"
+			android:paddingTop="@dimen/activity_vertical_margin">
+
+		</FrameLayout>
+
+	</ScrollView>
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/dialog_frame.xml b/app/src/main/res/layout/dialog_frame.xml
new file mode 100644
index 0000000..82a130f
--- /dev/null
+++ b/app/src/main/res/layout/dialog_frame.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:layout_width="match_parent"
+			  android:layout_height="wrap_content"
+			  android:orientation="vertical"
+			  android:paddingBottom="@dimen/dialog_vertical_margin"
+			  android:paddingLeft="@dimen/dialog_horizontal_margin"
+			  android:paddingRight="@dimen/dialog_horizontal_margin"
+			  android:paddingTop="@dimen/dialog_vertical_margin">
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/page_start.xml b/app/src/main/res/layout/page_start.xml
new file mode 100644
index 0000000..8ead05b
--- /dev/null
+++ b/app/src/main/res/layout/page_start.xml
@@ -0,0 +1,43 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  xmlns:tools="http://schemas.android.com/tools"
+			  android:id="@+id/fragment_start"
+			  android:layout_width="match_parent"
+			  android:layout_height="wrap_content"
+			  android:orientation="vertical"
+			  tools:context="org.pacien.tincapp.activities.StartActivity">
+
+	<TextView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:text="\nThis is a technical preview of the application, with a minimal user interface that should be sufficient for testing.
+		\nNo check is performed on user input, and the application will simply crash at the first encountered error (refer to ADB logs)."/>
+
+	<TextView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:text="\nActions"/>
+
+	<Button
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:onClick="requestVpnPermission"
+		android:text="@string/title_request_vpn_permissions"/>
+
+	<Button
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:onClick="startVpnDialog"
+		android:text="@string/title_connect_to_network"/>
+
+	<TextView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:text="\nInfo"/>
+
+	<Button
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:onClick="confDirDialog"
+		android:text="@string/menu_display_conf_dir"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/menu/menu_base.xml b/app/src/main/res/menu/menu_base.xml
new file mode 100644
index 0000000..bfb0c87
--- /dev/null
+++ b/app/src/main/res/menu/menu_base.xml
@@ -0,0 +1,14 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	  xmlns:app="http://schemas.android.com/apk/res-auto"
+	  xmlns:tools="http://schemas.android.com/tools"
+	  tools:context="org.pacien.tincapp.activities.BaseActivity">
+
+	<item
+		android:id="@+id/menu_about"
+		android:icon="@drawable/ic_help_primary_24dp"
+		android:onClick="aboutDialog"
+		android:tint="@color/colorAccent"
+		android:title="@string/menu_about"
+		app:showAsAction="ifRoom"/>
+
+</menu>
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..9e2f791
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..8e7ee07
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..39523a1
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..bbf6351
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..0859e14
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 0000000..19d23c1
--- /dev/null
+++ b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,8 @@
+<resources>
+	<style name="AppTheme.NoActionBar">
+		<item name="windowActionBar">false</item>
+		<item name="windowNoTitle">true</item>
+		<item name="android:windowDrawsSystemBarBackgrounds">true</item>
+		<item name="android:statusBarColor">@android:color/transparent</item>
+	</style>
+</resources>
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000..42a1541
--- /dev/null
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+	<dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..5e30dc2
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<color name="textPrimary">#FFFFFFFF</color>
+	<color name="colorPrimary">#424242</color>
+	<color name="colorPrimaryDark">#212121</color>
+	<color name="colorAccent">#FBC02D</color>
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..9d64c93
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,9 @@
+<resources>
+	<!-- Default screen margins, per the Android Design guidelines. -->
+	<dimen name="activity_horizontal_margin">16dp</dimen>
+	<dimen name="activity_vertical_margin">16dp</dimen>
+	<dimen name="dialog_horizontal_margin">20dp</dimen>
+	<dimen name="dialog_vertical_margin">20dp</dimen>
+	<dimen name="appbar_padding_top">0dp</dimen>
+	<dimen name="text_margin">16dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..943f9b2
--- /dev/null
+++ b/app/src/main/res/values/strings.xml
@@ -0,0 +1,33 @@
+<resources>
+	<string name="app_name">Tinc App</string>
+	<string name="app_label">Tinc</string>
+	<string name="app_short_desc">Android binding and user interface for the tinc mesh VPN daemon.</string>
+	<string name="app_copyright">Copyright 2017 Pacien.</string>
+	<string name="app_license">Software distributed under the terms of the GNU General Public License v3.</string>
+	<string name="app_website_url">http://tincapp.pacien.org</string>
+
+	<string name="info_version_format">App version %1$s (%2$s build)</string>
+	<string name="info_running_on_format">Running on Android %1$s %2$s</string>
+	<string name="info_supported_abis_format">Device ABIs: %1$s</string>
+
+	<string name="menu_about">About this app</string>
+	<string name="menu_display_conf_dir">Show configuration directory</string>
+
+	<string name="field_net_name">Tinc network name</string>
+
+	<string name="title_tinc_config_dir">Tinc config directory</string>
+	<string name="title_connect_to_network">Connect to network</string>
+	<string name="title_request_vpn_permissions">Request VPN permissions</string>
+
+	<string name="action_close">Close</string>
+	<string name="action_copy">Copy</string>
+	<string name="action_open_project_website">Project website</string>
+	<string name="action_fix_perms">Set conf editable</string>
+	<string name="action_connect">Connect</string>
+
+	<string name="message_perms_fixed">New permissions successfully applied.</string>
+	<string name="message_perms_fix_failure">Error encountered when setting new permissions.</string>
+	<string name="message_text_copied">Text copied to clipboard.</string>
+	<string name="message_vpn_permissions_granted">VPN permissions granted.</string>
+	<string name="message_vpn_permissions_denied">VPN permissions denied.</string>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..6b849c8
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,16 @@
+<resources>
+	<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+		<item name="colorPrimary">@color/colorPrimary</item>
+		<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+		<item name="colorAccent">@color/colorAccent</item>
+	</style>
+
+	<style name="AppTheme.NoActionBar">
+		<item name="windowActionBar">false</item>
+		<item name="windowNoTitle">true</item>
+	</style>
+
+	<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+
+	<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
+</resources>
-- 
cgit v1.2.3