Updated error handling

babramovitch · babramovitch · commit 7edf858af891 · 2018-05-10T18:56:55.000-07:00
-If no internet, the error will indicate no internet instead of stale data
-If no internet, you can't add new addresses or exchange apis
-fixed issue where exchange balances would stop updating once an error happened
-fixed issue where explorers weren't updating errors properly
diff --git a/app/build.gradle b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         applicationId "com.nebulights.coinstacks"
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode 11
-        versionName "2.0.1"
+        versionCode 12
+        versionName "2.0.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,12 +3,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.nebulights.coinstacks">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <application
         android:name="com.nebulights.coinstacks.MyApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         tools:replace="android:label"
-        android:label="@string/app_name"
+        android:label="coinstacks"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name="com.nebulights.coinstacks.Portfolio.Main.PortfolioActivity">
diff --git a/app/src/main/java/com/nebulights/coinstacks/Common/ConnectionChecker.kt b/app/src/main/java/com/nebulights/coinstacks/Common/ConnectionChecker.kt
@@ -0,0 +1,16 @@
+package com.nebulights.coinstacks.Common
+
+import android.content.Context
+import android.net.ConnectivityManager
+import com.nebulights.coinstacks.R
+
+class ConnectionChecker(val context: Context) {
+
+     var noInternetMessage: String = context.getString(R.string.no_internet_connection)
+
+     fun isInternetAvailable(): Boolean {
+        val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val networkInfo = connectivityManager.activeNetworkInfo
+        return networkInfo?.isConnected ?: false
+    }
+}
diff --git a/app/src/main/java/com/nebulights/coinstacks/Network/BlockExplorers/BaseExplorer.kt b/app/src/main/java/com/nebulights/coinstacks/Network/BlockExplorers/BaseExplorer.kt
@@ -7,6 +7,7 @@ import com.nebulights.coinstacks.Network.exchanges.NetworkCompletionCallback
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.addTo
 import io.reactivex.schedulers.Schedulers
 import java.math.BigDecimal
 import java.math.RoundingMode
@@ -29,7 +30,6 @@ abstract class BaseExplorer : Explorer {
     fun <T> startFeed(observable: Observable<T>, watchAddress: WatchAddress, presenterCallback: NetworkCompletionCallback, explorerNetworkDataUpdate: ExplorerNetworkDataUpdate) {
         val disposable = observable.observeOn(AndroidSchedulers.mainThread())
                 .repeatWhen { result -> result.delay(60, TimeUnit.SECONDS) }
-                .retryWhen { error -> error.delay(60, TimeUnit.SECONDS) }
                 .subscribeOn(Schedulers.io())
                 .subscribe({ result ->
 
@@ -51,6 +51,16 @@ abstract class BaseExplorer : Explorer {
                     explorerNetworkDataUpdate.updateWatchAddressData(watchAddress.address, watchAddressBalance)
                     presenterCallback.updateUi(watchAddressBalance)
                 }, { error ->
+
+                    explorerNetworkDataUpdate.staleDataFromError(watchAddress.address)
+
+                    Observable
+                            .timer(60000, TimeUnit.MILLISECONDS)
+                            .subscribeOn(Schedulers.io())
+                            .subscribe {
+                                startFeed(observable, watchAddress, presenterCallback, explorerNetworkDataUpdate)
+                            }.addTo(balanceDisposables)
+
                     error.printStackTrace()
                 })
 
diff --git a/app/src/main/java/com/nebulights/coinstacks/Network/BlockExplorers/Explorers.kt b/app/src/main/java/com/nebulights/coinstacks/Network/BlockExplorers/Explorers.kt
@@ -3,7 +3,9 @@ package com.nebulights.coinstacks.Network.BlockExplorers
 import com.nebulights.coinstacks.Network.BlockExplorers.Model.WatchAddress
 import com.nebulights.coinstacks.Network.BlockExplorers.Model.WatchAddressBalance
 import com.nebulights.coinstacks.Network.ValidationCallback
+import com.nebulights.coinstacks.Network.exchanges.Exchanges
 import com.nebulights.coinstacks.Network.exchanges.NetworkCompletionCallback
+import com.nebulights.coinstacks.Types.CryptoPairs
 
 import com.nebulights.coinstacks.Types.CryptoTypes
 
@@ -13,6 +15,8 @@ import com.nebulights.coinstacks.Types.CryptoTypes
 
 interface ExplorerNetworkDataUpdate {
     fun updateWatchAddressData(address: String, data: WatchAddressBalance)
+    fun staleDataFromError(nickname: String)
+
 }
 
 interface Explorer {
@@ -24,15 +28,18 @@ interface Explorer {
 
 object Explorers : ExplorerNetworkDataUpdate {
 
+
     private var repositories: List<Explorer> = listOf()
     private var apiData: MutableMap<String, WatchAddressBalance> = mutableMapOf()
+    private var staleApiData: MutableMap<String, Boolean> = mutableMapOf()
 
-    fun clearAll(){
+    fun clearAll() {
         apiData.clear()
+        staleApiData.clear()
     }
 
     fun loadRepositories(explorerProvider: ExplorerProvider) {
-        if(repositories.isEmpty()) {
+        if (repositories.isEmpty()) {
             repositories = explorerProvider.getAllRepositories()
         }
     }
@@ -76,8 +83,21 @@ object Explorers : ExplorerNetworkDataUpdate {
 
     override fun updateWatchAddressData(address: String, data: WatchAddressBalance) {
         apiData[address] = data
+        staleApiData.remove(address)
+    }
+
+    override fun staleDataFromError(address: String) {
+        staleApiData[address] = true
+    }
+
+    fun isAnyDataStale(): Boolean {
+        return staleApiData.isNotEmpty()
     }
 
     fun getWatchAddressData(): MutableMap<String, WatchAddressBalance> = apiData
 
+    fun isRecordStale(address: String?): Boolean{
+            return (address != null && staleApiData[address] != null)
+    }
+
 }
diff --git a/app/src/main/java/com/nebulights/coinstacks/Network/exchanges/BaseExchange.kt b/app/src/main/java/com/nebulights/coinstacks/Network/exchanges/BaseExchange.kt
@@ -11,7 +11,9 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.addTo
 import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.experimental.launch
 import retrofit2.HttpException
+import java.net.UnknownHostException
 import java.util.concurrent.TimeUnit
 
 /**
@@ -45,9 +47,8 @@ abstract class BaseExchange : Exchange {
     }
 
     fun <T> startPriceFeed(observable: Observable<T>, delay: Long, ticker: CryptoPairs, presenterCallback: NetworkCompletionCallback, exchangeNetworkDataUpdate: ExchangeNetworkDataUpdate) {
-       observable.observeOn(AndroidSchedulers.mainThread())
-                .repeatWhen { result ->result.delay((20000 + delay), TimeUnit.MILLISECONDS) }
-                .retryWhen { error -> error.delay(20000 + delay, TimeUnit.MILLISECONDS) }
+        observable.observeOn(AndroidSchedulers.mainThread())
+                .repeatWhen { result -> result.delay((20000 + delay), TimeUnit.MILLISECONDS) }
                 .subscribeOn(Schedulers.io())
                 .subscribe({ result ->
                     result as NormalizedTickerData
@@ -63,7 +64,15 @@ abstract class BaseExchange : Exchange {
                     }
                 }, { error ->
                     exchangeNetworkDataUpdate.staleDataFromError(ticker)
-                    error.printStackTrace()
+                    presenterCallback.updateUi(ticker)
+
+                    Observable
+                            .timer(20000, TimeUnit.MILLISECONDS)
+                            .subscribeOn(Schedulers.io())
+                            .subscribe {
+                                startPriceFeed(observable, delay, ticker, presenterCallback, exchangeNetworkDataUpdate)
+                            }.addTo(tickerDisposables)
+
                 }).addTo(tickerDisposables)
     }
 
@@ -93,6 +102,14 @@ abstract class BaseExchange : Exchange {
                         networkCompletionCallback.onNetworkError(exchange.exchange, error.localizedMessage)
                     }
                     exchangeNetworkDataUpdate.staleApiDataFromError(exchange.exchange)
+
+                    Observable
+                            .timer(60000, TimeUnit.MILLISECONDS)
+                            .subscribeOn(Schedulers.io())
+                            .subscribe {
+                                startAccountBalanceFeed(observable, exchange, networkCompletionCallback, exchangeNetworkDataUpdate)
+                            }.addTo(tickerDisposables)
+
                     error.printStackTrace()
                 }).addTo(balanceDisposables)
     }
diff --git a/app/src/main/java/com/nebulights/coinstacks/Network/exchanges/ExchangeProvider.kt b/app/src/main/java/com/nebulights/coinstacks/Network/exchanges/ExchangeProvider.kt
@@ -42,7 +42,7 @@ object ExchangeProvider {
 
     private fun setupOkHttpClient(): OkHttpClient {
         val interceptor = HttpLoggingInterceptor()
-        interceptor.level = HttpLoggingInterceptor.Level.BODY // .BODY for full log output
+        interceptor.level = HttpLoggingInterceptor.Level.NONE // .BODY for full log output
         return OkHttpClient.Builder().addInterceptor(interceptor).build()
     }
 
diff --git a/app/src/main/java/com/nebulights/coinstacks/Network/exchanges/Exchanges.kt b/app/src/main/java/com/nebulights/coinstacks/Network/exchanges/Exchanges.kt
@@ -26,7 +26,7 @@ interface NetworkCompletionCallback {
     fun updateUi(ticker: CryptoPairs)
     fun updateUi(apiBalances: ApiBalances)
     fun updateUi(watchAddress: WatchAddressBalance)
-    fun onNetworkError(exchange: String)
+    fun onNetworkError(exchange: String?)
     fun onNetworkError(exchange: String, error: NetworkErrors)
     fun onNetworkError(exchange: String, message: String?)
 }
@@ -184,7 +184,6 @@ object Exchanges : ExchangeNetworkDataUpdate {
 
     fun isAnyDataStale(): Boolean {
         return staleTickerData.isNotEmpty() || this.staleApiData.isNotEmpty()
-
     }
 
 }
diff --git a/app/src/main/java/com/nebulights/coinstacks/Portfolio/Additions/AdditionsActivity.kt b/app/src/main/java/com/nebulights/coinstacks/Portfolio/Additions/AdditionsActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.preference.PreferenceManager
 import android.support.v7.app.AppCompatActivity
 import android.view.MenuItem
+import com.nebulights.coinstacks.Common.ConnectionChecker
 import com.nebulights.coinstacks.Extensions.addFragment
 import com.nebulights.coinstacks.Network.BlockExplorers.ExplorerProvider
 import com.nebulights.coinstacks.Network.BlockExplorers.Explorers
@@ -68,7 +69,7 @@ class AdditionsActivity : AppCompatActivity(), AdditionsContract.Navigator {
         val explorers = Explorers
         explorers.loadRepositories(ExplorerProvider)
 
-        presenter = AdditionsPresenter(additionsFragment, exchanges, explorers, cryptoAssetRepository, this)
+        presenter = AdditionsPresenter(additionsFragment, exchanges, explorers, cryptoAssetRepository, this, ConnectionChecker(this))
 
 
 //        window.setFlags(WindowManager.LayoutParams.FLAG_SECURE,
diff --git a/app/src/main/java/com/nebulights/coinstacks/Portfolio/Additions/AdditionsPresenter.kt b/app/src/main/java/com/nebulights/coinstacks/Portfolio/Additions/AdditionsPresenter.kt
@@ -1,5 +1,6 @@
 package com.nebulights.coinstacks.Portfolio.Additions
 
+import com.nebulights.coinstacks.Common.ConnectionChecker
 import com.nebulights.coinstacks.Network.BlockExplorers.Explorers
 import com.nebulights.coinstacks.Network.ValidationCallback
 import com.nebulights.coinstacks.Network.exchanges.Exchanges
@@ -25,7 +26,8 @@ class AdditionsPresenter(
         private var exchanges: Exchanges,
         private var explorers: Explorers,
         private val cryptoAssetRepository: CryptoAssetContract,
-        private var navigator: AdditionsContract.Navigator) : AdditionsContract.Presenter {
+        private var navigator: AdditionsContract.Navigator,
+        private var connectionChecker: ConnectionChecker) : AdditionsContract.Presenter {
 
 
     private val TAG = "AdditionsPresenter"
@@ -189,6 +191,12 @@ class AdditionsPresenter(
 
 
     override fun createWatchAddress(exchange: String, selectedPosition: Int, address: String, nickName: String) {
+
+        if(!connectionChecker.isInternetAvailable()){
+            view.showValidationErrorDialog(connectionChecker.noInternetMessage)
+            return
+        }
+
         val userTicker = getTickersForExchange(exchange)[selectedPosition]
         val cryptoPair = allTickers.find { ticker -> (ticker.exchange.toLowerCase() == exchange.toLowerCase() && ticker.userTicker() == userTicker) }
 
@@ -216,6 +224,7 @@ class AdditionsPresenter(
     }
 
     override fun createAsset(exchange: String, selectedPosition: Int, quantity: String, price: String) {
+
         val userTicker = getTickersForExchange(exchange)[selectedPosition]
         val cryptoPair = allTickers.find { ticker -> (ticker.exchange.toLowerCase() == exchange.toLowerCase() && ticker.userTicker() == userTicker) }
 
@@ -225,6 +234,12 @@ class AdditionsPresenter(
     }
 
     override fun createAPIKey(exchange: String, userName: String, apiPassword: String, apiKey: String, apiSecret: String, cryptoPairs: List<CryptoPairs>) {
+
+        if(!connectionChecker.isInternetAvailable()){
+            view.showValidationErrorDialog(connectionChecker.noInternetMessage)
+            return
+        }
+
         val basicAuthentication = BasicAuthentication(exchange, apiKey, apiSecret, apiPassword, userName, listOf())
 
         val startTime = System.currentTimeMillis()
diff --git a/app/src/main/java/com/nebulights/coinstacks/Portfolio/Main/PortfolioActivity.kt b/app/src/main/java/com/nebulights/coinstacks/Portfolio/Main/PortfolioActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.preference.PreferenceManager
 import android.support.v7.app.AppCompatActivity
+import com.nebulights.coinstacks.Common.ConnectionChecker
 import com.nebulights.coinstacks.Constants
 import com.nebulights.coinstacks.Extensions.addFragment
 import com.nebulights.coinstacks.Network.BlockExplorers.ExplorerProvider
@@ -65,7 +66,7 @@ class PortfolioActivity : AppCompatActivity(), PortfolioContract.Navigator {
                 PreferenceManager.getDefaultSharedPreferences(applicationContext))
 
         presenter = PortfolioPresenter(exchanges, explorers,
-                portfolioFragment, cryptoAssetRepository, this)
+                portfolioFragment, cryptoAssetRepository, this, ConnectionChecker(this))
 
 //        if (cryptoAssetRepository.isPasswordSet()) {
 //            window.setFlags(WindowManager.LayoutParams.FLAG_SECURE,
diff --git a/app/src/main/java/com/nebulights/coinstacks/Portfolio/Main/PortfolioContract.kt b/app/src/main/java/com/nebulights/coinstacks/Portfolio/Main/PortfolioContract.kt
@@ -12,14 +12,16 @@ class PortfolioContract {
 
     interface View {
         fun updateUi()
-        fun hasStaleData(hasStaleData: Boolean)
+        fun hasStaleData(hasStaleExchangeData: Boolean, hasStaleExplorerData: Boolean)
         fun resetUi()
         fun setPresenter(presenter: Presenter)
         fun showAssetQuantites(isVisible: Boolean)
         fun showAddNewPasswordDialog()
         fun showUnlockDialog(firstAttempt: Boolean)
         fun showForgotPasswordlDialog()
         fun showWarningdialog()
+        fun showNoInternetDialog()
+        fun networkError()
     }
 
     interface ViewRow {
diff --git a/app/src/main/java/com/nebulights/coinstacks/Portfolio/Main/PortfolioFragment.kt b/app/src/main/java/com/nebulights/coinstacks/Portfolio/Main/PortfolioFragment.kt
diff --git a/app/src/main/java/com/nebulights/coinstacks/Portfolio/Main/PortfolioPresenter.kt b/app/src/main/java/com/nebulights/coinstacks/Portfolio/Main/PortfolioPresenter.kt
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ object ExchangeProvider {`
`42`	`42`
`43`	`43`	`private fun setupOkHttpClient(): OkHttpClient {`
`44`	`44`	`val interceptor = HttpLoggingInterceptor()`
`45`		`- interceptor.level = HttpLoggingInterceptor.Level.BODY // .BODY for full log output`
	`45`	`+ interceptor.level = HttpLoggingInterceptor.Level.NONE // .BODY for full log output`
`46`	`46`	`return OkHttpClient.Builder().addInterceptor(interceptor).build()`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ interface NetworkCompletionCallback {`
`26`	`26`	`fun updateUi(ticker: CryptoPairs)`
`27`	`27`	`fun updateUi(apiBalances: ApiBalances)`
`28`	`28`	`fun updateUi(watchAddress: WatchAddressBalance)`
`29`		`- fun onNetworkError(exchange: String)`
	`29`	`+ fun onNetworkError(exchange: String?)`
`30`	`30`	`fun onNetworkError(exchange: String, error: NetworkErrors)`
`31`	`31`	`fun onNetworkError(exchange: String, message: String?)`
`32`	`32`	`}`
`@@ -184,7 +184,6 @@ object Exchanges : ExchangeNetworkDataUpdate {`
`184`	`184`
`185`	`185`	`fun isAnyDataStale(): Boolean {`
`186`	`186`	`return staleTickerData.isNotEmpty() \|\| this.staleApiData.isNotEmpty()`
`187`		`-`
`188`	`187`	`}`
`189`	`188`
`190`	`189`	`}`