update account parsing, add regex lib to stax

UseHover · Dec 27, 2023 · 41cf2cf · 41cf2cf
1 parent 2419f95
commit 41cf2cf
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 8 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -247,6 +247,8 @@ dependencies {
     "stagingImplementation"(project(":hover.sdk"))
     "stagingImplementation"(libs.bundles.hover)
     "productionImplementation"(libs.hover)
+
+    implementation(files("libs/named-regexp.jar"))
 }
 
 abstract class VersionTask : DefaultTask() {

diff --git a/app/libs/named-regexp.jar b/app/libs/named-regexp.jar
diff --git a/app/src/main/java/com/hover/stax/domain/model/Account.kt b/app/src/main/java/com/hover/stax/domain/model/Account.kt
@@ -108,6 +108,11 @@ data class Account(
         }
     }
 
+    fun updateBalance(balance: String) {
+        latestBalance = balance
+        latestBalanceTimestamp = now()
+    }
+
     fun getAccountNameExtra(): String {
         return institutionAccountName ?: "1"
     }

diff --git a/app/src/main/java/com/hover/stax/hover/TransactionReceiver.kt b/app/src/main/java/com/hover/stax/hover/TransactionReceiver.kt
@@ -18,6 +18,8 @@ package com.hover.stax.hover
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.os.Build
+import androidx.annotation.RequiresApi
 import com.hover.sdk.actions.HoverAction
 import com.hover.sdk.transactions.Transaction
 import com.hover.sdk.transactions.TransactionContract
@@ -37,7 +39,7 @@ import com.hover.stax.requests.RequestRepo
 import com.hover.stax.transactions.TransactionRepo
 import com.hover.stax.utils.AnalyticsUtil
 import com.hover.stax.utils.Utils
-import java.util.regex.Pattern
+import com.google.code.regexp.Pattern;
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -190,24 +192,30 @@ class TransactionReceiver : BroadcastReceiver(), KoinComponent {
     }
 
     private suspend fun parseAccounts(ussdAccountList: String) {
-        val pattern = Pattern.compile("^([\\d]{1,2})[>):.\\s]+(.+)\$", Pattern.MULTILINE)
+        val patternRegex = action!!.account_list_regex ?: "^([\\d]{1,2})[>):.\\s]+(?<accountName>.+)\$"
+        val pattern = Pattern.compile(patternRegex, Pattern.MULTILINE)
         val matcher = pattern.matcher(ussdAccountList)
 
         while (matcher.find()) {
             try {
                 val accounts = accountRepo.getAccountsByChannel(channel!!.id)
-                if (accounts.any { it.institutionAccountName == matcher.group(2)!! }) { break }
+                val accountName = matcher.group("accountName")!!
 
                 val a = if (account != null && account!!.institutionAccountName == null) {
                     account!!
                 } else if (accounts.any { it.institutionAccountName == null }) {
                     accounts.first { it.institutionAccountName == null }
                 } else {
-                    Account(matcher.group(2)!!, channel!!, false, account?.simSubscriptionId ?: -1)
+                    Account(accountName, channel!!, false, account?.simSubscriptionId ?: -1)
                 }
 
-                a.institutionAccountName = matcher.group(2)!!
-                if (a.institutionName == a.userAlias) a.userAlias = matcher.group(2)!!
+                a.institutionAccountName = accountName
+                if (a.institutionName == a.userAlias) a.userAlias = accountName
+
+                val balance = matcher.group("balance")
+                if (!balance.isNullOrEmpty()) {
+                    a.updateBalance(balance)
+                }
 
                 accountRepo.saveAccount(a)
             } catch (e: Exception) { AnalyticsUtil.logErrorAndReportToFirebase(TransactionReceiver::class.java.simpleName, "Failed to parse account list from USSD", e) }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -82,7 +82,7 @@ glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
 glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "glide" }
 coil = "io.coil-kt:coil-compose:2.1.0"
 
-hover = "com.hover:android-sdk:2.0.0-research"
+hover = "com.hover:android-sdk:2.0.0-research2"
 volley = "com.android.volley:volley:1.2.1"
 play-services = "com.google.android.gms:play-services-analytics:18.0.1"
 picasso = "com.squareup.picasso:picasso:2.71828"