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

Updated OSL

Browse Source
This commit is contained in:
PeratX 2017-06-14 19:54:59 +08:00
parent ffae7c9646
commit c925c79871
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -62,6 +62,7 @@ Open Source Licenses
* __[Pcap4J](https://github.com/kaitoy/pcap4j)__ by *[Kaito Yamada](https://github.com/kaitoy)* - [MIT](https://github.com/kaitoy/pcap4j) * __[Pcap4J](https://github.com/kaitoy/pcap4j)__ by *[Kaito Yamada](https://github.com/kaitoy)* - [MIT](https://github.com/kaitoy/pcap4j)
* __[MiniDNS](https://github.com/rtreffer/minidns)__ by *[Rene Treffer](https://github.com/rtreffer)* - [LGPLv2.1](https://github.com/rtreffer/minidns/blob/master/LICENCE_LGPL2.1) * __[MiniDNS](https://github.com/rtreffer/minidns)__ by *[Rene Treffer](https://github.com/rtreffer)* - [LGPLv2.1](https://github.com/rtreffer/minidns/blob/master/LICENCE_LGPL2.1)
* __[Gson](https://github.com/google/gson)__ by *[Google](https://github.com/google)* - [APL 2.0](https://github.com/google/gson/blob/master/LICENSE) * __[Gson](https://github.com/google/gson)__ by *[Google](https://github.com/google)* - [APL 2.0](https://github.com/google/gson/blob/master/LICENSE)
* __[Shadowsocks](https://github.com/shadowsocks/shadowsocks-android)__ by *[Shadowsocks](https://github.com/shadowsocks)* - [GPLv3](https://github.com/shadowsocks/shadowsocks-android/blob/master/LICENSE)
License License
------------ ------------

2
app/src/main/assets/about_html/index.html
View File

@ -96,6 +96,8 @@
href="https://github.com/rtreffer/minidns/blob/master/LICENCE_LGPL2.1">LGPLv2.1</a><br> href="https://github.com/rtreffer/minidns/blob/master/LICENCE_LGPL2.1">LGPLv2.1</a><br>
<a href="https://github.com/google/gson">Gson</a>: <a <a href="https://github.com/google/gson">Gson</a>: <a
href="https://github.com/google/gson/blob/master/LICENSE">APL 2.0</a><br> href="https://github.com/google/gson/blob/master/LICENSE">APL 2.0</a><br>
<a href="https://github.com/shadowsocks/shadowsocks-android">Shadowsocks</a>: <a
href="https://github.com/shadowsocks/shadowsocks-android/blob/master/LICENSE">GPLv3</a>
</div> </div>
</body> </body>
</html> </html>

2
app/src/main/assets/about_html/index_zh.html
View File

@ -96,6 +96,8 @@
href="https://github.com/rtreffer/minidns/blob/master/LICENCE_LGPL2.1">LGPLv2.1</a><br> href="https://github.com/rtreffer/minidns/blob/master/LICENCE_LGPL2.1">LGPLv2.1</a><br>
<a href="https://github.com/google/gson">Gson</a>: <a <a href="https://github.com/google/gson">Gson</a>: <a
href="https://github.com/google/gson/blob/master/LICENSE">APL 2.0</a><br> href="https://github.com/google/gson/blob/master/LICENSE">APL 2.0</a><br>
<a href="https://github.com/shadowsocks/shadowsocks-android">Shadowsocks</a>: <a
href="https://github.com/shadowsocks/shadowsocks-android/blob/master/LICENSE">GPLv3</a>
</div> </div>
</body> </body>
</html> </html>

3
app/src/main/java/org/itxtech/daedalus/fragment/HomeFragment.java
View File

@ -33,8 +33,7 @@ public class HomeFragment extends ToolbarFragment {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (Daedalus.getInstance().isServiceActivated()) { if (Daedalus.getInstance().isServiceActivated()) {
startActivity(new Intent(getActivity(), MainActivity.class) Daedalus.getInstance().deactivateService();
.putExtra(MainActivity.LAUNCH_ACTION, MainActivity.LAUNCH_ACTION_DEACTIVATE));
} else { } else {
startActivity(new Intent(getActivity(), MainActivity.class) startActivity(new Intent(getActivity(), MainActivity.class)
.putExtra(MainActivity.LAUNCH_ACTION, MainActivity.LAUNCH_ACTION_ACTIVATE)); .putExtra(MainActivity.LAUNCH_ACTION, MainActivity.LAUNCH_ACTION_ACTIVATE));

1
app/src/main/java/org/itxtech/daedalus/util/RulesResolver.java
View File

@ -18,7 +18,6 @@ import java.util.HashMap;
* (at your option) any later version. * (at your option) any later version.
*/ */
public class RulesResolver implements Runnable { public class RulesResolver implements Runnable {
private static final String TAG = "DRulesResolver";
public static final int STATUS_LOADED = 0; public static final int STATUS_LOADED = 0;
public static final int STATUS_LOADING = 1; public static final int STATUS_LOADING = 1;