Merge remote-tracking branch 'benma/android'

Author: benma

frontends/android/BitBoxApp/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "ch.shiftcrypto.bitboxapp"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 2
-        versionName "android-20191117"
+        versionCode 3
+        versionName "android-20191125"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

frontends/android/Makefile

@@ -8,7 +8,9 @@ clean:
 	cd goserver && ${MAKE} clean
 	cd BitBoxApp && ./gradlew clean
 prepare-android:
-	mkdir -p BitBoxApp/app/src/main/assets/web && cp -aR ../web/build/* BitBoxApp/app/src/main/assets/web/
+	rm -rf BitBoxApp/app/src/main/assets/web
+	mkdir -p BitBoxApp/app/src/main/assets/web
+	cp -aR ../web/build/* BitBoxApp/app/src/main/assets/web/
 	cd goserver && ${MAKE} build
 	cp goserver/goserver.aar BitBoxApp/goserver/
 logcat: