Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 13:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Log ServiceId parsing failures.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-08-11 11:30:36 -04:00
committed by Cody Henthorne
parent 046b89fa21
commit 389b439e9a
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libsignal/service/src/main/java/org/whispersystems/signalservice/api/push/ServiceId.kt
View File

@@ -3,6 +3,7 @@ package org.whispersystems.signalservice.api.push
import com.google.protobuf.ByteString
import org.signal.libsignal.protocol.ServiceId.InvalidServiceIdException
import org.signal.libsignal.protocol.SignalProtocolAddress
import org.signal.libsignal.protocol.logging.Log
import org.whispersystems.signalservice.api.util.UuidUtil
import java.lang.IllegalArgumentException
import java.util.UUID
@@ -21,6 +22,8 @@ import org.signal.libsignal.protocol.ServiceId.Pni as LibSignalPni
*/
sealed class ServiceId(val libSignalServiceId: LibSignalServiceId) {
companion object {
private const val TAG = "ServiceId"
@JvmStatic
fun fromLibSignal(serviceId: LibSignalServiceId): ServiceId {
return when (serviceId) {
@@ -40,8 +43,10 @@ sealed class ServiceId(val libSignalServiceId: LibSignalServiceId) {
return try {
fromLibSignal(LibSignalServiceId.parseFromString(raw))
} catch (e: IllegalArgumentException) {
Log.w(TAG, "[parseOrNull(String)] Illegal argument!", e)
null
} catch (e: InvalidServiceIdException) {
Log.w(TAG, "[parseOrNull(String)] Invalid ServiceId!", e)
null
}
}
@@ -60,8 +65,10 @@ sealed class ServiceId(val libSignalServiceId: LibSignalServiceId) {
fromLibSignal(LibSignalServiceId.parseFromBinary(raw))
}
} catch (e: IllegalArgumentException) {
Log.w(TAG, "[parseOrNull(Bytes)] Illegal argument!", e)
null
} catch (e: InvalidServiceIdException) {
Log.w(TAG, "[parseOrNull(Bytes)] Invalid ServiceId!", e)
null
}
}