Browse Source

Use quick compatibility check as the main method of compatibility checks

The old one doesn't really add much for the purpose, fwiw
Peter Cai 11 months ago
parent
commit
cbe3d1fd50

+ 1 - 6
app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt

@@ -8,7 +8,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.Button
-import android.widget.CheckBox
 import android.widget.TextView
 import android.widget.TextView
 import androidx.core.view.isVisible
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.Fragment
@@ -48,10 +47,6 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
         requireView().requireViewById(R.id.quick_availability_result_notes)
         requireView().requireViewById(R.id.quick_availability_result_notes)
     }
     }
 
 
-    private val hidden: CheckBox by lazy {
-        requireView().requireViewById(R.id.quick_availability_hidden)
-    }
-
     override fun onCreateView(
     override fun onCreateView(
         inflater: LayoutInflater,
         inflater: LayoutInflater,
         container: ViewGroup?,
         container: ViewGroup?,
@@ -73,7 +68,7 @@ open class QuickCompatibilityFragment : Fragment(), UnprivilegedEuiccContextMark
     private fun onContinueToApp() {
     private fun onContinueToApp() {
         runBlocking {
         runBlocking {
             preferenceRepository.skipQuickAvailabilityFlow
             preferenceRepository.skipQuickAvailabilityFlow
-                .updatePreference(hidden.isChecked)
+                .updatePreference(true)
         }
         }
         requireActivity().finish()
         requireActivity().finish()
     }
     }

+ 1 - 1
app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt

@@ -26,7 +26,7 @@ class UnprivilegedMainActivity : MainActivity(), UnprivilegedEuiccContextMarker
     override fun onOptionsItemSelected(item: MenuItem): Boolean =
     override fun onOptionsItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
         when (item.itemId) {
             R.id.compatibility_check -> {
             R.id.compatibility_check -> {
-                startActivity(Intent(this, CompatibilityCheckActivity::class.java))
+                startActivity(Intent(this, QuickCompatibilityActivity::class.java))
                 true
                 true
             }
             }
             else -> super.onOptionsItemSelected(item)
             else -> super.onOptionsItemSelected(item)

+ 0 - 6
app-unpriv/src/main/res/layout/fragment_quick_compatibility.xml

@@ -38,12 +38,6 @@
         android:text="@string/quick_compatibility_result_notes"
         android:text="@string/quick_compatibility_result_notes"
         android:visibility="gone" />
         android:visibility="gone" />
 
 
-    <CheckBox
-        android:id="@+id/quick_availability_hidden"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/quick_compatibility_hidden" />
-
     <Button
     <Button
         android:id="@+id/quick_availability_button_continue"
         android:id="@+id/quick_availability_button_continue"
         android:layout_width="match_parent"
         android:layout_width="match_parent"

+ 0 - 1
app-unpriv/src/main/res/values/strings.xml

@@ -18,7 +18,6 @@
     <string name="quick_compatibility_not_compatible_but_usb">Your smartphone is not fully compatible with %s. However, you can still use a USB smart card reader for near-full functionality.</string>
     <string name="quick_compatibility_not_compatible_but_usb">Your smartphone is not fully compatible with %s. However, you can still use a USB smart card reader for near-full functionality.</string>
     <string name="quick_compatibility_result_slots">SIM card slots accessible: %s</string>
     <string name="quick_compatibility_result_slots">SIM card slots accessible: %s</string>
     <string name="quick_compatibility_result_notes">Note: these results are for reference only. Even if a SIM slot is not listed above, it <i>may</i> be compatible as well once a SIM card is inserted.</string>
     <string name="quick_compatibility_result_notes">Note: these results are for reference only. Even if a SIM slot is not listed above, it <i>may</i> be compatible as well once a SIM card is inserted.</string>
-    <string name="quick_compatibility_hidden">Do not show this message again.</string>
     <string name="quick_compatibility_button_continue">Continue</string>
     <string name="quick_compatibility_button_continue">Continue</string>
 
 
     <!-- Compatibility Check Descriptions -->
     <!-- Compatibility Check Descriptions -->