Blockstack SDK Alpha migration (BNS 2.0)

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.1] - 2021-08-18
+### Changed
+- Update Alpha Blockstack-Android SDK, Register Subdomain Flag
+
+## [1.4.0] - 2021-08-18
+### Changed
+- Update to Alpha Blockstack-Android SDK, keeping up with STX addresses and BNS 2.0
+
 ## [1.3.1] - 2021-02-17
 ### Fixed
 - Crash with Android 30+

app/build.gradle

@@ -10,13 +10,13 @@ repositories {
 apply from: 'jacoco.gradle'
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 31
   defaultConfig {
     applicationId 'app.envelop'
     minSdkVersion 21
-    targetSdkVersion 30
-    versionCode 35
-    versionName '1.3.1'
+    targetSdkVersion 31
+    versionCode 37
+    versionName '1.4.1'
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   buildTypes {
@@ -62,35 +62,35 @@ android {
 
 dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'
-  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-rx2:1.4.2'
-  implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
-  implementation 'androidx.core:core-ktx:1.3.2'
+  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1-native-mt'
+  implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-rx2:1.5.1-native-mt'
+  implementation 'androidx.appcompat:appcompat:1.4.0-alpha03'
+  implementation 'androidx.core:core-ktx:1.6.0'
   implementation 'androidx.preference:preference-ktx:1.1.1'
-  implementation 'com.google.android.material:material:1.3.0'
+  implementation 'com.google.android.material:material:1.4.0'
 
   // Architecture Components
-  implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0'
+  implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
   implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-  implementation 'androidx.lifecycle:lifecycle-common-java8:2.3.0'
+  implementation 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
 
 
   // Logging
-  implementation 'com.jakewharton.timber:timber:4.7.1'
+  implementation 'com.jakewharton.timber:timber:5.0.1'
 
   // Serialization
-  implementation 'com.google.code.gson:gson:2.8.6'
+  implementation 'com.google.code.gson:gson:2.8.7'
 
   // Blockstack
   //noinspection GradleDependency
-  implementation 'com.github.blockstack:blockstack-android:0.6.1'
+  implementation "com.github.blocoio:blockstack-android:a970880"
 
   // Dependency Injection
-  implementation 'com.google.dagger:dagger:2.32'
-  kapt 'com.google.dagger:dagger-compiler:2.32'
+  implementation 'com.google.dagger:dagger:2.38.1'
+  kapt 'com.google.dagger:dagger-compiler:2.38.1'
 
   // Database ORM
-  def room_version = '2.2.6'
+  def room_version = '2.3.0'
   implementation "androidx.room:room-runtime:$room_version"
   implementation "androidx.room:room-rxjava2:$room_version"
   kapt "androidx.room:room-compiler:$room_version"
@@ -108,25 +108,25 @@ dependencies {
   implementation "com.jakewharton.rxbinding3:rxbinding-swiperefreshlayout:$rxbinding_version"
 
   // Lists
-  implementation ('com.airbnb.android:epoxy:4.3.1'){
+  implementation ('com.airbnb.android:epoxy:4.6.3-vinay-compose'){
     exclude group: "org.jetbrains.kotlin", module: "kotlin-parcelize-runtime"
   }
-  kapt 'com.airbnb.android:epoxy-processor:4.3.1'
+  kapt 'com.airbnb.android:epoxy-processor:4.6.3-vinay-compose'
 
   // Encryption
   implementation 'com.madgag.spongycastle:bcpkix-jdk15on:1.58.0.0'
   implementation 'com.madgag.spongycastle:bcpg-jdk15on:1.58.0.0'
 
   // Testing
   testImplementation 'junit:junit:4.13.2'
-  testImplementation 'org.mockito:mockito-inline:3.7.7'
+  testImplementation 'org.mockito:mockito-inline:3.11.2'
   testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
-  androidTestImplementation 'androidx.test:runner:1.3.0'
-  androidTestImplementation 'androidx.test:rules:1.3.0'
-  androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-  androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-  androidTestImplementation 'androidx.test.espresso:espresso-intents:3.3.0'
-  androidTestImplementation 'org.mockito:mockito-android:3.7.7'
+  androidTestImplementation 'androidx.test:runner:1.4.0'
+  androidTestImplementation 'androidx.test:rules:1.4.0'
+  androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+  androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+  androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
+  androidTestImplementation 'org.mockito:mockito-android:3.11.2'
   androidTestImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") {
     // Workaround for Android API < 26:
     // https://github.com/mockito/mockito/pull/2024

app/src/main/java/app/envelop/data/BlockstackLogin.kt

@@ -15,7 +15,7 @@ open class BlockstackLogin
   private val activity: Activity
 ) {
 
-  open fun login() =  blockstackConnectProvider.get().connect(activity)
+  open fun login() =  blockstackConnectProvider.get().connect(activity, true)
 
   open fun handlePendingSignIn(token: String) = rxSingleToOperation {
     val result = blockstackProvider.get().handlePendingSignIn(token)

app/src/main/java/app/envelop/data/repositories/RemoteRepository.kt

@@ -1,5 +1,6 @@
 package app.envelop.data.repositories
 
+import android.annotation.SuppressLint
 import app.envelop.common.Operation
 import app.envelop.common.Optional
 import app.envelop.common.mapIfSuccessful
@@ -90,6 +91,7 @@ class RemoteRepository
       .mapIfSuccessful { list -> list.filter { it.startsWith(prefix) } }
 
   @Suppress("unused") // Useful for debugging
+  @SuppressLint("CheckResult")
   fun printListFiles() {
     getFilesList()
       .observeOnUI()

app/src/main/java/app/envelop/ui/login/LoginActivity.kt

@@ -1,5 +1,6 @@
 package app.envelop.ui.login
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -19,6 +20,7 @@ import kotlinx.android.synthetic.main.activity_login.*
 import kotlinx.android.synthetic.main.partial_banner.*
 import javax.inject.Inject
 
+@SuppressLint("CheckResult")
 class LoginActivity : BaseActivity() {
 
   @Inject

app/src/main/java/app/envelop/ui/main/DocMenuView.kt

@@ -1,5 +1,6 @@
 package app.envelop.ui.main
 
+import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Context
 import android.content.Intent
@@ -24,6 +25,7 @@ import com.trello.rxlifecycle3.android.lifecycle.kotlin.bindToLifecycle
 import kotlinx.android.synthetic.main.view_doc_menu.view.*
 import javax.inject.Inject
 
+@SuppressLint("CheckResult")
 class DocMenuView
 @JvmOverloads
 constructor(

app/src/main/java/app/envelop/ui/main/MainActivity.kt

@@ -1,5 +1,6 @@
 package app.envelop.ui.main
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Dialog
 import android.content.Context
@@ -29,6 +30,7 @@ import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.shared_appbar.*
 import javax.inject.Inject
 
+@SuppressLint("CheckResult")
 class MainActivity : BaseActivity() {
 
   @Inject
@@ -175,12 +177,12 @@ class MainActivity : BaseActivity() {
       dummyItemView {
         id("top")
       }
-      docs.forEach { doc ->
+      for (doc in docs) {
         docItemView {
           id(doc.id)
           item(doc)
           clickListener { openDocMenu(doc) }
-        }
+          }
       }
     }
   }

app/src/main/java/app/envelop/ui/share/ShareActivity.kt

@@ -1,5 +1,6 @@
 package app.envelop.ui.share
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
@@ -18,6 +19,7 @@ import kotlinx.android.synthetic.main.activity_share.*
 import kotlinx.android.synthetic.main.shared_appbar.*
 import javax.inject.Inject
 
+@SuppressLint("CheckResult")
 class ShareActivity : BaseActivity() {
 
   @Inject

app/src/main/java/app/envelop/ui/upload/UploadActivity.kt

@@ -1,5 +1,6 @@
 package app.envelop.ui.upload
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -15,6 +16,7 @@ import app.envelop.ui.share.ShareActivity
 import com.trello.rxlifecycle3.android.lifecycle.kotlin.bindToLifecycle
 import javax.inject.Inject
 
+@SuppressLint("CheckResult")
 class UploadActivity : BaseActivity() {
 
   @Inject

app/src/main/java/app/envelop/ui/upload/UploadViewModel.kt

@@ -1,5 +1,6 @@
 package app.envelop.ui.upload
 
+import android.annotation.SuppressLint
 import android.net.Uri
 import app.envelop.common.Optional
 import app.envelop.domain.PreUploadService
@@ -15,6 +16,7 @@ import io.reactivex.subjects.PublishSubject
 import timber.log.Timber
 import javax.inject.Inject
 
+@SuppressLint("CheckResult")
 class UploadViewModel
 @Inject constructor(
   userService: UserService,
@@ -30,7 +32,6 @@ class UploadViewModel
   private val finish = PublishSubject.create<Finish>()
 
   init {
-
     userService
       .user()
       .filter { it is Optional.None }
@@ -71,4 +72,4 @@ class UploadViewModel
   sealed class Error {
     object UploadError : Error()
   }
-}
+}

app/src/main/res/layout/item_doc.xml

@@ -39,7 +39,7 @@
 
       <TextView
         android:id="@+id/name"
-        android:layout_width="wrap_content"
+         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
         android:ellipsize="end"

build.gradle

@@ -1,22 +1,22 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-  ext.kotlin_version = '1.4.30'
+  ext.kotlin_version = '1.5.21'
   repositories {
     google()
-    jcenter()
+    mavenCentral()
 
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.1.2'
+    classpath 'com.android.tools.build:gradle:4.1.3'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
 }
 
 allprojects {
   repositories {
     google()
-    jcenter()
+    mavenCentral()
   }
 }