From db578bca8c0a95ae939a517afe473c9e562ac308 Mon Sep 17 00:00:00 2001 From: PeratX <1215714524@qq.com> Date: Sat, 20 May 2017 22:42:56 +0800 Subject: [PATCH] Release v1.7.0 --- app/build.gradle | 4 +- .../daedalus/activity/ConfigActivity.java | 2 +- .../daedalus/service/DaedalusVpnService.java | 4 +- .../daedalus/widget/BoundedCardView.java | 54 ------------------- ..._server_config.xml => activity_config.xml} | 0 app/src/main/res/xml/perf_settings.xml | 2 +- 6 files changed, 6 insertions(+), 60 deletions(-) delete mode 100644 app/src/main/java/org/itxtech/daedalus/widget/BoundedCardView.java rename app/src/main/res/layout/{activity_dns_server_config.xml => activity_config.xml} (100%) diff --git a/app/build.gradle b/app/build.gradle index 9773b40..c7fd329 100644 --- 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 index fa11a32..03781b5 100644 --- 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 index f88c7c9..ee7cbc8 100644 --- 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 deleted file mode 100644 index 116279f..0000000 --- a/app/src/main/java/org/itxtech/daedalus/widget/BoundedCardView.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.itxtech.daedalus.widget; - -import android.content.Context; -import android.content.res.TypedArray; -import android.support.v7.widget.CardView; -import android.util.AttributeSet; -import org.itxtech.daedalus.R; - -/** - * Daedalus Project - * - * @author iTX Technologies & MrFuFuFu - * @link https://itxtech.org - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - */ -public class BoundedCardView extends CardView { - public BoundedCardView(Context context) { - super(context); - } - - public BoundedCardView(Context context, AttributeSet attrs) { - super(context, attrs); - initAttrs(context, attrs); - } - - public BoundedCardView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - private int boundedWidth; - private int boundedHeight; - - private void initAttrs(Context context, AttributeSet attrs) { - TypedArray arr = context.obtainStyledAttributes(attrs, R.styleable.BoundedView); - boundedWidth = arr.getDimensionPixelSize(R.styleable.BoundedView_bounded_width, 0); - boundedHeight = arr.getDimensionPixelSize(R.styleable.BoundedView_bounded_height, 0); - arr.recycle(); - } - - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - if (boundedWidth > 0 && boundedWidth < MeasureSpec.getSize(widthMeasureSpec)) { - MeasureSpec.makeMeasureSpec(boundedWidth, MeasureSpec.getMode(widthMeasureSpec)); - } - if (boundedHeight > 0 && boundedHeight < MeasureSpec.getSize(heightMeasureSpec)) { - MeasureSpec.makeMeasureSpec(boundedHeight, MeasureSpec.getMode(heightMeasureSpec)); - } - super.onMeasure(widthMeasureSpec, heightMeasureSpec); - } -} diff --git a/app/src/main/res/layout/activity_dns_server_config.xml b/app/src/main/res/layout/activity_config.xml similarity index 100% rename from app/src/main/res/layout/activity_dns_server_config.xml rename to 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 index edc0225..7d36196 100644 --- a/app/src/main/res/xml/perf_settings.xml +++ b/app/src/main/res/xml/perf_settings.xml @@ -18,7 +18,7 @@