n/nextdns-mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Release v1.7.0

Browse Source
This commit is contained in:
PeratX 2017-05-20 22:42:56 +08:00
parent b3d99d1b16
commit db578bca8c
6 changed files with 6 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -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}\""

2
app/src/main/java/org/itxtech/daedalus/activity/ConfigActivity.java
View File

@ -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)) {

4
app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
View File

@ -197,9 +197,9 @@ public class DaedalusVpnService extends VpnService implements Runnable {
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;

54
app/src/main/java/org/itxtech/daedalus/widget/BoundedCardView.java
View File

@ -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
* <p>
* 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);
}
}

0
app/src/main/res/layout/activity_dns_server_config.xml → app/src/main/res/layout/activity_config.xml
View File

2
app/src/main/res/xml/perf_settings.xml
View File

@ -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"/>