summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYves <yvesf-git@xapek.org>2015-03-09 22:24:48 +0100
committerYves <yvesf-git@xapek.org>2015-03-09 22:24:48 +0100
commit1fe7a0202dc7570cb289c3f8d40d8b59797a966c (patch)
tree88dd38fd77e11ffb276a7e08f7e1b81479e2060c
parentf08ea668c3059995ea390ab566bd25f3a68b0ef1 (diff)
parent23d9368d169b2ce355b68711b0de3e77f742bedb (diff)
downloadandiodine-1fe7a0202dc7570cb289c3f8d40d8b59797a966c.tar.gz
andiodine-1fe7a0202dc7570cb289c3f8d40d8b59797a966c.zip
Merge pull request #15 from 2m/wip-gradle-build
Gradle build
-rw-r--r--.gitignore2
-rw-r--r--.travis.yml5
-rw-r--r--BUGS19
-rw-r--r--README.md8
-rw-r--r--build.gradle33
-rw-r--r--jni/Android.mk2
-rw-r--r--jni/iodine-client.c1
-rw-r--r--jni/iodine/src/base64.c2
-rw-r--r--proguard-project.txt20
-rw-r--r--project.properties14
-rw-r--r--src/main/AndroidManifest.xml (renamed from AndroidManifest.xml)1
-rw-r--r--src/main/java/org/xapek/andiodine/FragmentList.java (renamed from src/org/xapek/andiodine/FragmentList.java)0
-rw-r--r--src/main/java/org/xapek/andiodine/FragmentStatus.java (renamed from src/org/xapek/andiodine/FragmentStatus.java)0
-rw-r--r--src/main/java/org/xapek/andiodine/IodineClient.java (renamed from src/org/xapek/andiodine/IodineClient.java)0
-rw-r--r--src/main/java/org/xapek/andiodine/IodineMain.java (renamed from src/org/xapek/andiodine/IodineMain.java)0
-rw-r--r--src/main/java/org/xapek/andiodine/IodinePref.java (renamed from src/org/xapek/andiodine/IodinePref.java)0
-rw-r--r--src/main/java/org/xapek/andiodine/IodineVpnService.java (renamed from src/org/xapek/andiodine/IodineVpnService.java)0
-rw-r--r--src/main/java/org/xapek/andiodine/config/ConfigDatabase.java (renamed from src/org/xapek/andiodine/config/ConfigDatabase.java)0
-rw-r--r--src/main/java/org/xapek/andiodine/config/IodineConfiguration.java (renamed from src/org/xapek/andiodine/config/IodineConfiguration.java)0
-rw-r--r--src/main/java/org/xapek/andiodine/preferences/AbstractPreference.java (renamed from src/org/xapek/andiodine/preferences/AbstractPreference.java)0
-rw-r--r--src/main/java/org/xapek/andiodine/preferences/BooleanPreference.java (renamed from src/org/xapek/andiodine/preferences/BooleanPreference.java)0
-rw-r--r--src/main/java/org/xapek/andiodine/preferences/PreferenceActivity.java (renamed from src/org/xapek/andiodine/preferences/PreferenceActivity.java)0
-rw-r--r--src/main/java/org/xapek/andiodine/preferences/SpinnerPreference.java (renamed from src/org/xapek/andiodine/preferences/SpinnerPreference.java)0
-rw-r--r--src/main/java/org/xapek/andiodine/preferences/TextPreference.java (renamed from src/org/xapek/andiodine/preferences/TextPreference.java)0
-rw-r--r--src/main/res/anim/main_status_image_connect.xml (renamed from res/anim/main_status_image_connect.xml)0
-rw-r--r--src/main/res/anim/main_status_image_connected.xml (renamed from res/anim/main_status_image_connected.xml)0
-rw-r--r--src/main/res/anim/main_status_image_disconnect.xml (renamed from res/anim/main_status_image_disconnect.xml)0
-rw-r--r--src/main/res/anim/main_status_image_error.xml (renamed from res/anim/main_status_image_error.xml)0
-rw-r--r--src/main/res/anim/main_status_image_idle.xml (renamed from res/anim/main_status_image_idle.xml)0
-rw-r--r--src/main/res/drawable/action_help.png (renamed from res/drawable/action_help.png)bin693 -> 693 bytes
-rw-r--r--src/main/res/drawable/cancel.png (renamed from res/drawable/cancel.png)bin1709 -> 1709 bytes
-rw-r--r--src/main/res/drawable/delete.png (renamed from res/drawable/delete.png)bin4567 -> 4567 bytes
-rw-r--r--src/main/res/drawable/device_access_new_account.png (renamed from res/drawable/device_access_new_account.png)bin2662 -> 2662 bytes
-rw-r--r--src/main/res/drawable/error.png (renamed from res/drawable/error.png)bin1142 -> 1142 bytes
-rw-r--r--src/main/res/drawable/ic_bt_config.png (renamed from res/drawable/ic_bt_config.png)bin956 -> 956 bytes
-rw-r--r--src/main/res/drawable/logo.png (renamed from res/drawable/logo.png)bin19292 -> 19292 bytes
-rw-r--r--src/main/res/layout/configitem.xml (renamed from res/layout/configitem.xml)0
-rw-r--r--src/main/res/layout/fragment_list.xml (renamed from res/layout/fragment_list.xml)0
-rw-r--r--src/main/res/layout/fragment_status.xml (renamed from res/layout/fragment_status.xml)0
-rw-r--r--src/main/res/layout/main.xml (renamed from res/layout/main.xml)0
-rw-r--r--src/main/res/layout/pref.xml (renamed from res/layout/pref.xml)0
-rw-r--r--src/main/res/layout/rowlayout.xml (renamed from res/layout/rowlayout.xml)0
-rw-r--r--src/main/res/menu/fragment_list.xml (renamed from res/menu/fragment_list.xml)0
-rw-r--r--src/main/res/menu/main.xml (renamed from res/menu/main.xml)0
-rw-r--r--src/main/res/menu/pref.xml (renamed from res/menu/pref.xml)0
-rw-r--r--src/main/res/raw/license (renamed from res/raw/license)0
-rw-r--r--src/main/res/raw/logo.svg (renamed from res/raw/logo.svg)0
-rw-r--r--src/main/res/values-de/strings.xml (renamed from res/values-de/strings.xml)28
-rw-r--r--src/main/res/values/strings.xml (renamed from res/values/strings.xml)2
-rw-r--r--tests/AndroidManifest.xml30
-rw-r--r--tests/proguard-project.txt20
-rw-r--r--tests/project.properties14
-rw-r--r--tests/src/org/xapek/andiodine/HelloJniTest.java22
-rw-r--r--tests/tests.iml26
54 files changed, 77 insertions, 172 deletions
diff --git a/.gitignore b/.gitignore
index 21c7ed0..3932f8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
+/.gradle
/bin
+/build
/jni/iodine/src/*.o
/jni/iodine/bin
/obj
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..7d3db1b
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,5 @@
+language: android
+android:
+ components:
+ - build-tools-21.1.2
+ - android-15
diff --git a/BUGS b/BUGS
deleted file mode 100644
index a660555..0000000
--- a/BUGS
+++ /dev/null
@@ -1,19 +0,0 @@
-E/AndroidRuntime( 1505): FATAL EXCEPTION: main
-E/AndroidRuntime( 1505): java.lang.RuntimeException: Error receiving broadcast Intent { act=org.xapek.andiodine.IodineVpnService.STATUS_IDLE flg=0x10 } in org.xapek.andiodine.IodineMain$1@40f33f68
-E/AndroidRuntime( 1505): at android.app.LoadedApk$ReceiverDispatcher$Args.run(LoadedApk.java)
-E/AndroidRuntime( 1505): at android.os.Handler.handleCallback(Handler.java)
-E/AndroidRuntime( 1505): at android.os.Handler.dispatchMessage(Handler.java)
-E/AndroidRuntime( 1505): at android.os.Looper.loop(Looper.java)
-E/AndroidRuntime( 1505): at android.app.ActivityThread.main(ActivityThread.java)
-E/AndroidRuntime( 1505): at java.lang.reflect.Method.invokeNative(Native Method)
-E/AndroidRuntime( 1505): at java.lang.reflect.Method.invoke(Method.java)
-E/AndroidRuntime( 1505): at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java)
-E/AndroidRuntime( 1505): at com.android.internal.os.ZygoteInit.main(ZygoteInit.java)
-E/AndroidRuntime( 1505): at dalvik.system.NativeStart.main(Native Method)
-E/AndroidRuntime( 1505): Caused by: java.lang.IllegalStateException: Can not perform this action after onSaveInstanceState
-E/AndroidRuntime( 1505): at android.app.FragmentManagerImpl.checkStateLoss(FragmentManager.java)
-E/AndroidRuntime( 1505): at android.app.FragmentManagerImpl.enqueueAction(FragmentManager.java)
-E/AndroidRuntime( 1505): at android.app.BackStackRecord.commitInternal(BackStackRecord.java)
-E/AndroidRuntime( 1505): at android.app.BackStackRecord.commit(BackStackRecord.java)
-E/AndroidRuntime( 1505): at org.xapek.andiodine.IodineMain$1.onReceive(IodineMain.java:41)
-E/AndroidRuntime( 1505): ... 10 more
diff --git a/README.md b/README.md
index 7f48e1f..185457b 100644
--- a/README.md
+++ b/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.
-
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..b15b3e1
--- /dev/null
+++ b/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"
+ }
+ }
+ }
+}
diff --git a/jni/Android.mk b/jni/Android.mk
index 06cf936..2117fb6 100644
--- a/jni/Android.mk
+++ b/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 \
diff --git a/jni/iodine-client.c b/jni/iodine-client.c
index 905b154..11ef7cf 100644
--- a/jni/iodine-client.c
+++ b/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);
}
-
diff --git a/jni/iodine/src/base64.c b/jni/iodine/src/base64.c
index 00a84fc..71bbcf1 100644
--- a/jni/iodine/src/base64.c
+++ b/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.
diff --git a/proguard-project.txt b/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/project.properties b/project.properties
deleted file mode 100644
index 0840b4a..0000000
--- a/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-15
diff --git a/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 1600d93..0bea991 100644
--- a/AndroidManifest.xml
+++ b/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"
diff --git a/src/org/xapek/andiodine/FragmentList.java b/src/main/java/org/xapek/andiodine/FragmentList.java
index 10a0875..10a0875 100644
--- a/src/org/xapek/andiodine/FragmentList.java
+++ b/src/main/java/org/xapek/andiodine/FragmentList.java
diff --git a/src/org/xapek/andiodine/FragmentStatus.java b/src/main/java/org/xapek/andiodine/FragmentStatus.java
index c1f709a..c1f709a 100644
--- a/src/org/xapek/andiodine/FragmentStatus.java
+++ b/src/main/java/org/xapek/andiodine/FragmentStatus.java
diff --git a/src/org/xapek/andiodine/IodineClient.java b/src/main/java/org/xapek/andiodine/IodineClient.java
index 37178b5..37178b5 100644
--- a/src/org/xapek/andiodine/IodineClient.java
+++ b/src/main/java/org/xapek/andiodine/IodineClient.java
diff --git a/src/org/xapek/andiodine/IodineMain.java b/src/main/java/org/xapek/andiodine/IodineMain.java
index f631c1d..f631c1d 100644
--- a/src/org/xapek/andiodine/IodineMain.java
+++ b/src/main/java/org/xapek/andiodine/IodineMain.java
diff --git a/src/org/xapek/andiodine/IodinePref.java b/src/main/java/org/xapek/andiodine/IodinePref.java
index cc21b59..cc21b59 100644
--- a/src/org/xapek/andiodine/IodinePref.java
+++ b/src/main/java/org/xapek/andiodine/IodinePref.java
diff --git a/src/org/xapek/andiodine/IodineVpnService.java b/src/main/java/org/xapek/andiodine/IodineVpnService.java
index 2adad1c..2adad1c 100644
--- a/src/org/xapek/andiodine/IodineVpnService.java
+++ b/src/main/java/org/xapek/andiodine/IodineVpnService.java
diff --git a/src/org/xapek/andiodine/config/ConfigDatabase.java b/src/main/java/org/xapek/andiodine/config/ConfigDatabase.java
index c4245ba..c4245ba 100644
--- a/src/org/xapek/andiodine/config/ConfigDatabase.java
+++ b/src/main/java/org/xapek/andiodine/config/ConfigDatabase.java
diff --git a/src/org/xapek/andiodine/config/IodineConfiguration.java b/src/main/java/org/xapek/andiodine/config/IodineConfiguration.java
index 21aac6c..21aac6c 100644
--- a/src/org/xapek/andiodine/config/IodineConfiguration.java
+++ b/src/main/java/org/xapek/andiodine/config/IodineConfiguration.java
diff --git a/src/org/xapek/andiodine/preferences/AbstractPreference.java b/src/main/java/org/xapek/andiodine/preferences/AbstractPreference.java
index 278de63..278de63 100644
--- a/src/org/xapek/andiodine/preferences/AbstractPreference.java
+++ b/src/main/java/org/xapek/andiodine/preferences/AbstractPreference.java
diff --git a/src/org/xapek/andiodine/preferences/BooleanPreference.java b/src/main/java/org/xapek/andiodine/preferences/BooleanPreference.java
index 9e7917d..9e7917d 100644
--- a/src/org/xapek/andiodine/preferences/BooleanPreference.java
+++ b/src/main/java/org/xapek/andiodine/preferences/BooleanPreference.java
diff --git a/src/org/xapek/andiodine/preferences/PreferenceActivity.java b/src/main/java/org/xapek/andiodine/preferences/PreferenceActivity.java
index dd0faa4..dd0faa4 100644
--- a/src/org/xapek/andiodine/preferences/PreferenceActivity.java
+++ b/src/main/java/org/xapek/andiodine/preferences/PreferenceActivity.java
diff --git a/src/org/xapek/andiodine/preferences/SpinnerPreference.java b/src/main/java/org/xapek/andiodine/preferences/SpinnerPreference.java
index 3528f05..3528f05 100644
--- a/src/org/xapek/andiodine/preferences/SpinnerPreference.java
+++ b/src/main/java/org/xapek/andiodine/preferences/SpinnerPreference.java
diff --git a/src/org/xapek/andiodine/preferences/TextPreference.java b/src/main/java/org/xapek/andiodine/preferences/TextPreference.java
index ae28f1e..ae28f1e 100644
--- a/src/org/xapek/andiodine/preferences/TextPreference.java
+++ b/src/main/java/org/xapek/andiodine/preferences/TextPreference.java
diff --git a/res/anim/main_status_image_connect.xml b/src/main/res/anim/main_status_image_connect.xml
index dadf0d6..dadf0d6 100644
--- a/res/anim/main_status_image_connect.xml
+++ b/src/main/res/anim/main_status_image_connect.xml
diff --git a/res/anim/main_status_image_connected.xml b/src/main/res/anim/main_status_image_connected.xml
index e9aba80..e9aba80 100644
--- a/res/anim/main_status_image_connected.xml
+++ b/src/main/res/anim/main_status_image_connected.xml
diff --git a/res/anim/main_status_image_disconnect.xml b/src/main/res/anim/main_status_image_disconnect.xml
index 49677b5..49677b5 100644
--- a/res/anim/main_status_image_disconnect.xml
+++ b/src/main/res/anim/main_status_image_disconnect.xml
diff --git a/res/anim/main_status_image_error.xml b/src/main/res/anim/main_status_image_error.xml
index 55472d0..55472d0 100644
--- a/res/anim/main_status_image_error.xml
+++ b/src/main/res/anim/main_status_image_error.xml
diff --git a/res/anim/main_status_image_idle.xml b/src/main/res/anim/main_status_image_idle.xml
index 68802e7..68802e7 100644
--- a/res/anim/main_status_image_idle.xml
+++ b/src/main/res/anim/main_status_image_idle.xml
diff --git a/res/drawable/action_help.png b/src/main/res/drawable/action_help.png
index 1bf05f2..1bf05f2 100644
--- a/res/drawable/action_help.png
+++ b/src/main/res/drawable/action_help.png
Binary files differ
diff --git a/res/drawable/cancel.png b/src/main/res/drawable/cancel.png
index d743d75..d743d75 100644
--- a/res/drawable/cancel.png
+++ b/src/main/res/drawable/cancel.png
Binary files differ
diff --git a/res/drawable/delete.png b/src/main/res/drawable/delete.png
index a9d4d6e..a9d4d6e 100644
--- a/res/drawable/delete.png
+++ b/src/main/res/drawable/delete.png
Binary files differ
diff --git a/res/drawable/device_access_new_account.png b/src/main/res/drawable/device_access_new_account.png
index 6e92072..6e92072 100644
--- a/res/drawable/device_access_new_account.png
+++ b/src/main/res/drawable/device_access_new_account.png
Binary files differ
diff --git a/res/drawable/error.png b/src/main/res/drawable/error.png
index 2d0283e..2d0283e 100644
--- a/res/drawable/error.png
+++ b/src/main/res/drawable/error.png
Binary files differ
diff --git a/res/drawable/ic_bt_config.png b/src/main/res/drawable/ic_bt_config.png
index 6754469..6754469 100644
--- a/res/drawable/ic_bt_config.png
+++ b/src/main/res/drawable/ic_bt_config.png
Binary files differ
diff --git a/res/drawable/logo.png b/src/main/res/drawable/logo.png
index c60295a..c60295a 100644
--- a/res/drawable/logo.png
+++ b/src/main/res/drawable/logo.png
Binary files differ
diff --git a/res/layout/configitem.xml b/src/main/res/layout/configitem.xml
index d8d279d..d8d279d 100644
--- a/res/layout/configitem.xml
+++ b/src/main/res/layout/configitem.xml
diff --git a/res/layout/fragment_list.xml b/src/main/res/layout/fragment_list.xml
index 3b1e678..3b1e678 100644
--- a/res/layout/fragment_list.xml
+++ b/src/main/res/layout/fragment_list.xml
diff --git a/res/layout/fragment_status.xml b/src/main/res/layout/fragment_status.xml
index 65f63b1..65f63b1 100644
--- a/res/layout/fragment_status.xml
+++ b/src/main/res/layout/fragment_status.xml
diff --git a/res/layout/main.xml b/src/main/res/layout/main.xml
index 64bf136..64bf136 100644
--- a/res/layout/main.xml
+++ b/src/main/res/layout/main.xml
diff --git a/res/layout/pref.xml b/src/main/res/layout/pref.xml
index ff54538..ff54538 100644
--- a/res/layout/pref.xml
+++ b/src/main/res/layout/pref.xml
diff --git a/res/layout/rowlayout.xml b/src/main/res/layout/rowlayout.xml
index 7fd7f4e..7fd7f4e 100644
--- a/res/layout/rowlayout.xml
+++ b/src/main/res/layout/rowlayout.xml
diff --git a/res/menu/fragment_list.xml b/src/main/res/menu/fragment_list.xml
index 44f54e9..44f54e9 100644
--- a/res/menu/fragment_list.xml
+++ b/src/main/res/menu/fragment_list.xml
diff --git a/res/menu/main.xml b/src/main/res/menu/main.xml
index 4a179ff..4a179ff 100644
--- a/res/menu/main.xml
+++ b/src/main/res/menu/main.xml
diff --git a/res/menu/pref.xml b/src/main/res/menu/pref.xml
index a73acea..a73acea 100644
--- a/res/menu/pref.xml
+++ b/src/main/res/menu/pref.xml
diff --git a/res/raw/license b/src/main/res/raw/license
index 1265d24..1265d24 100644
--- a/res/raw/license
+++ b/src/main/res/raw/license
diff --git a/res/raw/logo.svg b/src/main/res/raw/logo.svg
index e742823..e742823 100644
--- a/res/raw/logo.svg
+++ b/src/main/res/raw/logo.svg
diff --git a/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 3cc17ac..9b72d05 100644
--- a/res/values-de/strings.xml
+++ b/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> \ No newline at end of file
+</resources>
diff --git a/res/values/strings.xml b/src/main/res/values/strings.xml
index e07212c..ffbbb15 100644
--- a/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -79,4 +79,4 @@
<string name="main_about">About</string>
<string name="pref_delete">Delete</string>
-</resources> \ No newline at end of file
+</resources>
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
deleted file mode 100644
index 75082fb..0000000
--- a/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.xapek.andiodine.tests"
- android:versionCode="1"
- android:versionName="1.0" >
-
- <uses-sdk
- android:minSdkVersion="14"
- android:targetSdkVersion="16" />
-
- <!--
- We add an application tag here just so that we can indicate that
- this package needs to link against the android.test library,
- which is needed when building test cases.
- -->
- <application>
- <uses-library android:name="android.test.runner" />
- </application>
- <!--
- This declares that this application uses the instrumentation test runner targeting
- the package of com.example.HelloJni. To run the tests use the command:
- "adb shell am instrument -w com.example.HelloJni.tests/android.test.InstrumentationTestRunner"
- -->
- <instrumentation
- android:name="android.test.InstrumentationTestRunner"
- android:label="Tests for Andiodine"
- android:targetPackage="org.xapek.andiodine" />
-
-</manifest> \ No newline at end of file
diff --git a/tests/proguard-project.txt b/tests/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/tests/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/tests/project.properties b/tests/project.properties
deleted file mode 100644
index 9fb894d..0000000
--- a/tests/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-3
diff --git a/tests/src/org/xapek/andiodine/HelloJniTest.java b/tests/src/org/xapek/andiodine/HelloJniTest.java
deleted file mode 100644
index 14322f3..0000000
--- a/tests/src/org/xapek/andiodine/HelloJniTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.xapek.andiodine;
-
-import android.test.ActivityInstrumentationTestCase2;
-
-import org.xapek.andiodine.IodineMain;
-
-/**
- * This is a simple framework for a test of an Application. See
- * {@link android.test.ApplicationTestCase ApplicationTestCase} for more information on
- * how to write and extend Application tests.
- * <p/>
- * To run this test, you can type:
- * adb shell am instrument -w \
- * -e class org.xapek.andiodine.HelloJniTest \
- * com.example.HelloJni.tests/android.test.InstrumentationTestRunner
- */
-public class HelloJniTest extends ActivityInstrumentationTestCase2<org.xapek.andiodine.IodineMain> {
- public HelloJniTest() {
- super(IodineMain.class);
- }
-
-}
diff --git a/tests/tests.iml b/tests/tests.iml
deleted file mode 100644
index 6698b2b..0000000
--- a/tests/tests.iml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="android" name="Android">
- <configuration>
- <notImportedProperties>
- <property>MANIFEST_FILE_PATH</property>
- <property>RESOURCES_DIR_PATH</property>
- <property>ASSETS_DIR_PATH</property>
- <property>NATIVE_LIBS_DIR_PATH</property>
- </notImportedProperties>
- </configuration>
- </facet>
- </component>
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="andiodine" scope="PROVIDED" />
- </component>
-</module>
-