Add checkbox for SIM cards

Author: AchoArnold

android/app/src/main/java/com/httpsms/MainActivity.kt

@@ -6,7 +6,6 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -19,7 +18,6 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.app.ActivityCompat
 import androidx.lifecycle.MutableLiveData
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy
@@ -29,7 +27,6 @@ import androidx.work.WorkManager
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.progressindicator.LinearProgressIndicator
-import com.google.android.material.switchmaterial.SwitchMaterial
 import com.httpsms.services.StickyNotificationService
 import com.httpsms.worker.HeartbeatWorker
 import okhttp3.internal.format
@@ -56,7 +53,6 @@ class MainActivity : AppCompatActivity() {
         createChannel()
 
         setCardContent(this)
-        setActiveStatus(this)
         registerListeners()
         refreshToken(this)
 
@@ -89,9 +85,15 @@ class MainActivity : AppCompatActivity() {
     private fun setCardContent(context: Context) {
         val titleText = findViewById<TextView>(R.id.cardPhoneNumber)
         titleText.text = PhoneNumberUtils.formatNumber(Settings.getSIM1PhoneNumber(this), Locale.getDefault().country)
+        if(!Settings.getActiveStatus(context, Constants.SIM1)) {
+            titleText.setCompoundDrawables(null, null, null, null)
+        }
 
         val titleTextSIM2 = findViewById<TextView>(R.id.cardPhoneNumberSIM2)
         titleTextSIM2.text = PhoneNumberUtils.formatNumber(Settings.getSIM2PhoneNumber(this), Locale.getDefault().country)
+        if(!Settings.getActiveStatus(context, Constants.SIM2)) {
+            titleTextSIM2.setCompoundDrawables(null, null, null, null)
+        }
 
         setLastHeartbeatTimestamp(context)
 
@@ -238,69 +240,6 @@ class MainActivity : AppCompatActivity() {
         return true
     }
 
-    private fun setActiveStatus(context: Context) {
-        val switch = findViewById<SwitchMaterial>(R.id.cardSwitch)
-        switch.isChecked = Settings.getActiveStatus(context, Constants.SIM1)
-        switch.setOnCheckedChangeListener{
-            _, isChecked ->
-            run {
-                if (isChecked && !hasAllPermissions(context)) {
-                    Toast.makeText(context, "PERMISSIONS_NOT_GRANTED", Toast.LENGTH_SHORT).show()
-                } else {
-                    Settings.setActiveStatusAsync(context, isChecked, Constants.SIM1)
-                }
-                if (isChecked) {
-                    Settings.setIncomingActiveSIM1(context, true)
-                    startStickyNotification(context)
-                }
-            }
-        }
-
-        if (!Settings.isDualSIM(context)) {
-            return
-        }
-
-        val switchSIM2 = findViewById<SwitchMaterial>(R.id.cardSwitchSIM2)
-        switchSIM2.isChecked = Settings.getActiveStatus(context, Constants.SIM2)
-        switchSIM2.setOnCheckedChangeListener{
-                _, isChecked ->
-            run {
-                if (isChecked && !hasAllPermissions(context)) {
-                    Toast.makeText(context, "PERMISSIONS_NOT_GRANTED", Toast.LENGTH_SHORT).show()
-                } else {
-                    Settings.setActiveStatusAsync(context, isChecked, Constants.SIM2)
-                }
-                if (isChecked) {
-                    Settings.setIncomingActiveSIM2(context, true)
-                    startStickyNotification(context)
-                }
-            }
-        }
-    }
-
-    private fun hasAllPermissions(context: Context): Boolean {
-        if (ActivityCompat.checkSelfPermission(
-                context,
-                Manifest.permission.SEND_SMS
-            ) == PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(
-                context,
-                Manifest.permission.READ_PHONE_NUMBERS
-            ) == PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(
-                context,
-                Manifest.permission.RECEIVE_SMS
-            ) == PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(
-                context,
-                Manifest.permission.READ_PHONE_STATE
-            ) == PackageManager.PERMISSION_GRANTED && (Build.VERSION.SDK_INT < 33 || ActivityCompat.checkSelfPermission(
-                context,
-                Manifest.permission.POST_NOTIFICATIONS
-            ) == PackageManager.PERMISSION_GRANTED)
-        ) {
-            return true
-        }
-        return false
-    }
-
     private fun setLastHeartbeatTimestamp(context: Context) {
         val refreshTimestampView = findViewById<TextView>(R.id.cardRefreshTime)
         val timestamp = Settings.getHeartbeatTimestamp(context)

android/app/src/main/java/com/httpsms/Settings.kt

@@ -8,11 +8,10 @@ import java.net.URI
 object Settings {
     private const val SETTINGS_SIM1_PHONE_NUMBER = "SETTINGS_SIM1_PHONE_NUMBER"
     private const val SETTINGS_SIM2_PHONE_NUMBER = "SETTINGS_SIM2_PHONE_NUMBER"
-    private const val SETTINGS_ACTIVE = "SETTINGS_ACTIVE_STATUS"
     private const val SETTINGS_SIM1_ACTIVE = "SETTINGS_SIM1_ACTIVE_STATUS"
     private const val SETTINGS_SIM2_ACTIVE = "SETTINGS_SIM2_ACTIVE_STATUS"
     private const val SETTINGS_SIM1_INCOMING_ACTIVE = "SETTINGS_SIM1_INCOMING_ACTIVE"
-    private const val SETTINGS_SIM2_INCOMING_ACTIVE = "SETTINGS_SIM1_INCOMING_ACTIVE"
+    private const val SETTINGS_SIM2_INCOMING_ACTIVE = "SETTINGS_SIM2_INCOMING_ACTIVE"
     private const val SETTINGS_API_KEY = "SETTINGS_API_KEY"
     private const val SETTINGS_SERVER_URL = "SETTINGS_SERVER_URL"
     private const val SETTINGS_FCM_TOKEN = "SETTINGS_FCM_TOKEN"
@@ -43,7 +42,7 @@ object Settings {
             .getString(this.SETTINGS_SIM2_PHONE_NUMBER, null)
 
         if (owner == null) {
-            Timber.e("cannot get owner from preference [${this.SETTINGS_SIM2_PHONE_NUMBER}]")
+            Timber.d("cannot get owner from preference [${this.SETTINGS_SIM2_PHONE_NUMBER}]")
             return ""
         }
 

android/app/src/main/java/com/httpsms/SettingsActivity.kt

@@ -30,24 +30,31 @@ class SettingsActivity : AppCompatActivity() {
 
         sim1IncomingMessages.setOnCheckedChangeListener{ _, isChecked -> run { Settings.setIncomingActiveSIM1(context, isChecked) } }
 
+        val sim1OutgoingMessages = findViewById<SwitchMaterial>(R.id.settings_sim1_outgoing_messages)
+        sim1OutgoingMessages.isChecked = Settings.getActiveStatus(context, Constants.SIM1)
+        sim1OutgoingMessages.setOnCheckedChangeListener{ _, isChecked -> run { Settings.setActiveStatusAsync(context, isChecked, Constants.SIM1) } }
+
         if (!Settings.isDualSIM(context)) {
             val layout = findViewById<TextInputLayout>(R.id.settingsSIM2Layout)
             layout.visibility = TextInputLayout.GONE
             val sim2Switch = findViewById<SwitchMaterial>(R.id.settings_sim2_incoming_messages)
             sim2Switch.visibility = SwitchMaterial.GONE
+            val outgoingSwitch = findViewById<SwitchMaterial>(R.id.settings_sim2_outgoing_messages)
+            outgoingSwitch.visibility = SwitchMaterial.GONE
             return
         }
 
-        Timber.e("Settings.isDualSIM(context) = ${Settings.isDualSIM(context)}")
-
         val phoneNumberSIM2 = findViewById<TextInputEditText>(R.id.settingsSIM2InputEdit)
         phoneNumberSIM2.setText(Settings.getSIM2PhoneNumber(context))
         phoneNumberSIM2.isEnabled = false
 
         val sim2IncomingMessages = findViewById<SwitchMaterial>(R.id.settings_sim2_incoming_messages)
         sim2IncomingMessages.isChecked = Settings.isIncomingMessageEnabled(context, Constants.SIM2)
-
         sim2IncomingMessages.setOnCheckedChangeListener{ _, isChecked -> run { Settings.setIncomingActiveSIM2(context, isChecked) } }
+
+        val sim2OutgoingMessages = findViewById<SwitchMaterial>(R.id.settings_sim2_outgoing_messages)
+        sim2OutgoingMessages.isChecked = Settings.getActiveStatus(context, Constants.SIM2)
+        sim2OutgoingMessages.setOnCheckedChangeListener{ _, isChecked -> run { Settings.setActiveStatusAsync(context, isChecked, Constants.SIM2) } }
     }
 
     private fun registerListeners() {
@@ -56,7 +63,7 @@ class SettingsActivity : AppCompatActivity() {
     }
 
     private fun onBackClicked() {
-        Timber.e("back button clicked")
+        Timber.d("back button clicked")
         redirectToMain()
     }
 

android/app/src/main/res/drawable/baseline_check_circle_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#E91E63"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+</vector>

android/app/src/main/res/layout/activity_main.xml

@@ -58,16 +58,12 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:text="@string/phone_number"
+                    android:drawablePadding="5dp"
                     android:textAppearance="?attr/textAppearanceTitleMedium"
                     android:textColor="?android:attr/textColorPrimary"
+                    app:drawableTint="#70ab5c"
+                    app:drawableEndCompat="@drawable/baseline_check_circle_24"
                     android:textSize="28sp" />
-
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/cardSwitch"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:minHeight="48dp"
-                    tools:ignore="TouchTargetSizeCheck" />
             </LinearLayout>
 
 
@@ -111,17 +107,14 @@
                     android:id="@+id/cardPhoneNumberSIM2"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:drawablePadding="5dp"
                     android:text="@string/phone_number"
                     android:textAppearance="?attr/textAppearanceTitleMedium"
                     android:textColor="?android:attr/textColorPrimary"
+                    app:drawableTint="#70ab5c"
+                    app:drawableEndCompat="@drawable/baseline_check_circle_24"
                     android:textSize="28sp" />
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/cardSwitchSIM2"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:minHeight="48dp"
-                    tools:ignore="TouchTargetSizeCheck" />
             </LinearLayout>
 
 

android/app/src/main/res/layout/activity_settings.xml

@@ -54,6 +54,16 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
+        <com.google.android.material.switchmaterial.SwitchMaterial
+            android:id="@+id/settings_sim1_outgoing_messages"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/settings_outgoing_messages_sim1"
+            android:minHeight="48dp"
+            tools:ignore="TouchTargetSizeCheck" />
+
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/settings_sim1_incoming_messages"
             android:layout_width="match_parent"
@@ -83,6 +93,16 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
+        <com.google.android.material.switchmaterial.SwitchMaterial
+            android:id="@+id/settings_sim2_outgoing_messages"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:text="@string/settings_outgoing_messages_sim2"
+            android:minHeight="48dp"
+            android:layout_marginBottom="16dp"
+            tools:ignore="TouchTargetSizeCheck" />
+
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/settings_sim2_incoming_messages"
             android:layout_width="match_parent"

android/app/src/main/res/values/strings.xml

@@ -20,8 +20,10 @@
     <string name="main_app_settings">App Settings</string>
     <string name="settings_sim1">SIM1</string>
     <string name="settings_sim_2">SIM2</string>
-    <string name="settings_incoming_messages_sim1">EnableIncoming Messages (SIM1)</string>
+    <string name="settings_outgoing_messages_sim1">Enable Outgoing Messages (SIM1)</string>
+    <string name="settings_incoming_messages_sim1">Enable Incoming Messages (SIM1)</string>
     <string name="settings_incoming_messages_sim2">Enable Incoming Messages (SIM2)</string>
+    <string name="settings_outgoing_messages_sim2">Enable Outgoing Messages (SIM2)</string>
     <string name="login_phone_number_sim1">Phone Number (SIM1)</string>
     <string name="login_phone_number_sim2">Phone Number (SIM2)</string>
 </resources>