From 269f95b55bc05dc5288addba917b1630cef91a29 Mon Sep 17 00:00:00 2001
From: PeratX <1215714524@qq.com>
Date: Sun, 7 Oct 2018 14:20:53 +0800
Subject: [PATCH] Added Privacy Policy. Release 1.12.1

---
 app/build.gradle                                       | 10 +++++-----
 .../daedalus/fragment/GlobalConfigFragment.java        |  5 +++++
 app/src/main/res/values-zh-rCN/strings.xml             |  1 +
 app/src/main/res/values-zh-rTW/strings.xml             |  1 +
 app/src/main/res/values/strings.xml                    |  1 +
 app/src/main/res/xml/perf_settings.xml                 |  3 +++
 build.gradle                                           |  2 +-
 7 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ac82510..077f968 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.itxtech.daedalus"
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 16
-        versionName "1.12.0"
+        versionCode 17
+        versionName "1.12.1"
 
         buildConfigField "String", "BUILD_TIME", "\"${System.currentTimeMillis()}\""
         buildConfigField "String", "GIT_COMMIT", "\"${gitCommit}\""
@@ -47,11 +47,11 @@ dependencies {
     //DNS
     implementation 'org.pcap4j:pcap4j-core:1.7.3'
     implementation 'org.pcap4j:pcap4j-packetfactory-static:1.7.3'
-    implementation 'org.minidns:minidns-client:0.3.0'
+    implementation 'org.minidns:minidns-client:0.3.2'
     implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
     //Analytics
-    implementation 'com.google.firebase:firebase-core:16.0.3'
+    implementation 'com.google.firebase:firebase-core:16.0.4'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
 }
 
diff --git a/app/src/main/java/org/itxtech/daedalus/fragment/GlobalConfigFragment.java b/app/src/main/java/org/itxtech/daedalus/fragment/GlobalConfigFragment.java
index bfea391..30414a5 100644
--- a/app/src/main/java/org/itxtech/daedalus/fragment/GlobalConfigFragment.java
+++ b/app/src/main/java/org/itxtech/daedalus/fragment/GlobalConfigFragment.java
@@ -105,6 +105,11 @@ public class GlobalConfigFragment extends PreferenceFragment {
             return false;
         });
 
+        findPreference("settings_privacy_policy").setOnPreferenceClickListener(preference -> {
+            Daedalus.openUri("https://github.com/iTXTech/Daedalus/wiki/Privacy-Policy");
+            return false;
+        });
+
         updateAdvancedOptions(advanced.isChecked());
     }
 
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6a5f9b6..40252b4 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -52,6 +52,7 @@
     <string name="settings_notification">显示通知</string>
     <string name="settings_check_update">检查更新</string>
     <string name="settings_update_summary">前往 GitHub 发布页面。</string>
+    <string name="settings_privacy_policy">隐私政策</string>
     <string name="settings_count_number_of_queries">统计 DNS 查询次数</string>
     <string name="settings_bug_report">提交反馈</string>
     <string name="settings_issue_summary">前往 GitHub 提交 Bug 反馈。</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 2a571b4..45c0d1b 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -52,6 +52,7 @@
     <string name="settings_notification">顯示通知</string>
     <string name="settings_check_update">檢查更新</string>
     <string name="settings_update_summary">造訪 GitHub 發行頁面。</string>
+    <string name="settings_privacy_policy">隱私政策</string>
     <string name="settings_count_number_of_queries">統計 DNS 查詢次數</string>
     <string name="settings_bug_report">回報 Bug</string>
     <string name="settings_issue_summary">前往 GitHub 送出 Bug 回饋。</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 66a0e05..9956207 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -51,6 +51,7 @@
     <string name="settings_notification">Show Notification</string>
     <string name="settings_check_update">Check Update</string>
     <string name="settings_update_summary">Visit GitHub Releases Page.</string>
+    <string name="settings_privacy_policy">Privacy Policy</string>
     <string name="settings_count_number_of_queries">Count DNS Query Times</string>
     <string name="settings_bug_report">Report a Bug</string>
     <string name="settings_issue_summary">Submit an Issue on GitHub Issues Page.</string>
diff --git a/app/src/main/res/xml/perf_settings.xml b/app/src/main/res/xml/perf_settings.xml
index 478d383..0e1a1f2 100644
--- a/app/src/main/res/xml/perf_settings.xml
+++ b/app/src/main/res/xml/perf_settings.xml
@@ -88,6 +88,9 @@
     <PreferenceCategory
             android:key="settings_help"
             android:title="@string/settings_help_and_support">
+        <org.itxtech.daedalus.widget.ClickPreference
+                android:key="settings_privacy_policy"
+                android:title="@string/settings_privacy_policy"/>
         <org.itxtech.daedalus.widget.ClickPreference
                 android:key="settings_check_update"
                 android:title="@string/settings_check_update"
diff --git a/build.gradle b/build.gradle
index b6410ee..9e6df6f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.4'
         classpath 'com.google.gms:google-services:4.0.1'
-        classpath 'io.fabric.tools:gradle:1.25.1'
+        classpath 'io.fabric.tools:gradle:1.25.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files