Compare commits
2 commits
84dd16c169
...
16b6aceedf
Author | SHA1 | Date | |
---|---|---|---|
16b6aceedf | |||
eab96dde05 |
2 changed files with 24 additions and 12 deletions
|
@ -50,21 +50,20 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onInit() {
|
override fun onInit() {
|
||||||
euiccChannel = euiccChannelManager
|
|
||||||
.findEuiccChannelBySlotBlocking(intent.getIntExtra("logicalSlotId", 0))!!
|
|
||||||
|
|
||||||
notificationList.layoutManager =
|
notificationList.layoutManager =
|
||||||
LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
|
LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
|
||||||
notificationList.addItemDecoration(DividerItemDecoration(this, LinearLayoutManager.VERTICAL))
|
notificationList.addItemDecoration(DividerItemDecoration(this, LinearLayoutManager.VERTICAL))
|
||||||
notificationList.adapter = notificationAdapter
|
notificationList.adapter = notificationAdapter
|
||||||
registerForContextMenu(notificationList)
|
registerForContextMenu(notificationList)
|
||||||
|
|
||||||
|
val logicalSlotId = intent.getIntExtra("logicalSlotId", 0)
|
||||||
|
|
||||||
// This is slightly different from the MainActivity logic
|
// This is slightly different from the MainActivity logic
|
||||||
// due to the length (we don't want to display the full USB product name)
|
// due to the length (we don't want to display the full USB product name)
|
||||||
val channelTitle = if (euiccChannel.logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
|
val channelTitle = if (logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
|
||||||
getString(R.string.usb)
|
getString(R.string.usb)
|
||||||
} else {
|
} else {
|
||||||
getString(R.string.channel_name_format, euiccChannel.logicalSlotId)
|
getString(R.string.channel_name_format, logicalSlotId)
|
||||||
}
|
}
|
||||||
|
|
||||||
title = getString(R.string.profile_notifications_detailed_format, channelTitle)
|
title = getString(R.string.profile_notifications_detailed_format, channelTitle)
|
||||||
|
@ -105,6 +104,18 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
|
||||||
swipeRefresh.isRefreshing = true
|
swipeRefresh.isRefreshing = true
|
||||||
|
|
||||||
lifecycleScope.launch {
|
lifecycleScope.launch {
|
||||||
|
if (!this@NotificationsActivity::euiccChannel.isInitialized) {
|
||||||
|
withContext(Dispatchers.IO) {
|
||||||
|
euiccChannelManagerLoaded.await()
|
||||||
|
euiccChannel = euiccChannelManager.findEuiccChannelBySlotBlocking(
|
||||||
|
intent.getIntExtra(
|
||||||
|
"logicalSlotId",
|
||||||
|
0
|
||||||
|
)
|
||||||
|
)!!
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
task()
|
task()
|
||||||
|
|
||||||
swipeRefresh.isRefreshing = false
|
swipeRefresh.isRefreshing = false
|
||||||
|
|
|
@ -149,13 +149,6 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
|
||||||
@SuppressLint("MissingPermission")
|
@SuppressLint("MissingPermission")
|
||||||
override fun onStart() {
|
override fun onStart() {
|
||||||
super.onStart()
|
super.onStart()
|
||||||
profileDownloadIMEI.editText!!.text = Editable.Factory.getInstance().newEditable(
|
|
||||||
try {
|
|
||||||
telephonyManager.getImei(channel.logicalSlotId) ?: ""
|
|
||||||
} catch (e: Exception) {
|
|
||||||
""
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
lifecycleScope.launch(Dispatchers.IO) {
|
lifecycleScope.launch(Dispatchers.IO) {
|
||||||
ensureEuiccChannelManager()
|
ensureEuiccChannelManager()
|
||||||
|
@ -166,6 +159,12 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
|
||||||
return@launch
|
return@launch
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val imei = try {
|
||||||
|
telephonyManager.getImei(channel.logicalSlotId) ?: ""
|
||||||
|
} catch (e: Exception) {
|
||||||
|
""
|
||||||
|
}
|
||||||
|
|
||||||
// Fetch remaining NVRAM
|
// Fetch remaining NVRAM
|
||||||
val str = channel.lpa.euiccInfo2?.freeNvram?.also {
|
val str = channel.lpa.euiccInfo2?.freeNvram?.also {
|
||||||
freeNvram = it
|
freeNvram = it
|
||||||
|
@ -174,6 +173,8 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
|
||||||
withContext(Dispatchers.Main) {
|
withContext(Dispatchers.Main) {
|
||||||
profileDownloadFreeSpace.text = getString(R.string.profile_download_free_space,
|
profileDownloadFreeSpace.text = getString(R.string.profile_download_free_space,
|
||||||
str ?: getText(R.string.unknown))
|
str ?: getText(R.string.unknown))
|
||||||
|
profileDownloadIMEI.editText!!.text =
|
||||||
|
Editable.Factory.getInstance().newEditable(imei)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue