forked from PeterCxy/OpenEUICC
Compare commits
No commits in common. "6d962a12b5de1794e9f65e4dbddc40713c65ba39" and "125f1da6af52bed8d71b3a369a89a341c52434dd" have entirely different histories.
6d962a12b5
...
125f1da6af
3 changed files with 4 additions and 20 deletions
|
@ -16,7 +16,6 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder
|
||||||
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
|
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
|
||||||
import im.angry.openeuicc.common.R
|
import im.angry.openeuicc.common.R
|
||||||
import im.angry.openeuicc.core.EuiccChannel
|
import im.angry.openeuicc.core.EuiccChannel
|
||||||
import im.angry.openeuicc.core.EuiccChannelManager
|
|
||||||
import im.angry.openeuicc.util.*
|
import im.angry.openeuicc.util.*
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import net.typeblog.lpac_jni.impl.DEFAULT_PKID_GSMA_RSP2_ROOT_CI1
|
import net.typeblog.lpac_jni.impl.DEFAULT_PKID_GSMA_RSP2_ROOT_CI1
|
||||||
|
@ -51,13 +50,10 @@ class EuiccInfoActivity : BaseEuiccAccessActivity() {
|
||||||
|
|
||||||
logicalSlotId = intent.getIntExtra("logicalSlotId", 0)
|
logicalSlotId = intent.getIntExtra("logicalSlotId", 0)
|
||||||
|
|
||||||
val channelTitle = if (logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
|
title = getString(
|
||||||
getString(R.string.usb)
|
R.string.euicc_info_activity_title,
|
||||||
} else {
|
|
||||||
getString(R.string.channel_name_format, logicalSlotId)
|
getString(R.string.channel_name_format, logicalSlotId)
|
||||||
}
|
)
|
||||||
|
|
||||||
title = getString(R.string.euicc_info_activity_title, channelTitle)
|
|
||||||
|
|
||||||
swipeRefresh.setOnRefreshListener { refresh() }
|
swipeRefresh.setOnRefreshListener { refresh() }
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package im.angry.openeuicc.ui.wizard
|
package im.angry.openeuicc.ui.wizard
|
||||||
|
|
||||||
import android.app.AlertDialog
|
|
||||||
import android.graphics.BitmapFactory
|
import android.graphics.BitmapFactory
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
|
@ -105,16 +104,7 @@ class DownloadWizardMethodSelectFragment : DownloadWizardActivity.DownloadWizard
|
||||||
|
|
||||||
private fun processLpaString(s: String) {
|
private fun processLpaString(s: String) {
|
||||||
val components = s.split("$")
|
val components = s.split("$")
|
||||||
if (components.size < 3 || components[0] != "LPA:1") {
|
if (components.size < 3 || components[0] != "LPA:1") return
|
||||||
AlertDialog.Builder(requireContext()).apply {
|
|
||||||
setTitle(R.string.profile_download_incorrect_lpa_string)
|
|
||||||
setMessage(R.string.profile_download_incorrect_lpa_string_message)
|
|
||||||
setCancelable(true)
|
|
||||||
setNegativeButton(android.R.string.cancel, null)
|
|
||||||
show()
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
state.smdp = components[1]
|
state.smdp = components[1]
|
||||||
state.matchingId = components[2]
|
state.matchingId = components[2]
|
||||||
gotoNextFragment(DownloadWizardDetailsFragment())
|
gotoNextFragment(DownloadWizardDetailsFragment())
|
||||||
|
|
|
@ -56,8 +56,6 @@
|
||||||
|
|
||||||
<string name="profile_download_low_nvram_title">This download may fail</string>
|
<string name="profile_download_low_nvram_title">This download may fail</string>
|
||||||
<string name="profile_download_low_nvram_message">This download may fail due to low remaining capacity.</string>
|
<string name="profile_download_low_nvram_message">This download may fail due to low remaining capacity.</string>
|
||||||
<string name="profile_download_incorrect_lpa_string">Incorrect LPA String</string>
|
|
||||||
<string name="profile_download_incorrect_lpa_string_message">The LPA string could not be parsed</string>
|
|
||||||
|
|
||||||
<string name="download_wizard">Download Wizard</string>
|
<string name="download_wizard">Download Wizard</string>
|
||||||
<string name="download_wizard_back">Back</string>
|
<string name="download_wizard_back">Back</string>
|
||||||
|
|
Loading…
Add table
Reference in a new issue