[taler-wallet-android] 01/02: Download binary deps before building on CI

[gnunet]

This is an automated email from the git hooks/post-receive script.

torsten-grote pushed a commit to branch master
in repository wallet-android.

commit 9c7f53f6fccf55d4aa67063ab806f22c871c20e1
Author: Torsten Grote <address@hidden>
AuthorDate: Thu Mar 5 13:14:12 2020 -0300

    Download binary deps before building on CI
    
    and fix lint issue
---
 .gitlab-ci.yml                                              | 6 ++++++
 app/src/main/java/net/taler/wallet/history/WalletHistory.kt | 4 ++--
 build.gradle                                                | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4bfc45..3cdba25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,12 @@ stages:
   - test
   - deploy
 
+default:
+  before_script:
+    - wget 
https://git.taler.net/wallet-android.git/plain/akono.aar?h=binary-deps -O 
akono/akono.aar
+    - mkdir -p app/src/main/assets
+    - wget 
https://git.taler.net/wallet-android.git/plain/taler-wallet-android.js?h=binary-deps
 -O app/src/main/assets/taler-wallet-android.js
+
 test:
   stage: test
   script: ./gradlew lint assembleRelease
diff --git a/app/src/main/java/net/taler/wallet/history/WalletHistory.kt 
b/app/src/main/java/net/taler/wallet/history/WalletHistory.kt
index 76b11ea..bb37ffa 100644
--- a/app/src/main/java/net/taler/wallet/history/WalletHistory.kt
+++ b/app/src/main/java/net/taler/wallet/history/WalletHistory.kt
@@ -95,10 +95,10 @@ class WalletHistory : Fragment(), OnEventClickListener {
             addItemDecoration(myItemDecoration)
         }
 
-        model.historyProgress.observe(this, Observer { show ->
+        model.historyProgress.observe(viewLifecycleOwner, Observer { show ->
             historyProgressBar.visibility = if (show) VISIBLE else INVISIBLE
         })
-        model.history.observe(this, Observer { history ->
+        model.history.observe(viewLifecycleOwner, Observer { history ->
             historyEmptyState.visibility = if (history.isEmpty()) VISIBLE else 
INVISIBLE
             historyAdapter.update(history)
         })
diff --git a/build.gradle b/build.gradle
index a9d913c..ee7840e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.3.70'
     repositories {
         google()
         jcenter()

-- 
To stop receiving notification emails like this one, please contact
address@hidden.