add support to detect dhiraagu and ooredoo packages
Auto Tag on Version Change / check-version (push) Successful in 2s

This commit is contained in:
2026-05-17 00:25:48 +05:00
parent 93405aade2
commit ccc9e11d55
9 changed files with 781 additions and 3 deletions
@@ -32,6 +32,8 @@ import kotlinx.coroutines.withContext
import sh.sar.basedbank.BasedBankApp
import sh.sar.basedbank.R
import sh.sar.basedbank.api.bml.BmlLoginFlow
import sh.sar.basedbank.api.dhiraagu.DhiraaguClient
import sh.sar.basedbank.api.fahipay.OoredooClient
import sh.sar.basedbank.api.bml.BmlTransferResult
import sh.sar.basedbank.api.mib.MibAccount
import sh.sar.basedbank.api.mib.MibBeneficiary
@@ -65,6 +67,10 @@ class TransferFragment : Fragment() {
private var resolvedRecipientName = ""
private var resolvedBankName = ""
// Selected Fahipay service when source is Fahipay and destination is a phone number
// Values: "FAHIPAY_TRANSFER", "RAASTAS", "OOREDOO_BILL"
private var selectedFahipayService: String? = null
private val qrLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
if (result.resultCode != Activity.RESULT_OK) return@registerForActivityResult
val raw = result.data?.getStringExtra(QrScannerActivity.EXTRA_QR_CONTENT) ?: return@registerForActivityResult
@@ -220,7 +226,9 @@ class TransferFragment : Fragment() {
binding.btnClearToInfo.setOnClickListener {
resolvedAccountNumber = ""
resolvedRecipientName = ""
selectedFahipayService = null
binding.cardToInfo.visibility = View.GONE
binding.layoutServiceSelector.visibility = View.INVISIBLE
binding.tilTo.visibility = View.VISIBLE
binding.btnPickContact.visibility = View.VISIBLE
binding.btnScanQr.visibility = View.VISIBLE
@@ -265,6 +273,16 @@ class TransferFragment : Fragment() {
return
}
// Fahipay source: only phone numbers are supported
if (selectedAccount?.profileType == "FAHIPAY") {
if (AccountInputParser.detect(accountNumber) == AccountInputParser.InputType.PHONE) {
lookupFahipayTarget(accountNumber)
} else {
binding.tilTo.error = getString(R.string.transfer_fahipay_phone_only)
}
return
}
val mibSess = session
val bmlSess = bmlSession
if (mibSess == null && bmlSess == null) {
@@ -352,6 +370,99 @@ class TransferFragment : Fragment() {
}
}
private fun lookupFahipayTarget(number: String) {
binding.tilTo.isEnabled = false
viewLifecycleOwner.lifecycleScope.launch {
data class LookupResult(
val dhiraagu: DhiraaguClient.Result,
val ooredoo: OoredooClient.CustType
)
val result = withContext(Dispatchers.IO) {
if (number.startsWith("7")) {
// Dhiraagu first, fall back to Ooredoo
val d = try { DhiraaguClient().validateNumber(number) }
catch (_: Exception) { DhiraaguClient.Result(DhiraaguClient.CustType.UNSUPPORTED) }
val o = if (d.type == DhiraaguClient.CustType.UNSUPPORTED)
try { OoredooClient().validateNumber(number) }
catch (_: Exception) { OoredooClient.CustType.UNSUPPORTED }
else OoredooClient.CustType.UNSUPPORTED
LookupResult(d, o)
} else {
// Ooredoo first, fall back to Dhiraagu
val o = try { OoredooClient().validateNumber(number) }
catch (_: Exception) { OoredooClient.CustType.UNSUPPORTED }
val d = if (o == OoredooClient.CustType.UNSUPPORTED)
try { DhiraaguClient().validateNumber(number) }
catch (_: Exception) { DhiraaguClient.Result(DhiraaguClient.CustType.UNSUPPORTED) }
else DhiraaguClient.Result(DhiraaguClient.CustType.UNSUPPORTED)
LookupResult(d, o)
}
}
binding.tilTo.isEnabled = true
val dhiraaguName = result.dhiraagu.ownerName.takeIf { it.isNotBlank() }
// Collect all applicable services
val services = buildList {
if (result.dhiraagu.type == DhiraaguClient.CustType.RELOAD) add("DHIRAAGU_RELOAD")
if (result.dhiraagu.type == DhiraaguClient.CustType.BILL_PAY) add("DHIRAAGU_BILL")
if (result.ooredoo == OoredooClient.CustType.PRE || result.ooredoo == OoredooClient.CustType.HYBRID) add("RAASTAS")
if (result.ooredoo == OoredooClient.CustType.POST || result.ooredoo == OoredooClient.CustType.HYBRID) add("OOREDOO_BILL")
}
if (services.isEmpty()) return@launch
// Only one option — auto-select, no chip UI needed
if (services.size == 1) {
selectFahipayService(services[0], number, dhiraaguName)
return@launch
}
// Multiple options (Ooredoo HYBRID) — show chips
binding.chipDhiraaguReload.visibility = if ("DHIRAAGU_RELOAD" in services) View.VISIBLE else View.GONE
binding.chipDhiraaguBill.visibility = if ("DHIRAAGU_BILL" in services) View.VISIBLE else View.GONE
binding.chipRaastas.visibility = if ("RAASTAS" in services) View.VISIBLE else View.GONE
binding.chipOoredooBill.visibility = if ("OOREDOO_BILL" in services) View.VISIBLE else View.GONE
binding.layoutServiceSelector.visibility = View.VISIBLE
binding.chipGroupService.clearCheck()
binding.chipDhiraaguReload.setOnCheckedChangeListener { _, checked ->
if (checked) { selectFahipayService("DHIRAAGU_RELOAD", number, dhiraaguName); binding.layoutServiceSelector.visibility = View.INVISIBLE }
}
binding.chipDhiraaguBill.setOnCheckedChangeListener { _, checked ->
if (checked) { selectFahipayService("DHIRAAGU_BILL", number, dhiraaguName); binding.layoutServiceSelector.visibility = View.INVISIBLE }
}
binding.chipRaastas.setOnCheckedChangeListener { _, checked ->
if (checked) { selectFahipayService("RAASTAS", number); binding.layoutServiceSelector.visibility = View.INVISIBLE }
}
binding.chipOoredooBill.setOnCheckedChangeListener { _, checked ->
if (checked) { selectFahipayService("OOREDOO_BILL", number); binding.layoutServiceSelector.visibility = View.INVISIBLE }
}
}
}
private fun selectFahipayService(service: String, number: String, ownerName: String? = null) {
selectedFahipayService = service
val contacts = viewModel.contacts.value ?: emptyList()
val displayName = ownerName
?: contacts.firstOrNull { it.benefAccount == number }?.benefNickName
?: number
val serviceLabel = when (service) {
"RAASTAS" -> "Raastas"
"OOREDOO_BILL" -> "Ooredoo Bill Pay"
"DHIRAAGU_RELOAD" -> "Dhiraagu Reload"
"DHIRAAGU_BILL" -> "Dhiraagu Bill Pay"
else -> service
}
prefillToDirectly(
accountNumber = number,
displayName = displayName,
subtitle = "$serviceLabel · $number",
colorHex = "#FF6B00",
imageHash = null
)
}
private fun prefillToDirectly(
accountNumber: String,
displayName: String,
@@ -661,7 +772,9 @@ class TransferFragment : Fragment() {
resolvedAccountNumber = ""
resolvedRecipientName = ""
resolvedBankName = ""
selectedFahipayService = null
binding.cardToInfo.visibility = View.GONE
binding.chipGroupService.visibility = View.GONE
binding.tilTo.visibility = View.VISIBLE
binding.btnPickContact.visibility = View.VISIBLE
binding.btnScanQr.visibility = View.VISIBLE