Compare commits

..

No commits in common. "e9f4d3d1f9d4557628bd9946ffb7f72101dca6bd" and "071304349a1f8a74ec30901e3751409a95b98f9d" have entirely different histories.

3 changed files with 16 additions and 27 deletions

View file

@ -12,7 +12,6 @@ import android.widget.ProgressBar
import android.widget.TextView import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.Toolbar import androidx.appcompat.widget.Toolbar
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.google.android.material.textfield.TextInputLayout import com.google.android.material.textfield.TextInputLayout
@ -26,14 +25,13 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import kotlin.Exception
class ProfileDownloadFragment : BaseMaterialDialogFragment(), class ProfileDownloadFragment : BaseMaterialDialogFragment(),
Toolbar.OnMenuItemClickListener, EuiccChannelFragmentMarker { Toolbar.OnMenuItemClickListener, EuiccChannelFragmentMarker {
companion object { companion object {
const val TAG = "ProfileDownloadFragment" const val TAG = "ProfileDownloadFragment"
const val LOW_NVRAM_THRESHOLD = 30 * 1024 // < 30 KiB, the alert may fail
fun newInstance(slotId: Int, portId: Int, finishWhenDone: Boolean = false): ProfileDownloadFragment = fun newInstance(slotId: Int, portId: Int, finishWhenDone: Boolean = false): ProfileDownloadFragment =
newInstanceEuicc(ProfileDownloadFragment::class.java, slotId, portId) { newInstanceEuicc(ProfileDownloadFragment::class.java, slotId, portId) {
putBoolean("finishWhenDone", finishWhenDone) putBoolean("finishWhenDone", finishWhenDone)
@ -137,21 +135,7 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
true true
} }
R.id.ok -> { R.id.ok -> {
if (freeNvram > LOW_NVRAM_THRESHOLD) { startDownloadProfile()
startDownloadProfile()
} else {
AlertDialog.Builder(requireContext()).apply {
setTitle(R.string.profile_download_low_nvram_title)
setMessage(R.string.profile_download_low_nvram_message)
setIcon(android.R.drawable.ic_dialog_alert)
setCancelable(true)
setPositiveButton(android.R.string.ok) { _, _ ->
startDownloadProfile()
}
setNegativeButton(android.R.string.cancel, null)
show()
}
}
true true
} }
else -> false else -> false

View file

@ -55,9 +55,6 @@
<string name="profile_download_ok">Download</string> <string name="profile_download_ok">Download</string>
<string name="profile_download_failed">Failed to download eSIM. Check your activation / QR code.</string> <string name="profile_download_failed">Failed to download eSIM. Check your activation / QR code.</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_rename_new_name">New nickname</string> <string name="profile_rename_new_name">New nickname</string>
<string name="profile_delete_confirm">Are you sure you want to delete the profile %s? This operation is irreversible.</string> <string name="profile_delete_confirm">Are you sure you want to delete the profile %s? This operation is irreversible.</string>

View file

@ -1,6 +1,7 @@
package im.angry.openeuicc.ui package im.angry.openeuicc.ui
import android.os.Bundle import android.os.Bundle
import android.util.Log
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -67,13 +68,20 @@ class CompatibilityCheckActivity: AppCompatActivity() {
it.visibility = View.GONE it.visibility = View.GONE
} }
val viewId = when (item.state) { when (item.state) {
CompatibilityCheck.State.SUCCESS -> R.id.compatibility_check_checkmark CompatibilityCheck.State.SUCCESS -> {
CompatibilityCheck.State.FAILURE -> R.id.compatibility_check_error root.requireViewById<View>(R.id.compatibility_check_checkmark).visibility = View.VISIBLE
CompatibilityCheck.State.FAILURE_UNKNOWN -> R.id.compatibility_check_unknown }
else -> R.id.compatibility_check_progress_bar CompatibilityCheck.State.FAILURE -> {
root.requireViewById<View>(R.id.compatibility_check_error).visibility = View.VISIBLE
}
CompatibilityCheck.State.FAILURE_UNKNOWN -> {
root.requireViewById<View>(R.id.compatibility_check_unknown).visibility = View.VISIBLE
}
else -> {
root.requireViewById<View>(R.id.compatibility_check_progress_bar).visibility = View.VISIBLE
}
} }
root.requireViewById<View>(viewId).visibility = View.VISIBLE
} }
} }