Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 582a8238 authored by Moez Bhatti's avatar Moez Bhatti
Browse files

Vibrate and show toast when SIM is manually changed

parent 70275b23

presentation/src/main/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
    <uses-permission android:name="android.permission.RECEIVE_MMS" />

    <uses-permission android:name="android.permission.RECEIVE_SMS" />

    <uses-permission android:name="android.permission.SEND_SMS" />

    <uses-permission android:name="android.permission.VIBRATE" />

    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.WRITE_SMS" />

presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { 


        sim.setVisible(state.subscription != null)

        sim.contentDescription = getString(R.string.compose_sim_cd, state.subscription?.displayName)

        simIndex.text = "${state.subscription?.simSlotIndex?.plus(1)}"

        simIndex.text = state.subscription?.simSlotIndex?.plus(1)?.toString()



        send.isEnabled = state.canSend

        send.imageAlpha = if (state.canSend) 255 else 128

presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt

+9 −0
Original line number Diff line number Diff line
@@ -20,8 +20,10 @@ package com.moez.QKSMS.feature.compose 


import android.content.Context

import android.net.Uri

import android.os.Vibrator

import android.provider.ContactsContract

import android.telephony.SmsMessage

import androidx.core.content.getSystemService

import com.moez.QKSMS.R

import com.moez.QKSMS.common.Navigator

import com.moez.QKSMS.common.base.QkViewModel
@@ -616,6 +618,13 @@ class ComposeViewModel @Inject constructor( 
                        subIndex < subs.size - 1 -> subs[subIndex + 1]

                        else -> subs[0]

                    }



                    if (subscription != null) {

                        context.getSystemService<Vibrator>()?.vibrate(40)

                        context.makeToast(context.getString(R.string.compose_sim_changed_toast,

                                subscription.simSlotIndex + 1, subscription.displayName))

                    }



                    newState { copy(subscription = subscription) }

                }

                .autoDisposable(view.scope())

presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ class MessagesAdapter @Inject constructor( 
        val subscription = subs.find { sub -> sub.subscriptionId == message.subId }



        holder.timestamp.text = dateFormatter.getMessageTimestamp(message.date)

        holder.simIndex.text = subscription?.let { sub -> sub.simSlotIndex + 1 }?.toString()

        holder.simIndex.text = subscription?.simSlotIndex?.plus(1)?.toString()



        holder.timestamp.setVisible(timeSincePrevious >= BubbleUtils.TIMESTAMP_THRESHOLD

                || message.subId != previous?.subId && subscription != null)

presentation/src/main/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ 
    <string name="compose_schedule_cd">Schedule message</string>

    <string name="compose_contact_cd">Attach a contact</string>

    <string name="compose_contact_error">Error reading contact</string>

    <!-- Example: SIM 1 (Verizon) selected-->

    <string name="compose_sim_changed_toast">SIM %1$d (%2$s) selected</string>

    <string name="compose_sim_cd">%s selected, change SIM card</string>

    <string name="compose_send_cd">Send message</string>