From 4ad6932520c7a879993cfd68aaee42547554e5fa Mon Sep 17 00:00:00 2001
From: sk13 <sk13@5a230232-f31e-4839-b85c-661838634aa0>
Date: Fri, 5 Jan 2018 10:22:25 +0000
Subject: [PATCH] Update to latest vpnlib
---
app/app.iml | 2 +-
app/build.gradle | 2 +-
.../anon_next/android/ui/SettingsActivity.java | 11 +++++++++--
.../anon_next/android/ui/main/MainActivity.java | 2 +-
app/src/main/res/xml/pref_general.xml | 8 ++++++++
5 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/app/app.iml b/app/app.iml
index c0cb477..72cbdd1 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -149,7 +149,6 @@
<orderEntry type="library" scope="TEST" name="com.android.support.test:rules-0.5" level="project" />
<orderEntry type="library" name="android.arch.core:common:1.0.0@jar" level="project" />
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3@jar" level="project" />
- <orderEntry type="library" name="anon:ANONVPNlib:00.01.051-SNAPSHOT:android@jar" level="project" />
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="com.android.support.test:runner-0.5" level="project" />
<orderEntry type="library" name="anon:SkypeForANON:0.0.9-SNAPSHOT:android@jar" level="project" />
@@ -160,6 +159,7 @@
<orderEntry type="library" scope="TEST" name="javax.annotation:javax.annotation-api:1.2@jar" level="project" />
<orderEntry type="library" name="com.android.support:design-26.1.0" level="project" />
<orderEntry type="library" name="com.android.support:transition-26.1.0" level="project" />
+ <orderEntry type="library" name="anon:ANONVPNlib:00.01.053-SNAPSHOT:android@jar" level="project" />
<orderEntry type="library" name="anon:BouncyCastleLightForAN.ON:01.56.002-SNAPSHOT:android@jar" level="project" />
<orderEntry type="library" name="org.osmdroid:osmdroid-android-5.6.5" level="project" />
<orderEntry type="library" name="com.android.support:cardview-v7-26.1.0" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index 904c725..6b31ecd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -69,7 +69,7 @@ dependencies {
testCompile 'junit:junit:4.12'
compile 'org.osmdroid:osmdroid-android:5.6.5'
- def anonvpnlib_version="00.01.051"
+ def anonvpnlib_version="00.01.053"
def anonlib_version="00.20.033"
debugCompile("anon:ANONVPNlib:${anonvpnlib_version}-SNAPSHOT:android") {
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 5705599..284f4f3 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
@@ -61,7 +61,10 @@ public class SettingsActivity extends AppCompatPreferenceActivity
{
// For all other preferences, set the summary to the value's
// simple string representation.
- preference.setSummary(stringValue);
+ if(preference.getKey().equals("prefSwitchUseFakeDNS"))
+ {
+ CascadeConnectionManager.USE_FAKE_DNS=Boolean.valueOf(stringValue);
+ }
}
return true;
}
@@ -84,7 +87,10 @@ public class SettingsActivity extends AppCompatPreferenceActivity
// Trigger the listener immediately with the preference's
// current value.
- sBindPreferenceSummaryToValueListener.onPreferenceChange(preference, PreferenceManager.getDefaultSharedPreferences(preference.getContext()).getString(preference.getKey(), ""));
+ SharedPreferences p=PreferenceManager.getDefaultSharedPreferences(preference.getContext());
+ String key=preference.getKey();
+ String v=p.getString(key,"");
+ sBindPreferenceSummaryToValueListener.onPreferenceChange(preference, v);
}
@Override
@@ -169,6 +175,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity
// guidelines.
//bindPreferenceSummaryToValue(findPreference("example_text"));
bindPreferenceSummaryToValue(findPreference("example_list"));
+ findPreference("prefSwitchUseFakeDNS").setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
}
@Override
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 bcf32a3..1015ade 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
@@ -90,7 +90,7 @@ public class MainActivity extends VPNConnectedActivity implements NavigationView
///TODO: Move on better place...
CascadeConnectionManager.USE_FAKE_DNS = false;
CascadeConnectionManager.USE_UDP_SOCKS = true;
- CascadeConnectionManager.USE_DEBUG_LOG = true;
+ CascadeConnectionManager.USE_DEBUG_LOG = false;
CascadeConnectionManager.USE_PCAP_WRITER = false;
AnonLib.DISABLE_PACKET_COUNTING=true;
// CascadeConnectionManager.PCAP_FILENAME= Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS)+"/vpn.pcap";
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index 0b672ba..38bb374 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -78,5 +78,13 @@
<!--android:summary="@string/pref_description_log"-->
<!--android:title="@string/pref_title_log" />-->
<!--</PreferenceCategory>-->
+<PreferenceCategory
+ android:title="Optimierungen">
+ <SwitchPreference
+ android:key="prefSwitchUseFakeDNS"
+ android:defaultValue="false"
+ android:title="Verbesserte DNS Effizienz"
+ />
+</PreferenceCategory>
</PreferenceScreen>
--
GitLab