empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix calls silent ringer bug.

Browse source
This commit is contained in:
Cody Henthorne 2024-12-03 12:17:06 -05:00 • committed by Greyson Parrelli
parent a3af237397
commit d6f8f8acb3
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingCallActionProcessor.java
View file

@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.service.webrtc;
import android.net.Uri; import android.net.Uri;
import android.os.ResultReceiver; import android.os.ResultReceiver;
import android.text.TextUtils;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -204,6 +205,11 @@ public class IncomingCallActionProcessor extends DeviceAwareActionProcessor {
ringtone = SignalStore.settings().getCallRingtone(); 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())); webRtcInteractor.startIncomingRinger(ringtone, vibrateState == RecipientTable.VibrateState.ENABLED || (vibrateState == RecipientTable.VibrateState.DEFAULT && SignalStore.settings().isCallVibrateEnabled()));
} }

4
app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/AudioManagerCommand.kt
View file

@ -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) { override fun writeToParcel(parcel: Parcel, flags: Int) {
parcel.writeParcelable(ringtoneUri, flags) parcel.writeParcelable(ringtoneUri, flags)
ParcelUtil.writeBoolean(parcel, vibrate) ParcelUtil.writeBoolean(parcel, vibrate)
@ -37,7 +37,7 @@ sealed class AudioManagerCommand : Parcelable {
@JvmField @JvmField
val CREATOR: Parcelable.Creator<StartIncomingRinger> = ParcelCheat { parcel -> val CREATOR: Parcelable.Creator<StartIncomingRinger> = ParcelCheat { parcel ->
StartIncomingRinger( StartIncomingRinger(
ringtoneUri = parcel.readParcelableCompat(Uri::class.java)!!, ringtoneUri = parcel.readParcelableCompat(Uri::class.java),
vibrate = ParcelUtil.readBoolean(parcel) vibrate = ParcelUtil.readBoolean(parcel)
) )
} }