Compare commits
No commits in common. "b2abe5ee8498648cb8061bc9477e1dc492382501" and "39b40f9b0dd0554b9705a783a979d66988021ec4" have entirely different histories.
b2abe5ee84
...
39b40f9b0d
3 changed files with 9 additions and 15 deletions
|
@ -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)
|
||||||
|
|
|
@ -24,10 +24,9 @@ class DownloadWizardDetailsFragment : DownloadWizardActivity.DownloadWizardStepF
|
||||||
|
|
||||||
override fun beforeNext() {
|
override fun beforeNext() {
|
||||||
state.smdp = smdp.editText!!.text.toString().trim()
|
state.smdp = smdp.editText!!.text.toString().trim()
|
||||||
// Treat empty inputs as null -- this is important for the download step
|
state.matchingId = matchingId.editText!!.text.toString().trim()
|
||||||
state.matchingId = matchingId.editText!!.text.toString().trim().ifBlank { null }
|
state.confirmationCode = confirmationCode.editText!!.text.toString().trim()
|
||||||
state.confirmationCode = confirmationCode.editText!!.text.toString().trim().ifBlank { null }
|
state.imei = imei.editText!!.text.toString()
|
||||||
state.imei = imei.editText!!.text.toString().ifBlank { null }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun createNextFragment(): DownloadWizardActivity.DownloadWizardStepFragment =
|
override fun createNextFragment(): DownloadWizardActivity.DownloadWizardStepFragment =
|
||||||
|
|
|
@ -32,8 +32,6 @@
|
||||||
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" />
|
||||||
|
|
||||||
|
@ -46,7 +44,6 @@
|
||||||
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" />
|
||||||
|
@ -60,7 +57,6 @@
|
||||||
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" />
|
||||||
|
@ -77,7 +73,6 @@
|
||||||
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" />
|
||||||
|
|
Loading…
Add table
Reference in a new issue