From 8388905b4862a7b05b74fff4711a48cdf14c9c56 Mon Sep 17 00:00:00 2001
From: Joshua Wolfsohn <jpwolfso@edu.uwaterloo.ca>
Date: Thu, 26 Sep 2019 20:13:55 -0400
Subject: [PATCH] v1.2 - removed unnecessary dependencies and added code for if
 no dns specified

---
 app/build.gradle                              |  9 ++----
 app/release/output.json                       |  2 +-
 .../privdnsqt/PrivateDnsTileService.java      | 28 +++++++++++++------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 264f9e4..853d663 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.jpwolfso.privdnsqt"
         minSdkVersion 28
         targetSdkVersion 28
-        versionCode 2
-        versionName '1.1.1'
+        versionCode 3
+        versionName '1.2'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -21,9 +21,4 @@ android {
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
diff --git a/app/release/output.json b/app/release/output.json
index 61ffacf..71474f3 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.1.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"1.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/jpwolfso/privdnsqt/PrivateDnsTileService.java b/app/src/main/java/com/jpwolfso/privdnsqt/PrivateDnsTileService.java
index bacd0a2..946afda 100644
--- a/app/src/main/java/com/jpwolfso/privdnsqt/PrivateDnsTileService.java
+++ b/app/src/main/java/com/jpwolfso/privdnsqt/PrivateDnsTileService.java
@@ -39,10 +39,14 @@ public void onStartListening() {
             tile.setLabel(getString(R.string.qt_auto));
             tile.setIcon(Icon.createWithResource(this,R.drawable.ic_dnsauto));
         } else if (dnsmode.equalsIgnoreCase(DNS_MODE_ON)) {
-            tile.setState(Tile.STATE_ACTIVE);
             String dnsname = Settings.Global.getString(getContentResolver(), "private_dns_specifier");
-            tile.setLabel(dnsname);
-            tile.setIcon(Icon.createWithResource(this,R.drawable.ic_dnson));
+            if ((dnsname != null) && (!dnsname.isEmpty())) {
+                tile.setState(Tile.STATE_ACTIVE);
+                tile.setLabel(dnsname);
+                tile.setIcon(Icon.createWithResource(this, R.drawable.ic_dnson));
+            } else {
+                Toast.makeText(this, "DNS provider not configured", Toast.LENGTH_SHORT).show();
+            }
         }
 
         tile.updateTile();
@@ -66,11 +70,19 @@ public void onClick() {
                 tile.setLabel(getString(R.string.qt_auto));
                 tile.setIcon(Icon.createWithResource(this,R.drawable.ic_dnsauto));
             } else if (dnsmode.equalsIgnoreCase(DNS_MODE_AUTO)) {
-                Settings.Global.putString(getContentResolver(), "private_dns_mode", DNS_MODE_ON);
-                tile.setState(Tile.STATE_ACTIVE);
-                String dnsname = Settings.Global.getString(getContentResolver(), "private_dns_specifier");
-                tile.setLabel(dnsname);
-                tile.setIcon(Icon.createWithResource(this,R.drawable.ic_dnson));
+                    String dnsname = Settings.Global.getString(getContentResolver(), "private_dns_specifier");
+                    if ((dnsname != null) && (!dnsname.isEmpty())) {
+                        Settings.Global.putString(getContentResolver(), "private_dns_mode", DNS_MODE_ON);
+                        tile.setState(Tile.STATE_ACTIVE);
+                        tile.setLabel(dnsname);
+                        tile.setIcon(Icon.createWithResource(this, R.drawable.ic_dnson));
+                    } else {
+                        Toast.makeText(this, "DNS provider not configured", Toast.LENGTH_SHORT).show();
+                        Settings.Global.putString(getContentResolver(), "private_dns_mode", DNS_MODE_OFF);
+                        tile.setState((Tile.STATE_INACTIVE));
+                        tile.setLabel(getString(R.string.qt_off));
+                        tile.setIcon(Icon.createWithResource(this,R.drawable.ic_dnsoff));
+                    }
             } else if (dnsmode.equals(DNS_MODE_ON)) {
                 Settings.Global.putString(getContentResolver(), "private_dns_mode", DNS_MODE_OFF);
                 tile.setState(Tile.STATE_INACTIVE);