From bde1c74e57b34b3395fe4741d8188fe2704662ce Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Mon, 3 Jul 2017 21:07:12 -0400
Subject: Dev (#14)

* Allow file access

* Log all to phone

* Rework billing logic

* Simplify travis process

* More logging
---
 .travis.yml                                                | 6 ++----
 app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cda20a80..52a5ec31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,12 +18,10 @@ before_install:
 - tar xvf frost.tar
 - chmod +x gradlew
 after_success:
-- chmod +x ./generate-apk-release.sh
-# Do one or the other
-- if [[ "$TRAVIS_BRANCH" == "master" ]]; then ./gradlew app:publishApkRelease; else ./generate-apk-release.sh; fi
+- if [[ "$TRAVIS_BRANCH" != "master" ]]; then chmod +x ./generate-apk-release.sh; ./generate-apk-release.sh; fi
 script:
 - cd $TRAVIS_BUILD_DIR/
-- "./gradlew assembleReleaseTest"
+- if [[ "$TRAVIS_BRANCH" == "master" ]]; then ./gradlew app:publishApkRelease; else ./gradlew assembleReleaseTest; fi
 notifications:
   email: false
   slack:
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt
index a96af378..645a6218 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IAB.kt
@@ -43,6 +43,7 @@ object IAB {
                     helper!!.enableDebugLogging(BuildConfig.DEBUG, "Frost:")
                     helper!!.startSetup {
                         result ->
+                        L.d("IAB setup finished; ${result.isSuccess}")
                         if (result.isSuccess) {
                             if (onStart(helper!!))
                                 helper!!.disposeWhenFinished()
@@ -142,6 +143,7 @@ fun Activity.getInventory(
         helper ->
         helper.queryInventoryAsync {
             res, inv ->
+            L.d("Inventory query finished")
             if (res.isFailure || inv == null) onFailed()
             else onSuccess(inv, helper)
         }
-- 
cgit v1.2.3