Merge branch 'develop'

Author: InvertedX

android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -50,6 +50,12 @@ android {
         release {
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
+            resValue "string", "app_name", "Sentinelx"
+        }
+        debug {
+            applicationIdSuffix ".debug"
+            resValue "string", "app_name", "Sentinelx Staging"
+            debuggable true
         }
     }
     splits {
@@ -69,7 +75,7 @@ android {
     }
 }
 
-ext.abiCodes = ['armeabi-v7a':2, 'arm64-v8a':3]
+ext.abiCodes = ['armeabi-v7a': 2, 'arm64-v8a': 3]
 
 import com.android.build.OutputFile
 
@@ -112,24 +118,25 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'org.bouncycastle:bcprov-jdk15on:1.56'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'org.apache.commons:commons-lang3:3.3.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'org.apache.commons:commons-lang3:3.4'
     implementation 'com.lambdaworks:scrypt:1.4.0'
     implementation 'commons-codec:commons-codec:1.10'
-    implementation 'com.google.guava:guava:24.1-jre'
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.google.guava:guava:28.2-jre'
+    implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.protobuf:protobuf-java:3.8.0'
-    implementation 'com.squareup.okhttp3:okhttp:3.13.1'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    implementation('com.google.zxing:core:3.3.0') {
-        transitive = true
+    implementation 'com.squareup.okhttp3:okhttp:4.4.0'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation('com.google.zxing:core:3.4.0') {
+
     }
-    implementation(project(path: ':tor')) {
-        transitive = false
+    implementation(project(':torservice')) {
+        exclude module: 'org.slf4j'
+        exclude group:'org.slf4j'
     }
-    implementation 'org.torproject:tor-android-binary:0.3.5.8-rc-v2'
+    implementation 'org.torproject:tor-android-binary:0.4.2.5'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }

android/app/src/main/AndroidManifest.xml

@@ -8,11 +8,13 @@
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here.
+
+         usesCleartextTraffic is enabled in order to use onion urls
     -->
     <application
         android:name="io.flutter.app.FlutterApplication"
         android:icon="@mipmap/ic_launcher"
-        android:label="Sentinel x"
+        android:label="@string/app_name"
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning">
         <activity

android/app/src/main/kotlin/com/invertedx/sentinelx/api/ApiService.kt

@@ -1,18 +1,21 @@
 package com.invertedx.sentinelx.api
 
 import android.content.Context
+import android.preference.PreferenceManager
 import android.util.Log
 import com.invertedx.sentinelx.BuildConfig
 import com.invertedx.sentinelx.SentinelxApp
 import com.invertedx.sentinelx.i
 import com.invertedx.sentinelx.tor.TorManager
 import com.invertedx.sentinelx.utils.LoggingInterceptor
+import com.invertedx.sentinelx.utils.SentinalPrefs
 import io.reactivex.Observable
 import okhttp3.FormBody
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
 import java.util.concurrent.TimeUnit
+import javax.net.ssl.HostnameVerifier
 import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
@@ -35,7 +38,7 @@ class ApiService(private val applicationContext: Context) {
 
     fun getTxAndXPUBData(XpubOrAddress: String): Observable<String> {
         val baseAddress = getBaseUrl()
-        val url = if (SentinelxApp.accessToken.isNotEmpty())   "${baseAddress}multiaddr?active=$XpubOrAddress&at=${SentinelxApp.accessToken}"  else    "${baseAddress}multiaddr?active=$XpubOrAddress"
+        val url = if (SentinelxApp.accessToken.isNotEmpty()) "${baseAddress}multiaddr?active=$XpubOrAddress&at=${SentinelxApp.accessToken}" else "${baseAddress}multiaddr?active=$XpubOrAddress"
 
         Log.i("API", "CALL url -> $url")
         return Observable.fromCallable {
@@ -44,7 +47,7 @@ class ApiService(private val applicationContext: Context) {
                     .build()
             val response = client.newCall(request).execute()
             try {
-                val content = response.body()!!.string()
+                val content = response.body!!.string()
                 Log.i("API", "response -> $content")
                 return@fromCallable content
             } catch (ex: Exception) {
@@ -61,12 +64,11 @@ class ApiService(private val applicationContext: Context) {
          */
         makeClient()
 
-        i("DOJO URL  SentinelxApp.dojoUrl")
         if (SentinelxApp.dojoUrl.isNotBlank()) {
             return SentinelxApp.dojoUrl
         }
 
-        return if (TorManager.getInstance(this.applicationContext).isConnected) {
+        return if (TorManager.getInstance(this.applicationContext)?.isConnected!!) {
             if (SentinelxApp.isTestNet()) SAMOURAI_API2_TESTNET_TOR_DIST else SAMOURAI_API2_TOR_DIST
         } else {
             if (SentinelxApp.isTestNet()) SAMOURAI_API_TESTNET else SAMOURAI_API
@@ -75,7 +77,7 @@ class ApiService(private val applicationContext: Context) {
 
     fun getTx(txid: String): Observable<String> {
         val baseAddress = getBaseUrl()
-        val baseUrl = if (SentinelxApp.accessToken.isNotEmpty())  "${baseAddress}tx/$txid/?fees=trues&at=${SentinelxApp.accessToken}"  else   "${baseAddress}tx/$txid/?fees=trues"
+        val baseUrl = if (SentinelxApp.accessToken.isNotEmpty()) "${baseAddress}tx/$txid/?fees=trues&at=${SentinelxApp.accessToken}" else "${baseAddress}tx/$txid/?fees=trues"
 
         return Observable.fromCallable {
 
@@ -85,7 +87,7 @@ class ApiService(private val applicationContext: Context) {
 
             val response = client.newCall(request).execute()
             try {
-                val content = response.body()!!.string()
+                val content = response.body!!.string()
                 Log.i("API", "response -> $content")
                 return@fromCallable content
             } catch (ex: Exception) {
@@ -107,7 +109,7 @@ class ApiService(private val applicationContext: Context) {
 
             val response = client.newCall(request).execute()
             try {
-                return@fromCallable response.body()!!.string()
+                return@fromCallable response.body!!.string()
             } catch (ex: Exception) {
                 throw  ex
             }
@@ -120,7 +122,7 @@ class ApiService(private val applicationContext: Context) {
         makeClient()
 
         val baseAddress = getBaseUrl()
-        val baseUrl = if (SentinelxApp.accessToken.isNotEmpty())  "${baseAddress}unspent?active=$xpubOrAddress&at=${SentinelxApp.accessToken}"  else  "${baseAddress}unspent?active=$xpubOrAddress";
+        val baseUrl = if (SentinelxApp.accessToken.isNotEmpty()) "${baseAddress}unspent?active=$xpubOrAddress&at=${SentinelxApp.accessToken}" else "${baseAddress}unspent?active=$xpubOrAddress";
 
         return Observable.fromCallable {
 
@@ -130,7 +132,7 @@ class ApiService(private val applicationContext: Context) {
 
             val response = client.newCall(request).execute()
             try {
-                val content = response.body()!!.string()
+                val content = response.body!!.string()
                 return@fromCallable content
             } catch (ex: Exception) {
                 throw  ex;
@@ -140,6 +142,9 @@ class ApiService(private val applicationContext: Context) {
     }
 
     fun addHDAccount(xpub: String, bip: String): Observable<String> {
+
+        makeClient()
+
         val baseAddress = getBaseUrl()
         val baseUrl = if (SentinelxApp.accessToken.isNotEmpty()) "${baseAddress}xpub?at=${SentinelxApp.accessToken.trim()}" else "${baseAddress}xpub";
 
@@ -157,25 +162,34 @@ class ApiService(private val applicationContext: Context) {
                     .url(baseUrl)
                     .method("POST", requestBody)
                     .build()
+
+            client.connectTimeoutMillis
             val response = client.newCall(request).execute()
-            val content = response.body()!!.string()
+            val content = response.body!!.string()
             Log.i("API", "response -> $content")
             return@fromCallable content
 
         }
     }
 
-    private fun makeClient() {
+  
+    fun makeClient() {
         val builder = OkHttpClient.Builder()
         if (BuildConfig.DEBUG) {
             builder.addInterceptor(LoggingInterceptor())
         }
-        if ((TorManager.getInstance(this.applicationContext).isConnected)) {
+        if ((TorManager.getInstance(this.applicationContext)?.isConnected!!)) {
             getHostNameVerifier(builder)
-            builder.proxy(TorManager.getInstance(this.applicationContext).proxy)
+            builder.proxy(TorManager.getInstance(this.applicationContext)?.getProxy())
+        }
+        val prefs = SentinalPrefs(applicationContext)
+
+        var timeout = 90L;
+        if (prefs.timeout != null) {
+            timeout = prefs.timeout!!.toLong();
         }
-        builder.connectTimeout(60, TimeUnit.SECONDS) // connect timeout
-        builder.readTimeout(60, TimeUnit.SECONDS)
+        builder.connectTimeout(timeout, TimeUnit.SECONDS) // connect timeout
+        builder.readTimeout(timeout, TimeUnit.SECONDS)
         client = builder.build()
     }
 
@@ -202,7 +216,7 @@ class ApiService(private val applicationContext: Context) {
 
 
         clientBuilder.sslSocketFactory(sslSocketFactory, trustAllCerts[0] as X509TrustManager)
-        clientBuilder.hostnameVerifier { hostname, session -> true }
+        clientBuilder.hostnameVerifier(HostnameVerifier { _, _ -> true })
 
     }