diff options
| author | Allan Wang <me@allanwang.ca> | 2017-07-03 21:07:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-03 21:07:12 -0400 |
| commit | bde1c74e57b34b3395fe4741d8188fe2704662ce (patch) | |
| tree | f2e5b1b2ce8980b6ca57b2f5ee8abdf19a5cf0b2 | |
| parent | 8edd98fcee1506177e61ebeb31af35c7f3fb48c8 (diff) | |
| download | frost-bde1c74e57b34b3395fe4741d8188fe2704662ce.tar.gz frost-bde1c74e57b34b3395fe4741d8188fe2704662ce.tar.bz2 frost-bde1c74e57b34b3395fe4741d8188fe2704662ce.zip | |
Dev (#14)
* Allow file access
* Log all to phone
* Rework billing logic
* Simplify travis process
* More logging
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | 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) } |