From 55cda1842fa1d302e0a282830255c684a6be3474 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 20 Aug 2017 00:16:41 -0700
Subject: Fix/travis (#203)

* Add check to see if signing is valid

* Add test keystore
---
 app/build.gradle  | 40 ++++++++++++++++++++++++----------------
 docs/Changelog.md |  1 +
 files/.gitignore  |  1 -
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c07ed39c..90245f42 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,13 +8,20 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
 
-play {
-    jsonFile = file('../files/gplay-keys.json')
-    track = 'alpha'
-    errorOnSizeLimit = true
-    uploadImages = false
-    untrackOld = true
-}
+def withPlaySigning = file('../files.gplay-keys.json').exists()
+/*
+ * Feel free to check the gitignore under the files/ folder to see what is required for the signing
+ * It is assumed that if one of those files exist, all remaining ones exist as well
+ */
+
+if (withPlaySigning)
+    play {
+        jsonFile = file('../files/gplay-keys.json')
+        track = 'alpha'
+        errorOnSizeLimit = true
+        uploadImages = false
+        untrackOld = true
+    }
 
 android {
     compileSdkVersion Integer.parseInt(project.TARGET_SDK)
@@ -33,7 +40,6 @@ android {
         versionCode androidGitVersion.code()
         versionName androidGitVersion.name()
         multiDexEnabled true
-        buildTypeMatching 'release'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -53,14 +59,16 @@ android {
 
     signingConfigs {
 
-        def releaseProps = new Properties()
-        file("../files/play.properties").withInputStream { releaseProps.load(it) }
+        if (withPlaySigning) {
+            def releaseProps = new Properties()
+            file("../files/play.properties").withInputStream { releaseProps.load(it) }
 
-        release {
-            storeFile file("../files/play.keystore")
-            storePassword releaseProps.getProperty('storePassword')
-            keyAlias releaseProps.getProperty('keyAlias')
-            keyPassword releaseProps.getProperty('keyPassword')
+            release {
+                storeFile file("../files/play.keystore")
+                storePassword releaseProps.getProperty('storePassword')
+                keyAlias releaseProps.getProperty('keyAlias')
+                keyPassword releaseProps.getProperty('keyPassword')
+            }
         }
 
         test {
@@ -95,7 +103,7 @@ android {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
+            if (withPlaySigning) signingConfig signingConfigs.release
             resValue "string", "frost_name", "Frost"
             resValue "string", "frost_web", "Frost Web"
         }
diff --git a/docs/Changelog.md b/docs/Changelog.md
index 131ed286..d2edbc4a 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -3,6 +3,7 @@
 ## Beta Updates
 * Fix url loading bug and add option to launch urls in default browser (behaviour setting)
 * Allow for bottom bar tabs (appearance setting)
+* Allow custom ringtones for notifications and messages (notification setting)
 
 ## v1.4.7
 * Update secondary background for transparent themes to be more visible.
diff --git a/files/.gitignore b/files/.gitignore
index 82c07033..50650209 100644
--- a/files/.gitignore
+++ b/files/.gitignore
@@ -1,5 +1,4 @@
 gplay-keys.json
 play.keystore
 play.properties
-test.keystore
 update-dev.sh
-- 
cgit v1.2.3