Fix calls silent ringer bug.
This commit is contained in:
parent
a3af237397
commit
d6f8f8acb3
2 changed files with 8 additions and 2 deletions
|
@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.service.webrtc;
|
|||
|
||||
import android.net.Uri;
|
||||
import android.os.ResultReceiver;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
@ -204,6 +205,11 @@ public class IncomingCallActionProcessor extends DeviceAwareActionProcessor {
|
|||
ringtone = SignalStore.settings().getCallRingtone();
|
||||
}
|
||||
|
||||
if (TextUtils.isEmpty(ringtone.toString())) {
|
||||
Log.i(TAG, "Ringtone is likely set to silent");
|
||||
ringtone = null;
|
||||
}
|
||||
|
||||
webRtcInteractor.startIncomingRinger(ringtone, vibrateState == RecipientTable.VibrateState.ENABLED || (vibrateState == RecipientTable.VibrateState.DEFAULT && SignalStore.settings().isCallVibrateEnabled()));
|
||||
}
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ sealed class AudioManagerCommand : Parcelable {
|
|||
}
|
||||
}
|
||||
|
||||
class StartIncomingRinger(val ringtoneUri: Uri, val vibrate: Boolean) : AudioManagerCommand() {
|
||||
class StartIncomingRinger(val ringtoneUri: Uri?, val vibrate: Boolean) : AudioManagerCommand() {
|
||||
override fun writeToParcel(parcel: Parcel, flags: Int) {
|
||||
parcel.writeParcelable(ringtoneUri, flags)
|
||||
ParcelUtil.writeBoolean(parcel, vibrate)
|
||||
|
@ -37,7 +37,7 @@ sealed class AudioManagerCommand : Parcelable {
|
|||
@JvmField
|
||||
val CREATOR: Parcelable.Creator<StartIncomingRinger> = ParcelCheat { parcel ->
|
||||
StartIncomingRinger(
|
||||
ringtoneUri = parcel.readParcelableCompat(Uri::class.java)!!,
|
||||
ringtoneUri = parcel.readParcelableCompat(Uri::class.java),
|
||||
vibrate = ParcelUtil.readBoolean(parcel)
|
||||
)
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue