Gradle build

.gitignore

@@ -1,4 +1,6 @@
+/.gradle
 /bin
+/build
 /jni/iodine/src/*.o
 /jni/iodine/bin
 /obj

.travis.yml

@@ -0,0 +1,5 @@
+language: android
+android:
+  components:
+    - build-tools-21.1.2
+    - android-15

README.md

@@ -6,6 +6,13 @@ auf Android
   - (german)[Anwenderdokumentation](doc/anwenderdoku.html) [(PDF)](doc/anwenderdoku.pdf)
   - (german)[Entwicklerdokumentation](doc/entwicklerdoku.html) [(PDF)](doc/entwicklerdoku.pdf)
 
+# Building
+
+``` bash
+(cd jni && ndk-build)
+gradle build
+```
+
 # Authors and License
 Android Iodine Copyright (c) 2013 Yves Fischer <yvesf+andiodine@xapek.org>
 Same license as iodine.
@@ -28,4 +35,3 @@ PERFORMANCE OF THIS SOFTWARE.
 
 MD5 implementation by L. Peter Deutsch (license and source in src/md5.[ch])
 Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
-

build.gradle

@@ -0,0 +1,33 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.1.3'
+    }
+}
+
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 15
+    buildToolsVersion "21.1.2"
+
+    sourceSets.main {
+        jniLibs.srcDir 'libs'
+    }
+
+    productFlavors {
+        arm {
+            ndk {
+                abiFilters "armeabi"
+            }
+        }
+        x86 {
+            ndk {
+                abiFilter "x86"
+            }
+        }
+    }
+}

jni/Android.mk

@@ -26,7 +26,7 @@ $(LOCAL_PATH)/iodine/src/base64u.h: $(LOCAL_PATH)/iodine/src/base64.h
 	@echo '/* No use in editing, produced by Makefile! */' > $@
 	@sed -e 's/\([Bb][Aa][Ss][Ee]64\)/\1u/g ; s/0123456789+/0123456789_/' < $< >> $@
 
-LOCAL_MODULE    := iodine-client
+LOCAL_MODULE := iodine-client
 LOCAL_LDLIBS := -lz -llog
 LOCAL_CFLAGS := -Wall
 LOCAL_SRC_FILES := iodine-client.c \

jni/iodine-client.c

@@ -212,4 +212,3 @@ JNIEXPORT jstring JNICALL Java_org_xapek_andiodine_IodineClient_getPropertyNetDn
 	__system_property_get("net.dns1", value);
 	return (*env)->NewStringUTF(env, value);
 }
-

jni/iodine/src/base64.c

@@ -90,7 +90,7 @@ base64_reverse_init()
 	}
 }
 
-static int 
+static int
 base64_encode(char *buf, size_t *buflen, const void *data, size_t size)
 /*
  * Fills *buf with max. *buflen characters, encoding size bytes of *data.

AndroidManifest.xml → src/main/AndroidManifest.xml

@@ -11,7 +11,6 @@
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
-            android:debuggable="true"
             android:allowBackup="false"
             android:icon="@drawable/logo"
             android:label="@string/app_name"

res/values-de/strings.xml → src/main/res/values-de/strings.xml

@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <string name="app_name">AndIodine</string>
+    <string name="app_about">Über</string>
+
+    <string-array name="pref_entries_dnstype">
+        <item>automatisch</item>
+        <item>NULL</item>
+        <item>TXT</item>
+        <item>SRV</item>
+        <item>MX</item>
+        <item>CNAME</item>
+        <item>A</item>
+    </string-array>
+    <string-array name="pref_entries_nameserver_mode">
+        <item>Netzstandard</item>
+        <item>Brauch</item>
+        <item>Tunnel-Endpunkt</item>
+    </string-array>
+
+    <string name="main_description_add_account">Konto hinzufügen</string>
+    <string name="pref_description_cancel">Rückgängig Machen</string>
+    <string name="configitem_description_close">Schließen Tunnel</string>
     <string name="pref_text_password_label">Passwort</string>
     <string name="pref_text_topdomain_label">Tunnel Toplevel Domain</string>
     <string name="pref_text_tunnel_nameserver_label">Tunnel Nameserver</string>
@@ -28,7 +49,12 @@
     <string name="vpnservice_error_unknown_error_string">Unbekannter Fehler. Grund: %s</string>
     <string name="idle">Leerlauf</string>
     <string name="warning">Warnung</string>
+    <string name="error">Fehler</string>
     <string name="configitem_description_manage">Konfiguriere dieses Verbindungsprofil</string>
     <string name="pref_title">Verbindungseinstellungen</string>
+    <string name="main_create_tunnel">Erstellen Sie DNS-Tunnel von Configuration Namen %s</string>
+    <string name="fragment_list_add">Neuer Kunde</string>
+    <string name="main_about">Über</string>
+    <string name="pref_delete">Löschen</string>
 
-</resources>
+</resources>

res/values/strings.xml → src/main/res/values/strings.xml

@@ -79,4 +79,4 @@
     <string name="main_about">About</string>
     <string name="pref_delete">Delete</string>
 
-</resources>
+</resources>