Release v1.7.0

iTXTech · May 20, 2017 · db578bc · db578bc
1 parent b3d99d1
commit db578bc
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 60 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.itxtech.daedalus"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 6
-        versionName "1.6.0"
+        versionCode 7
+        versionName "1.7.0"
 
         buildConfigField "String", "BUILD_TIME", "\"${System.currentTimeMillis()}\""
         buildConfigField "String", "GIT_COMMIT", "\"${gitCommit}\""

diff --git a/app/src/main/java/org/itxtech/daedalus/activity/ConfigActivity.java b/app/src/main/java/org/itxtech/daedalus/activity/ConfigActivity.java
@@ -38,7 +38,7 @@ public class ConfigActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_dns_server_config);
+        setContentView(R.layout.activity_config);
 
         ConfigFragment fragment;
         switch (getIntent().getIntExtra(LAUNCH_ACTION_FRAGMENT, LAUNCH_FRAGMENT_DNS_SERVER)) {

diff --git a/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java b/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
@@ -197,9 +197,9 @@ public void run() {
             String aliasSecondary;
             if (advanced) {
                 dnsServers = new HashMap<>();
-                aliasPrimary = String.format(format, dnsServers.size() + 1);
+                aliasPrimary = String.format(format, 2);
                 dnsServers.put(aliasPrimary, primaryServer);
-                aliasSecondary = String.format(format, dnsServers.size() + 1);
+                aliasSecondary = String.format(format, 3);
                 dnsServers.put(aliasSecondary, secondaryServer);
             } else {
                 aliasPrimary = primaryServer;

diff --git a/app/src/main/java/org/itxtech/daedalus/widget/BoundedCardView.java b/app/src/main/java/org/itxtech/daedalus/widget/BoundedCardView.java
diff --git a/...res/layout/activity_dns_server_config.xml → app/src/main/res/layout/activity_config.xml b/...res/layout/activity_dns_server_config.xml → app/src/main/res/layout/activity_config.xml
diff --git a/app/src/main/res/xml/perf_settings.xml b/app/src/main/res/xml/perf_settings.xml
@@ -18,7 +18,7 @@
         </ListPreference>
         <EditTextPreference
                 android:key="dns_test_servers"
-                android:defaultValue="114.114.114.114,8.8.8.8"
+                android:defaultValue="10.0.0.2,10.0.0.3"
                 android:selectAllOnFocus="true"
                 android:singleLine="true"
                 android:title="@string/settings_dns_test_servers"/>