PeterCxy/OpenEUICC
16
25
Fork 20
Code Issues 7 Pull requests Projects Releases 8 Wiki Activity Actions

Compare commits

base: PeterCxy:39b40f9b0dd0554b9705a783a979d66988021ec4
Branches Tags
PeterCxy:master
PeterCxy:multi-se
PeterCxy:mep
PeterCxy:unpriv-decouple
PeterCxy:lpac
PeterCxy:unpriv-v1.3.0
PeterCxy:unpriv-v1.2.0
PeterCxy:unpriv-v1.0.0
PeterCxy:unpriv-beta02
PeterCxy:unpriv-beta01
PeterCxy:unpriv-alpha03
PeterCxy:unpriv-alpha02
PeterCxy:unpriv-alpha01
..
compare: PeterCxy:b2abe5ee8498648cb8061bc9477e1dc492382501
Branches Tags
PeterCxy:multi-se
PeterCxy:master
PeterCxy:mep
PeterCxy:unpriv-decouple
PeterCxy:lpac
PeterCxy:unpriv-v1.3.0
PeterCxy:unpriv-v1.2.0
PeterCxy:unpriv-v1.0.0
PeterCxy:unpriv-beta02
PeterCxy:unpriv-beta01
PeterCxy:unpriv-alpha03
PeterCxy:unpriv-alpha02
PeterCxy:unpriv-alpha01

2 commits
39b40f9b0d ... b2abe5ee84

Author SHA1 Message Date
Peter Cai
b2abe5ee84 ui: wizard: Make download details nullable
All checks were successful
/ build-debug (push) Successful in 5m11s
Details
2024-11-20 21:03:42 -05:00
Peter Cai
67c9612627 ui: wizard: Restrict inputs to single lines 2024-11-20 21:00:50 -05:00
3 changed files with 15 additions and 9 deletions
Show stats Expand all files Collapse all files

12
app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardActivity.kt
View file

@ -19,9 +19,9 @@ class DownloadWizardActivity: BaseEuiccAccessActivity() {
var currentStepFragmentClassName: String?, var currentStepFragmentClassName: String?,
var selectedLogicalSlot: Int, var selectedLogicalSlot: Int,
var smdp: String, var smdp: String,
var matchingId: String, var matchingId: String?,
var confirmationCode: String, var confirmationCode: String?,
var imei: String, var imei: String?,
) )
private lateinit var state: DownloadWizardState private lateinit var state: DownloadWizardState
@ -53,9 +53,9 @@ class DownloadWizardActivity: BaseEuiccAccessActivity() {
null, null,
intent.getIntExtra("selectedLogicalSlot", 0), intent.getIntExtra("selectedLogicalSlot", 0),
"", "",
"", null,
"", null,
"" null
) )
progressBar = requireViewById(R.id.progress) progressBar = requireViewById(R.id.progress)

7
app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardDetailsFragment.kt
View file

@ -24,9 +24,10 @@ class DownloadWizardDetailsFragment : DownloadWizardActivity.DownloadWizardStepF
override fun beforeNext() { override fun beforeNext() {
state.smdp = smdp.editText!!.text.toString().trim() state.smdp = smdp.editText!!.text.toString().trim()
state.matchingId = matchingId.editText!!.text.toString().trim() // Treat empty inputs as null -- this is important for the download step
state.confirmationCode = confirmationCode.editText!!.text.toString().trim() state.matchingId = matchingId.editText!!.text.toString().trim().ifBlank { null }
state.imei = imei.editText!!.text.toString() state.confirmationCode = confirmationCode.editText!!.text.toString().trim().ifBlank { null }
state.imei = imei.editText!!.text.toString().ifBlank { null }
} }
override fun createNextFragment(): DownloadWizardActivity.DownloadWizardStepFragment = override fun createNextFragment(): DownloadWizardActivity.DownloadWizardStepFragment =

5
app-common/src/main/res/layout/fragment_download_details.xml
View file

@ -32,6 +32,8 @@
android:hint="@string/profile_download_server"> android:hint="@string/profile_download_server">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:maxLines="1"
android:inputType="text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
@ -44,6 +46,7 @@
android:hint="@string/profile_download_code"> android:hint="@string/profile_download_code">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:maxLines="1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:inputType="textPassword" /> android:inputType="textPassword" />
@ -57,6 +60,7 @@
android:hint="@string/profile_download_confirmation_code"> android:hint="@string/profile_download_confirmation_code">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:maxLines="1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:inputType="textPassword" /> android:inputType="textPassword" />
@ -73,6 +77,7 @@
app:passwordToggleEnabled="true"> app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:maxLines="1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:inputType="textPassword" /> android:inputType="textPassword" />