Update minSDK to 26 (android 8) and tweaks to fetching

premnirmal · Jul 21, 2023 · 7358e9c · 7358e9c
1 parent 25ea965
commit 7358e9c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 65 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -69,7 +69,7 @@ android {
 
   defaultConfig {
     applicationId appIdBase
-    minSdkVersion 28
+    minSdkVersion 26
     targetSdkVersion 33
 
     versionCode = code

diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/model/ExponentialBackoff.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/model/ExponentialBackoff.kt
diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/model/StocksProvider.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/model/StocksProvider.kt
@@ -194,6 +194,7 @@ class StocksProvider @Inject constructor(
           FetchResult.success(quoteMap.values.filter { tickerSet.contains(it.symbol) }.toList())
         }
       } catch(ex: CancellationException) {
+        _fetchState.emit(FetchState.Failure(ex))
         FetchResult.failure<List<Quote>>(FetchException("Failed to fetch", ex))
       } catch (ex: Throwable) {
         Timber.w(ex)

diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/network/StocksApi.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/network/StocksApi.kt
@@ -89,6 +89,7 @@ class StocksApi @Inject constructor(
     withContext(Dispatchers.IO) {
       try {
         val quoteNets = getStocksYahoo(tickerList)
+            ?: return@withContext FetchResult.failure(FetchException("Failed to fetch"))
         return@withContext FetchResult.success(quoteNets.toQuoteMap().toOrderedList(tickerList))
       } catch (ex: Exception) {
         Timber.e(ex)
@@ -100,6 +101,7 @@ class StocksApi @Inject constructor(
     withContext(Dispatchers.IO) {
       try {
         val quoteNets = getStocksYahoo(listOf(ticker))
+            ?: return@withContext FetchResult.failure(FetchException("Failed to fetch $ticker"))
         return@withContext FetchResult.success(quoteNets.first().toQuote())
       } catch (ex: Exception) {
         Timber.e(ex)
@@ -130,12 +132,15 @@ class StocksApi @Inject constructor(
   private suspend fun getStocksYahoo(
     tickerList: List<String>,
     invocationCount: Int = 1
-  ): List<YahooQuoteNet> =
+  ): List<YahooQuoteNet>? =
     withContext(Dispatchers.IO) {
     val query = tickerList.joinToString(",")
     var quotesResponse: retrofit2.Response<YahooResponse>? = null
     try {
       quotesResponse = yahooFinance.getStocks(query)
+      if (!quotesResponse.isSuccessful) {
+        Timber.e("Yahoo quote fetch failed with code ${quotesResponse.code()}")
+      }
       if (quotesResponse.code() == 401) {
         appPreferences.setCrumb(null)
         loadCrumb()
@@ -147,7 +152,7 @@ class StocksApi @Inject constructor(
       Timber.e(ex)
       throw ex
     }
-    val quoteNets = quotesResponse.body()?.quoteResponse?.result ?: emptyList()
+    val quoteNets = quotesResponse.body()?.quoteResponse?.result
     quoteNets
   }
 

diff --git a/app/src/test/kotlin/com/github/premnirmal/ticker/model/ExponentialBackoffTest.kt b/app/src/test/kotlin/com/github/premnirmal/ticker/model/ExponentialBackoffTest.kt
diff --git a/app/version.properties b/app/version.properties
@@ -1,3 +1,3 @@
 # this file is purely for f-droid because it cannot infer the version name/code from the git tag
-versionName=3.9.827
-versionCode=300900827
+versionName=3.9.828
+versionCode=300900828