diff --git a/ANONdroidVPN.iml b/ANONdroidVPN.iml
index b382e6ed877829f4bb88a9dad6dff71075fe79b6..ddf5581786c3e8465526496fb59e9e84e767215b 100644
--- a/ANONdroidVPN.iml
+++ b/ANONdroidVPN.iml
@@ -13,7 +13,7 @@
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
- <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+ <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index d6291c438e84ca7437251558b039116d0c66db60..f51fbc1db828700e5721ee31603ffe70abe9bf2f 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -8,11 +8,11 @@
</facet>
<facet type="android" name="Android">
<configuration>
- <option name="SELECTED_BUILD_VARIANT" value="release" />
- <option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
- <option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseSources" />
+ <option name="SELECTED_BUILD_VARIANT" value="debug" />
+ <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+ <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<afterSyncTasks>
- <task>generateReleaseSources</task>
+ <task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -23,40 +23,53 @@
</facet>
<facet type="native-android-gradle" name="Native-Android-Gradle">
<configuration>
- <option name="SELECTED_BUILD_VARIANT" value="release" />
+ <option name="SELECTED_BUILD_VARIANT" value="debug-x86" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
- <output url="file://$MODULE_DIR$/build/intermediates/classes/release" />
- <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/release" />
+ <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+ <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/release" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/release" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/release" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/release" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/release" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/release" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/release" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/release" isTestSource="true" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/release/jni" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/release/shaders" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/testRelease/res" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/testRelease/resources" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/testRelease/assets" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/testRelease/aidl" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/testRelease/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/testRelease/jni" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/testRelease/rs" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/testRelease/shaders" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/jni" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -81,20 +94,44 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/.externalNativeBuild" />
+ <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
+ <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkReleaseClasspath" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/cmake" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/external_libs_dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
@@ -104,37 +141,48 @@
</content>
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Gradle: com.android.support:transition-27.1.1" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:support-v4-27.1.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:27.1.1@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:27.1.1@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.1@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:27.1.1@aar" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:transition:27.1.1@aar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:cardview-v7-27.1.1" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.1" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.1" level="project" />
- <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: org.osmdroid:osmdroid-android:6.0.2@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-v4:27.1.1@aar" level="project" />
<orderEntry type="library" name="Gradle: anon:BouncyCastleLightForAN.ON:01.56.002-SNAPSHOT:android@jar" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-27.1.1" level="project" />
- <orderEntry type="library" name="Gradle: org.osmdroid:osmdroid-android-6.0.1" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.1" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.1.1" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.1" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.1" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:cardview-v7:27.1.1@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:design:27.1.1@aar" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.0@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:27.1.1@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules:0.5@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
- <orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:27.1.1@aar" level="project" />
<orderEntry type="library" name="Gradle: anon:HTTPClient:00.04.013-SNAPSHOT@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:design-27.1.1" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-compat:27.1.1@aar" level="project" />
<orderEntry type="library" name="Gradle: anon:ApacheFTPClient:0.0.2-SNAPSHOT@jar" level="project" />
- <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: anon:anonlib:00.20.044-SNAPSHOT:android@jar" level="project" />
- <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" />
- <orderEntry type="library" name="Gradle: anon:ANONVPNlib:00.01.074-SNAPSHOT:android@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:27.1.1@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-fragment:27.1.1@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:27.1.1@aar" level="project" />
<orderEntry type="library" name="Gradle: anon:SkypeForANON:0.0.9-SNAPSHOT:android@jar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: anon:logging:0.1.9-SNAPSHOT@jar" level="project" />
+ <orderEntry type="library" name="Gradle: anon:ANONVPNlib:00.01.084-SNAPSHOT:android@jar" level="project" />
<orderEntry type="library" name="Gradle: anon:log4jForANON:0.0.4-SNAPSHOT@jar" level="project" />
- <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 763961b011dc0fd835655af1851c626d0adeae56..77c636f2f61307d858b8d7de2d2821e4621192a9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,7 +19,7 @@ android {
}
}
compileSdkVersion 27
- buildToolsVersion '28.0.0'
+ buildToolsVersion '28.0.3'
defaultConfig {
// multiDexEnabled true
applicationId 'anonvpn.anon_next.android'
@@ -67,8 +67,8 @@ dependencies {
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:support-vector-drawable:27.1.1'
testImplementation 'junit:junit:4.12'
- implementation 'org.osmdroid:osmdroid-android:6.0.1'
- def anonvpnlib_version = "00.01.074"
+ implementation 'org.osmdroid:osmdroid-android:6.0.2'
+ def anonvpnlib_version = "00.01.084"
def anonlib_version = "00.20.044"
debugImplementation("anon:ANONVPNlib:${anonvpnlib_version}-SNAPSHOT:android") {
changing = true
diff --git a/app/src/main/java/anonvpn/anon_next/android/AndroidLog.java b/app/src/main/java/anonvpn/anon_next/android/AndroidLog.java
index a17387fc9be4b96d46c383653e0901d4124bc759..9f972f43487682b8ecfa1f3f47b0358275cd4344 100644
--- a/app/src/main/java/anonvpn/anon_next/android/AndroidLog.java
+++ b/app/src/main/java/anonvpn/anon_next/android/AndroidLog.java
@@ -1,44 +1,55 @@
package anonvpn.anon_next.android;
import android.util.Log;
+
import logging.AbstractLog;
import logging.LogLevel;
+import logging.LogType;
-public class AndroidLog extends AbstractLog {
-
- private static final String TAG = "ANONmobile";
-
- public void log(int a_logLevel, int a_logType, String msg) {
- if (!isLogged(a_logLevel, a_logType)) {
- return;
- }
-
- switch (a_logLevel) {
- case LogLevel.EMERG:
- Log.e(TAG, "[EMERG] " + msg);
- break;
- case LogLevel.ALERT:
- Log.e(TAG, "[ALERT] " + msg);
- break;
- case LogLevel.EXCEPTION:
- Log.e(TAG, "[EXCEPTION] " + msg);
- break;
- case LogLevel.ERR:
- Log.e(TAG, "[ERROR] " + msg);
- break;
- case LogLevel.WARNING:
- Log.w(TAG, msg);
- break;
- case LogLevel.NOTICE:
- Log.v(TAG, msg);
- break;
- case LogLevel.INFO:
- Log.i(TAG, msg);
- break;
- case LogLevel.DEBUG:
- Log.d(TAG, msg);
- break;
- }
- }
+public class AndroidLog extends AbstractLog
+ {
+
+ private static final String TAG = "ANONmobile";
+
+ public AndroidLog()
+ {
+ super(LogLevel.EMERG, LogType.NUL);
+ }
-}
+ public void log(int a_logLevel, int a_logType, String msg)
+ {
+ if (!isLogged(a_logLevel, a_logType))
+ {
+ return;
+ }
+
+ switch (a_logLevel)
+ {
+ case LogLevel.EMERG:
+ Log.e(TAG, "[EMERG] " + msg);
+ break;
+ case LogLevel.ALERT:
+ Log.e(TAG, "[ALERT] " + msg);
+ break;
+ case LogLevel.EXCEPTION:
+ Log.e(TAG, "[EXCEPTION] " + msg);
+ break;
+ case LogLevel.ERR:
+ Log.e(TAG, "[ERROR] " + msg);
+ break;
+ case LogLevel.WARNING:
+ Log.w(TAG, msg);
+ break;
+ case LogLevel.NOTICE:
+ Log.v(TAG, msg);
+ break;
+ case LogLevel.INFO:
+ Log.i(TAG, msg);
+ break;
+ case LogLevel.DEBUG:
+ Log.d(TAG, msg);
+ break;
+ }
+ }
+
+ }
diff --git a/app/src/main/java/anonvpn/anon_next/android/service/networking/AndroidConnectivityMonitor.java b/app/src/main/java/anonvpn/anon_next/android/service/networking/AndroidConnectivityMonitor.java
index 818fa9ca9bb22fbd4d32af8679e4c540d7b36e35..a0d36a74bd6d60c3f4188e68bbcb8719fe2ba859 100644
--- a/app/src/main/java/anonvpn/anon_next/android/service/networking/AndroidConnectivityMonitor.java
+++ b/app/src/main/java/anonvpn/anon_next/android/service/networking/AndroidConnectivityMonitor.java
@@ -43,14 +43,14 @@ public class AndroidConnectivityMonitor extends BroadcastReceiver implements ICo
if (! mConnected && connected) {
mConnected = connected;
- System.out.println("Network connected!");
+ //System.out.println("Network connected!");
mNotification.notify(Event.NETWORK_CONNECTED);
}
if (mConnected && ! connected) {
mConnected = connected;
- System.out.println("Network disconnected!");
+ //System.out.println("Network disconnected!");
mNotification.notify(Event.NETWORK_DISCONNECTED);
}
diff --git a/app/src/main/java/anonvpn/anon_next/android/service/persistence/AndroidPersistenceFactory.java b/app/src/main/java/anonvpn/anon_next/android/service/persistence/AndroidPersistenceFactory.java
index f66e6e81bde387acb217b09489be5d5588b79df5..046c0019db99abcb5baf625d962759099ed1b603 100644
--- a/app/src/main/java/anonvpn/anon_next/android/service/persistence/AndroidPersistenceFactory.java
+++ b/app/src/main/java/anonvpn/anon_next/android/service/persistence/AndroidPersistenceFactory.java
@@ -24,10 +24,10 @@ public class AndroidPersistenceFactory implements IPersistenceFactory
//tweak InfoService
if (BuildConfig.DEBUG)
{
- mConfig.setString("PrimaryInfoService.Host", "141.76.46.165");
- mConfig.setInt("PrimaryInfoService.Port", 6543);
- // mConfig.setString("PrimaryInfoService.Host", "141.76.46.139");
- // mConfig.setInt("PrimaryInfoService.Port", 80);
+ // mConfig.setString("PrimaryInfoService.Host", "141.76.46.165");
+ // mConfig.setInt("PrimaryInfoService.Port", 6543);
+ mConfig.setString("PrimaryInfoService.Host", "141.76.46.139");
+ mConfig.setInt("PrimaryInfoService.Port", 80);
}
else
{
diff --git a/app/src/main/java/anonvpn/anon_next/android/ui/SettingsActivity.java b/app/src/main/java/anonvpn/anon_next/android/ui/SettingsActivity.java
index 284f4f3131c18954862b8ec3b99ae3619238911e..a3f38dc1bccaf35ea2d186321712ccf025634dc5 100644
--- a/app/src/main/java/anonvpn/anon_next/android/ui/SettingsActivity.java
+++ b/app/src/main/java/anonvpn/anon_next/android/ui/SettingsActivity.java
@@ -2,9 +2,12 @@ package anonvpn.anon_next.android.ui;
import android.annotation.TargetApi;
+import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.os.Build;
import android.os.Bundle;
import android.preference.ListPreference;
@@ -13,9 +16,11 @@ import android.preference.PreferenceActivity;
import android.preference.PreferenceFragment;
import android.preference.PreferenceManager;
import android.support.v7.app.ActionBar;
+import android.util.DisplayMetrics;
import android.view.MenuItem;
import java.util.List;
+import java.util.Locale;
import anonvpn.anon_next.android.R;
import anonvpn.anon_next.core.CascadeConnectionManager;
@@ -113,6 +118,21 @@ public class SettingsActivity extends AppCompatPreferenceActivity
setTitle(getString(R.string.settings_label_title));
}
+ public static void setLocale(Activity activity, String lang, boolean bRefresh) {
+ Locale myLocale = new Locale(lang);
+ Resources res = activity.getResources();
+ DisplayMetrics dm = res.getDisplayMetrics();
+ Configuration conf = res.getConfiguration();
+ conf.locale = myLocale;
+ res.updateConfiguration(conf, dm);
+ if(bRefresh)
+ {
+ Intent refresh = new Intent(activity, activity.getClass());
+ activity.startActivity(refresh);
+ }
+ }
+
+
/**
* Set up the {@link android.app.ActionBar}, if the API is available.
*/
@@ -192,5 +212,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity
return super.onOptionsItemSelected(item);
}
}
+
+
}
}
diff --git a/app/src/main/java/anonvpn/anon_next/android/ui/VPNConnectedActivity.java b/app/src/main/java/anonvpn/anon_next/android/ui/VPNConnectedActivity.java
index 13b0c7dfb42bc3bb83fa7d12819bdd8408c5a1fb..c30d7862ae3acc9266ab387bea4b7a2bbbbf65eb 100644
--- a/app/src/main/java/anonvpn/anon_next/android/ui/VPNConnectedActivity.java
+++ b/app/src/main/java/anonvpn/anon_next/android/ui/VPNConnectedActivity.java
@@ -47,7 +47,7 @@ abstract public class VPNConnectedActivity extends AppCompatActivity
protected void disconnectVPNService()
{
- System.out.println("DISCONNECTING VPN! ----------- ");
+ //System.out.println("DISCONNECTING VPN! ----------- ");
unbindService(mVPNConnection);
mVPNConnection = null;
mServiceInterface = null;
diff --git a/app/src/main/java/anonvpn/anon_next/android/ui/main/MainActivity.java b/app/src/main/java/anonvpn/anon_next/android/ui/main/MainActivity.java
index 2f38fb05814cff3b5cae2cf6b143d7467ed1b34b..ab92924beca54e2945c45d67774016c92acb0c37 100644
--- a/app/src/main/java/anonvpn/anon_next/android/ui/main/MainActivity.java
+++ b/app/src/main/java/anonvpn/anon_next/android/ui/main/MainActivity.java
@@ -68,7 +68,7 @@ public class MainActivity extends VPNConnectedActivity implements NavigationView
protected void onPause()
{
super.onPause();
- Log.d("ANONVPNMainActivity", "ONPAUSE");
+// Log.d("ANONVPNMainActivity", "ONPAUSE");
}
@Override
@@ -82,14 +82,14 @@ public class MainActivity extends VPNConnectedActivity implements NavigationView
{
disconnectVPNService();
}
- Log.d("ANONVPNMainActivity", "ONSTOP");
+// Log.d("ANONVPNMainActivity", "ONSTOP");
}
@Override
protected void onCreate(Bundle savedInstanceState)
{
-
- Log.d("ANONVPNMainActivity", "ONCREATE");
+ SettingsActivity.setLocale(this,"en",false);
+// Log.d("ANONVPNMainActivity", "ONCREATE");
super.onCreate(savedInstanceState);
mFragmentManager = getSupportFragmentManager();
@@ -118,8 +118,8 @@ public class MainActivity extends VPNConnectedActivity implements NavigationView
public void onNewIntent(Intent intent)
{
- String LOGTAG = "MainActivity";
- Log.i(LOGTAG, "Received new intent");
+ //String LOGTAG = "MainActivity";
+ //Log.i(LOGTAG, "Received new intent");
if (intent.hasExtra("type") && intent.getStringExtra("type").equals("notification")) {
mAnonFragment.updateStatus();
@@ -131,7 +131,7 @@ public class MainActivity extends VPNConnectedActivity implements NavigationView
public void onDestroy()
{
super.onDestroy();
- Log.d("ANONVPNMainActivity", "ONDESTROY");
+ //Log.d("ANONVPNMainActivity", "ONDESTROY");
if (isFinishing() && isVPNConnected())
{
@@ -162,7 +162,7 @@ public class MainActivity extends VPNConnectedActivity implements NavigationView
{
- Log.e("AndroidVPNMainActivity", "Preparing VPN service!");
+ //Log.e("AndroidVPNMainActivity", "Preparing VPN service!");
mSharedPreferences.edit().putBoolean("VPNStarted", true).commit();
// - Call prepare to ask for user permission
Intent intent = VpnService.prepare(getApplicationContext());
@@ -182,14 +182,14 @@ public class MainActivity extends VPNConnectedActivity implements NavigationView
private void onVPNGranted()
{
- Log.e("AndroidVPNMainActivity", "Enable tunneling device!");
+ //Log.e("AndroidVPNMainActivity", "Enable tunneling device!");
getServiceInterface().enableTunneling();
}
public void disableVPNTunneling()
{
- Log.e("AndroidVPNMainActivity", "Disable tunneling device!");
+ //Log.e("AndroidVPNMainActivity", "Disable tunneling device!");
getServiceInterface().disableTunneling();
mSharedPreferences.edit().putBoolean("VPNStarted", false).commit();
@@ -264,7 +264,7 @@ public class MainActivity extends VPNConnectedActivity implements NavigationView
protected void onResume()
{
super.onResume();
- Log.d("ANONVPNMainActivity", "ONRESUME");
+ //Log.d("ANONVPNMainActivity", "ONRESUME");
}
@@ -327,6 +327,10 @@ public class MainActivity extends VPNConnectedActivity implements NavigationView
case (R.id.connection):
setFragment(FRAGMENTID_CONNECTION);
break;
+ case (R.id.apps):
+ setFragment(FRAGMENTID_APPS);
+ break;
+
}
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 9a66034db7d001747b0593c87987b38bbfdf5b5c..250e216eeb7ebf86b94b6fdcea14aa570fc1aea2 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -10,6 +10,11 @@
android:id="@+id/connection"
android:icon="@drawable/ic_power_black_24dp"
android:title="@string/navigation_drawer_connection" />
+ <item
+ android:id="@+id/apps"
+ android:icon="@drawable/ic_playlist_add_check_black_24dp"
+ android:title="@string/navigation_drawer_options" />
+
<!--<item-->
<!--android:id="@+id/networks"-->
<!--android:icon="@drawable/ic_wifi_black_24dp"-->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c3268094d1bebf9c20b07cb3b8cdc4a88efc4815..78ab83f4b01e253a2016d476028ece0a0a89f4d4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -57,7 +57,6 @@
<string name="start_loc_unknown">Unbekannt</string>
<string name="start_tip_choosenet">Wähle dich in ein Netz ein, um die Anonymisierung zu beginnen.</string>
<string name="start_state_nonet">"Das aktuelle Netz ist nicht anonym!"</string>
- <string name="start_state_active">Sie sind anonym!</string>
<string name="start_state_deactive">Sie sind nicht anonym!</string>
<string name="start_label_noconnect">Verbindungsproblem!</string>
<string name="start_state_noservice">Es konnte keine Verbindung zum Anonymisierungsdienst aufgebaut werden.</string>
@@ -313,6 +312,7 @@ Deshalb sollten vor allem Webanwendungen die JavaScript, Java oder Flash verwend
<string name="vpn_tunneling_shutdown_progress_notification">Beende Anonymisierung...</string>
<string name="foregroundservice_desc_connecting">Verbinde zum Anonymisierungsdienst...</string>
<string name="foregroundservice_desc_network">Warte auf Verbindung zum Internet</string>
+ <string name="start_state_active">Sie sind anonym!</string>
</resources>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index ee92a9b5a27dd0274b15522e1ab4ccec04c62211..d7cbcd931008dccc64e39f70b054f7ab8cb95e3a 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -5,4 +5,7 @@
<string name="vpn_tunneling_shutdown_progress_notification">Stopping anonymisation...</string>
<string name="action_help">Help</string>
<string name="navigation_drawer_options">Settings</string>
+ <string name="noti_label_loc">Location:</string>
+ <string name="start_label_observer">(for Observer)</string>
+ <string name="start_state_active">You are anonymous!</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 46364d625d2512186a62d9293e23195748813f8f..45daeaa8b495643b253f44c1fc351cb0c6721648 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,7 +33,7 @@
<!-- Notification -->
<string name="noti_label_noloc">Kein Standort</string>
<string name="noti_label_locunknow">Standort: Unbekannt</string>
- <string name="noti_label_loc">Standort: </string>
+ <string name="noti_label_loc">Location:</string>
<string name="noti_label_locger">Standort: Deutschland</string>
<string name="noti_label_nonet">Es besteht derzeit keine Verbindung zu einem Netz.</string>
<string name="noti_label_active">Die Anonymisierung ist aktiviert.</string>
@@ -52,13 +52,13 @@
<string name="start_label_up_per_second">0 kbit/s</string>
<string name="start_label_down">0 Byte</string>
<string name="start_label_loc">Deutschland</string>
- <string name="start_label_observer">(für Beobachter)</string>
+ <string name="start_label_observer">(for Observers)</string>
<string name="start_label_unit"> kB/s</string>
<string name="start_state_nocon">Es besteht keine Verbindung zu einem Netz.</string>
<string name="start_loc_unknown">Unbekannt</string>
<string name="start_tip_choosenet">Wähle dich in ein Netz ein, um die Anonymisierung zu beginnen.</string>
<string name="start_state_nonet">"Das aktuelle Netz ist nicht anonym!"</string>
- <string name="start_state_active">Sie sind anonym!</string>
+ <string name="start_state_active">You are anonymous!</string>
<string name="start_state_deactive">Sie sind nicht anonym!</string>
<string name="start_label_noconnect">Verbindungsproblem!</string>
<string name="start_state_noservice">Es konnte keine Verbindung zum Anonymisierungsdienst aufgebaut werden.</string>
@@ -70,9 +70,9 @@
<string name="start_meter_save">Deine Anonymität ist sicher!</string>
<!-- App View -->
- <string name="app_title">Appwahl</string>
- <string name="app_button_deanon">Alle nicht anonymisieren</string>
- <string name="app_button_anon">Alle anonymisieren</string>
+ <string name="app_title">App Anonymity</string>
+ <string name="app_button_deanon">Anonymise none</string>
+ <string name="app_button_anon">Anonymise all</string>
<string name="app_label_load">Bitte warten</string>
<string name="app_toast_active">Alle Apps anonymisiert</string>
<string name="app_toast_deactive">Alle Apps nicht anonymisiert</string>
@@ -97,7 +97,7 @@
<string name="connect_text_mixes">Nutzer</string>
<string name="connect_toast_chosen">Neue Verbindung gewählt</string>
<string name="connect_toast_not_chosen">Bitte wählen Sie eine Verbindung aus</string>
- <string name="connect_label_yourloc">Dein Standort</string>
+ <string name="connect_label_yourloc">Your location</string>
<string name="connect_label_observeloc">Dein Standort für Beobachter</string>
<string name="connect_label_mix">Verbindungspunkt: </string>
<string name="connect_text_error">Der Infoservice ist nicht erreichbar. Versuchen Sie es bitte später noch einmal.</string>
diff --git a/build.gradle b/build.gradle
index 69b3bbec263b3a1cb6eedaa2fba756304d3b1104..06792027c088ed4e230138f161e252b3baa09660 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.1.3'
+ classpath 'com.android.tools.build:gradle:3.3.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index eca64d38ec6366ec1fa64adaec07fed8b4f6d755..9b6ba68f97a8b1debf3b4f8201c2de1d45044319 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Apr 05 14:43:14 CEST 2018
+#Mon Feb 11 15:52:32 CET 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip