From f207ed5f784b6ef34b78a4390a741d7f7d8e44d0 Mon Sep 17 00:00:00 2001
From: Aidan Follestad <afollestad@squareup.com>
Date: Tue, 8 Jan 2019 16:51:31 -0800
Subject: [PATCH] 0.8.4

---
 app/src/main/res/layout/activity_viewsite.xml                 | 1 +
 app/src/main/res/values/strings.xml                           | 3 ++-
 .../java/com/afollestad/nocknock/data/DatabaseMigrations.kt   | 4 ++--
 dependencies.gradle                                           | 4 ++--
 .../afollestad/nocknock/engine/validation/ValidationJob.kt    | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/activity_viewsite.xml b/app/src/main/res/layout/activity_viewsite.xml
index 15f8f2e..782a166 100644
--- a/app/src/main/res/layout/activity_viewsite.xml
+++ b/app/src/main/res/layout/activity_viewsite.xml
@@ -49,6 +49,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/content_inset_quarter"
             android:orientation="horizontal"
             >
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 013a7f0..e16c89c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,7 +24,8 @@
   <string name="site_url">Site URL</string>
   <string name="site_url_hint">https://yoursite.com</string>
   <string name="site_tags">Site Tags</string>
-  <string name="site_tags_hint">One,Two,Three</string>
+  <string name="site_tags_hint">e.g. One,Two,Three</string>
+  <string name="site_tags_hint_full">Tags (e.g. One,Two,Three)</string>
   <string name="please_enter_name">Please enter a name!</string>
   <string name="please_enter_url">Please enter a URL.</string>
   <string name="please_enter_valid_url">Please enter a valid URL.</string>
diff --git a/data/src/main/java/com/afollestad/nocknock/data/DatabaseMigrations.kt b/data/src/main/java/com/afollestad/nocknock/data/DatabaseMigrations.kt
index ac2f2af..0bf5f0d 100644
--- a/data/src/main/java/com/afollestad/nocknock/data/DatabaseMigrations.kt
+++ b/data/src/main/java/com/afollestad/nocknock/data/DatabaseMigrations.kt
@@ -27,7 +27,7 @@ class Database1to2Migration : Migration(1, 2) {
 
   override fun migrate(database: SupportSQLiteDatabase) {
     database.execSQL(
-        "CREATE TABLE `retry_policies` (siteId INTEGER PRIMARY KEY NOT NULL, count INTEGER NOT NULL, minutes INTEGER NOT NULL, lastTryTimestamp INTEGER NOT NULL, triesLeft INTEGER NOT NULL)"
+        "CREATE TABLE IF NOT EXISTS `retry_policies` (siteId INTEGER PRIMARY KEY NOT NULL, count INTEGER NOT NULL, minutes INTEGER NOT NULL, lastTryTimestamp INTEGER NOT NULL, triesLeft INTEGER NOT NULL)"
     )
   }
 }
@@ -53,7 +53,7 @@ class Database3to4Migration : Migration(3, 4) {
 
   override fun migrate(database: SupportSQLiteDatabase) {
     database.execSQL(
-        "CREATE TABLE `headers` (id INTEGER PRIMARY KEY NOT NULL, siteId INTEGER NOT NULL, `key` TEXT NOT NULL, value TEXT NOT NULL)"
+        "CREATE TABLE IF NOT EXISTS `headers` (id INTEGER PRIMARY KEY NOT NULL, siteId INTEGER NOT NULL, `key` TEXT NOT NULL, value TEXT NOT NULL)"
     )
   }
 }
diff --git a/dependencies.gradle b/dependencies.gradle
index 433cb7b..ee87cb2 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -3,8 +3,8 @@ ext.versions = [
     minSdk              : 21,
     compileSdk          : 28,
     buildTools          : '28.0.3',
-    publishVersion      : '0.8.3',
-    publishVersionCode  : 35,
+    publishVersion      : '0.8.4',
+    publishVersionCode  : 37,
 
     // Plugins
     gradlePlugin        : '3.2.1',
diff --git a/engine/src/main/java/com/afollestad/nocknock/engine/validation/ValidationJob.kt b/engine/src/main/java/com/afollestad/nocknock/engine/validation/ValidationJob.kt
index 64942bb..435ff89 100644
--- a/engine/src/main/java/com/afollestad/nocknock/engine/validation/ValidationJob.kt
+++ b/engine/src/main/java/com/afollestad/nocknock/engine/validation/ValidationJob.kt
@@ -143,7 +143,7 @@ class ValidationJob : JobService() {
 
       if (jobResult.lastResult!!.status == OK) {
         notificationManager.cancelStatusNotification(jobResult)
-        if (lastResult != null && lastResult.status != OK) {
+        if (lastResult != null && lastResult.status == ERROR) {
           notificationManager.postValidationSuccessNotification(jobResult)
         }
       } else {