signalapp/Signal-Android
signalapp/Signal-Android
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 16 Wiki Activity

Fix various lint issues.

Browse Source
This commit is contained in:
Greyson Parrelli 2026-06-03 14:19:58 -04:00 committed by Cody Henthorne
parent 132eaa5c70
commit 6027d58fb5
43 changed files with 90 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/components/SharedContactView.java
View File

@ -5,7 +5,6 @@ import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.Color;
import android.net.Uri;
import android.os.Build;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageView;
@ -69,7 +68,7 @@ public class SharedContactView extends LinearLayout implements RecipientForeverO
initialize(attrs);
}
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@RequiresApi(api = 21)
public SharedContactView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
initialize(attrs);

2
app/src/main/java/org/thoughtcrime/securesms/components/SignalProgressDialog.kt
View File

@ -37,7 +37,7 @@ class SignalProgressDialog private constructor(
var progress: Int
get() = progressBar.progress
set(value) = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
set(value) = if (Build.VERSION.SDK_INT >= 24) {
progressBar.setProgress(value, true)
} else {
progressBar.setProgress(value)

2
app/src/main/java/org/thoughtcrime/securesms/components/emoji/SystemEmojiDrawable.kt
View File

@ -48,7 +48,7 @@ class SystemEmojiDrawable(emoji: CharSequence) : Drawable() {
companion object {
private val textPaint: TextPaint = TextPaint()
private fun getStaticLayout(emoji: CharSequence): StaticLayout = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
private fun getStaticLayout(emoji: CharSequence): StaticLayout = if (Build.VERSION.SDK_INT >= 23) {
StaticLayout.Builder.obtain(emoji, 0, emoji.length, textPaint, Int.MAX_VALUE).build()
} else {
@Suppress("DEPRECATION")

3
app/src/main/java/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java
View File

@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.components.registration;
import android.content.Context;
import android.graphics.PorterDuff;
import android.os.Build;
import android.util.AttributeSet;
import android.view.View;
import android.view.animation.Animation;
@ -49,7 +48,7 @@ public class VerificationPinKeyboard extends FrameLayout {
initialize();
}
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@RequiresApi(api = 21)
public VerificationPinKeyboard(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
initialize();

2
app/src/main/java/org/thoughtcrime/securesms/components/transfercontrols/TransferControlView.kt
View File

@ -493,7 +493,7 @@ class TransferControlView @JvmOverloads constructor(context: Context, attrs: Att
}
private fun applyFocusableAndClickable(currentState: TransferControlViewState, activeViews: List<View>, inactiveViews: List<View>) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
if (Build.VERSION.SDK_INT >= 26) {
val focusIntDef = if (currentState.isFocusable) View.FOCUSABLE else View.NOT_FOCUSABLE
activeViews.forEach { it.focusable = focusIntDef }
inactiveViews.forEach { it.focusable = View.NOT_FOCUSABLE }

3
app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactPhotoLocalUriFetcher.java
View File

@ -9,7 +9,6 @@ import android.content.ContentResolver;
import android.content.Context;
import android.net.Uri;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.provider.ContactsContract;
import com.bumptech.glide.load.data.StreamLocalUriFetcher;
@ -31,7 +30,7 @@ class ContactPhotoLocalUriFetcher extends StreamLocalUriFetcher {
protected InputStream loadResource(Uri uri, ContentResolver contentResolver)
throws FileNotFoundException
{
if (VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH) {
if (VERSION.SDK_INT >= 14) {
return ContactsContract.Contacts.openContactPhotoInputStream(contentResolver, uri, true);
} else {
return ContactsContract.Contacts.openContactPhotoInputStream(contentResolver, uri);

9
app/src/main/java/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java
View File

@ -1,7 +1,6 @@
package org.thoughtcrime.securesms.crypto;
import android.os.Build;
import android.security.keystore.KeyGenParameterSpec;
import android.security.keystore.KeyProperties;
import android.util.Base64;
@ -110,13 +109,13 @@ public final class KeyStoreHelper {
return result.get();
}
@RequiresApi(Build.VERSION_CODES.M)
@RequiresApi(23)
private static SecretKey getOrCreateKeyStoreEntry() {
if (hasKeyStoreEntry()) return getKeyStoreEntry();
else return createKeyStoreEntry();
}
@RequiresApi(Build.VERSION_CODES.M)
@RequiresApi(23)
private static SecretKey createKeyStoreEntry() {
try {
KeyGenerator keyGenerator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, ANDROID_KEY_STORE);
@ -133,7 +132,7 @@ public final class KeyStoreHelper {
}
}
@RequiresApi(Build.VERSION_CODES.M)
@RequiresApi(23)
private static SecretKey getKeyStoreEntry() {
KeyStore keyStore = getKeyStore();
@ -171,7 +170,7 @@ public final class KeyStoreHelper {
}
}
@RequiresApi(Build.VERSION_CODES.M)
@RequiresApi(23)
private static boolean hasKeyStoreEntry() {
try {
KeyStore ks = KeyStore.getInstance(ANDROID_KEY_STORE);

4
app/src/main/java/org/thoughtcrime/securesms/util/views/SimpleProgressDialog.java
View File

@ -10,6 +10,8 @@ import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.Lifecycle;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.signal.core.util.ThreadUtil;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
@ -29,7 +31,7 @@ public final class SimpleProgressDialog {
@MainThread
public static @NonNull AlertDialog show(@NonNull Context context) {
AlertDialog dialog = new AlertDialog.Builder(context)
AlertDialog dialog = new MaterialAlertDialogBuilder(context)
.setView(R.layout.progress_dialog)
.setCancelable(false)
.create();

2
app/src/quickstart/java/org/thoughtcrime/securesms/QuickstartRestoreActivity.kt
View File

@ -125,7 +125,7 @@ class QuickstartRestoreActivity : BaseActivity() {
}
private fun hasStorageAccess(): Boolean {
return Build.VERSION.SDK_INT < Build.VERSION_CODES.R || Environment.isExternalStorageManager()
return Build.VERSION.SDK_INT < 30 || Environment.isExternalStorageManager()
}
private fun startRestore() {

2
core/models-jvm/src/main/java/org/signal/core/models/ServiceId.kt
View File

@ -8,9 +8,9 @@ package org.signal.core.models
import okio.ByteString
import okio.ByteString.Companion.toByteString
import org.signal.core.util.UuidUtil
import org.signal.core.util.logging.Log
import org.signal.core.util.toByteArray
import org.signal.libsignal.protocol.SignalProtocolAddress
import org.signal.libsignal.protocol.logging.Log
import java.util.UUID
/**

2
core/network/src/main/java/org/signal/network/util/JsonUtil.java
View File

@ -22,7 +22,7 @@ import com.fasterxml.jackson.module.kotlin.KotlinModule;
import org.signal.core.util.Base64;
import org.signal.libsignal.protocol.IdentityKey;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.logging.Log;
import org.signal.core.util.logging.Log;
import org.signal.core.models.MasterKey;
import org.signal.core.models.ServiceId;
import org.signal.core.models.ServiceId.ACI;

2
core/ui/src/main/java/org/signal/core/ui/compose/ActivityComponents.kt
View File

@ -25,7 +25,7 @@ import androidx.core.util.Consumer
*/
@Composable
fun rememberIsInPipMode(): Boolean {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
if (Build.VERSION.SDK_INT >= 26) {
val activity = LocalActivity.current as AppCompatActivity
var pipMode: Boolean by remember { mutableStateOf(activity.isInPictureInPictureMode) }
DisposableEffect(activity) {

2
demo/apng/src/main/java/org/signal/apng/ui/theme/Theme.kt
View File

@ -50,7 +50,7 @@ fun SignalTheme(
content: @Composable () -> Unit
) {
val colorScheme = when {
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
dynamicColor && Build.VERSION.SDK_INT >= 31 -> {
val context = LocalContext.current
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
}

2
demo/camera/src/main/java/org/signal/camera/demo/screens/gallery/GalleryScreenViewModel.kt
View File

@ -1,7 +1,6 @@
package org.signal.camera.demo.screens.gallery
import android.content.Context
import android.util.Log
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.State
import androidx.compose.runtime.mutableStateOf
@ -10,6 +9,7 @@ import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.signal.core.util.logging.Log
import java.io.File
private const val TAG = "GalleryScreenViewModel"

2
demo/camera/src/main/java/org/signal/camera/demo/screens/main/MainScreenViewModel.kt
View File

@ -3,7 +3,6 @@ package org.signal.camera.demo.screens.main
import android.content.Context
import android.graphics.Bitmap
import android.os.ParcelFileDescriptor
import android.util.Log
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.State
import androidx.compose.runtime.mutableStateOf
@ -14,6 +13,7 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.signal.camera.VideoCaptureResult
import org.signal.camera.VideoOutput
import org.signal.core.util.logging.Log
import java.io.File
import java.text.SimpleDateFormat
import java.util.Locale

2
demo/camera/src/main/java/org/signal/camera/demo/ui/theme/Theme.kt
View File

@ -40,7 +40,7 @@ fun CameraXTestTheme(
content: @Composable () -> Unit
) {
val colorScheme = when {
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
dynamicColor && Build.VERSION.SDK_INT >= 31 -> {
val context = LocalContext.current
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
}

1
demo/device-transfer/src/main/AndroidManifest.xml
View File

@ -5,6 +5,7 @@
<uses-permission android:name="android.permission.WAKE_LOCK" />
<application
android:name=".DeviceTransferApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"

14
demo/device-transfer/src/main/java/org/signal/devicetransfer/app/DeviceTransferApplication.java Normal file
View File

@ -0,0 +1,14 @@
package org.signal.devicetransfer.app;
import android.app.Application;
import org.signal.core.util.logging.AndroidLogger;
import org.signal.core.util.logging.Log;
public class DeviceTransferApplication extends Application {
@Override
public void onCreate() {
super.onCreate();
Log.initialize(AndroidLogger.INSTANCE);
}
}

2
demo/device-transfer/src/main/java/org/signal/devicetransfer/app/MainActivity.java
View File

@ -9,7 +9,7 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
import android.util.Log;
import org.signal.core.util.logging.Log;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;

1
demo/image-editor/src/main/AndroidManifest.xml
View File

@ -6,6 +6,7 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application
android:name=".ImageEditorApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"

14
demo/image-editor/src/main/java/org/signal/imageeditor/app/ImageEditorApplication.java Normal file
View File

@ -0,0 +1,14 @@
package org.signal.imageeditor.app;
import android.app.Application;
import org.signal.core.util.logging.AndroidLogger;
import org.signal.core.util.logging.Log;
public class ImageEditorApplication extends Application {
@Override
public void onCreate() {
super.onCreate();
Log.initialize(AndroidLogger.INSTANCE);
}
}

14
demo/image-editor/src/main/java/org/signal/imageeditor/app/MainActivity.java
View File

@ -12,7 +12,7 @@ import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.provider.MediaStore;
import android.util.Log;
import org.signal.core.util.logging.Log;
import android.view.Menu;
import android.view.MenuItem;
@ -70,7 +70,7 @@ public final class MainActivity extends AppCompatActivity {
imageEditorView.setTypefaceProvider(typefaceProvider);
imageEditorView.setUndoRedoStackListener((undoAvailable, redoAvailable) -> {
Log.d("ALAN", String.format("Undo/Redo available: %s, %s", undoAvailable ? "Y" : "N", redoAvailable ? "Y" : "N"));
Log.d(TAG, String.format("Undo/Redo available: %s, %s", undoAvailable ? "Y" : "N", redoAvailable ? "Y" : "N"));
if (menu == null) return;
MenuItem undo = menu.findItem(R.id.action_undo);
MenuItem redo = menu.findItem(R.id.action_redo);
@ -81,12 +81,12 @@ public final class MainActivity extends AppCompatActivity {
EditorModel model = null;
if (savedInstanceState != null) {
model = savedInstanceState.getParcelable("MODEL");
Log.d("ALAN", "Restoring instance " + (model != null ? model.hashCode() : 0));
Log.d(TAG, "Restoring instance " + (model != null ? model.hashCode() : 0));
}
if (model == null) {
model = initialModel();
Log.d("ALAN", "New instance created " + model.hashCode());
Log.d(TAG, "New instance created " + model.hashCode());
}
imageEditorView.setModel(model);
@ -94,17 +94,17 @@ public final class MainActivity extends AppCompatActivity {
imageEditorView.setTapListener(new ImageEditorView.TapListener() {
@Override
public void onEntityDown(@Nullable EditorElement editorElement) {
Log.d("ALAN", "Entity down " + editorElement);
Log.d(TAG, "Entity down " + editorElement);
}
@Override
public void onEntitySingleTap(@Nullable EditorElement editorElement) {
Log.d("ALAN", "Entity single tapped " + editorElement);
Log.d(TAG, "Entity single tapped " + editorElement);
}
@Override
public void onEntityDoubleTap(@NonNull EditorElement editorElement) {
Log.d("ALAN", "Entity double tapped " + editorElement);
Log.d(TAG, "Entity double tapped " + editorElement);
if (editorElement.getRenderer() instanceof MultiLineTextRenderer) {
imageEditorView.startTextEditing(editorElement);
} else {

2
demo/image-editor/src/main/java/org/signal/imageeditor/app/renderers/UrlRenderer.java
View File

@ -6,7 +6,7 @@ import android.graphics.Paint;
import android.graphics.Point;
import android.graphics.RectF;
import android.os.Parcel;
import android.util.Log;
import org.signal.core.util.logging.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

14
demo/spinner/src/main/java/org/signal/spinnertest/MainActivity.kt
View File

@ -14,6 +14,8 @@ import org.signal.spinner.SpinnerLogger
import java.util.UUID
import kotlin.random.Random
private const val TAG = "MyTag"
class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@ -39,18 +41,18 @@ class MainActivity : AppCompatActivity() {
override fun run() {
while (true) {
when (Random.nextInt(0, 5)) {
0 -> Log.v("MyTag", "Message: ${System.currentTimeMillis()}")
1 -> Log.d("MyTag", "Message: ${System.currentTimeMillis()}")
2 -> Log.i("MyTag", "Message: ${System.currentTimeMillis()}")
3 -> Log.w("MyTag", "Message: ${System.currentTimeMillis()}")
4 -> Log.e("MyTag", "Message: ${System.currentTimeMillis()}")
0 -> Log.v(TAG, "Message: ${System.currentTimeMillis()}")
1 -> Log.d(TAG, "Message: ${System.currentTimeMillis()}")
2 -> Log.i(TAG, "Message: ${System.currentTimeMillis()}")
3 -> Log.w(TAG, "Message: ${System.currentTimeMillis()}")
4 -> Log.e(TAG, "Message: ${System.currentTimeMillis()}")
}
ThreadUtil.sleep(Random.nextLong(0, 200))
}
}
}.start()
findViewById<Button>(R.id.log_throwable_button).setOnClickListener { Log.e("MyTag", "Message: ${System.currentTimeMillis()}", Throwable()) }
findViewById<Button>(R.id.log_throwable_button).setOnClickListener { Log.e(TAG, "Message: ${System.currentTimeMillis()}", Throwable()) }
}
private fun insertMockData(db: SQLiteDatabase) {

6
demo/video/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeTestRepository.kt
View File

@ -145,7 +145,7 @@ class TranscodeTestRepository {
}
private fun saveToDownloads(context: Context, sourceFile: File, filename: String): Uri {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
if (Build.VERSION.SDK_INT >= 29) {
return saveToDownloadsMediaStore(context, filename) { outputStream ->
sourceFile.inputStream().use { it.copyTo(outputStream) }
}
@ -159,7 +159,7 @@ class TranscodeTestRepository {
val processor = Mp4FaststartPostProcessor(inputStreamFactory)
val sourceLength = sourceFile.length()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
if (Build.VERSION.SDK_INT >= 29) {
return saveToDownloadsMediaStore(context, filename) { outputStream ->
processor.processWithMdatLength(sourceLength, mdatSize).use { it.copyTo(outputStream) }
}
@ -173,7 +173,7 @@ class TranscodeTestRepository {
}
}
@RequiresApi(Build.VERSION_CODES.Q)
@RequiresApi(29)
private fun saveToDownloadsMediaStore(context: Context, filename: String, writeContent: (java.io.OutputStream) -> Unit): Uri {
val contentValues = ContentValues().apply {
put(MediaStore.Downloads.DISPLAY_NAME, filename)

2
demo/video/src/main/java/org/thoughtcrime/video/app/ui/theme/Theme.kt
View File

@ -38,7 +38,7 @@ fun SignalTheme(
content: @Composable () -> Unit
) {
val colorScheme = when {
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
dynamicColor && Build.VERSION.SDK_INT >= 31 -> {
val context = LocalContext.current
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
}

2
feature/camera/src/main/java/org/signal/camera/CameraScreenViewModel.kt
View File

@ -826,7 +826,7 @@ class CameraScreenViewModel : ViewModel() {
private fun vibrate(context: Context) {
val vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator
vibrator?.let {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
if (Build.VERSION.SDK_INT >= 26) {
it.vibrate(VibrationEffect.createOneShot(50, 75))
} else {
@Suppress("DEPRECATION")

4
feature/camera/src/main/java/org/signal/camera/hud/GalleryThumbnailButton.kt
View File

@ -204,7 +204,7 @@ private fun getMediaTimestamp(context: Context, uri: Uri): Long? {
* For older versions, we need READ_EXTERNAL_STORAGE.
*/
fun hasMediaPermissions(context: Context): Boolean {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
return if (Build.VERSION.SDK_INT >= 33) {
// Android 13+
context.checkSelfPermission(Manifest.permission.READ_MEDIA_IMAGES) ==
PackageManager.PERMISSION_GRANTED ||
@ -221,7 +221,7 @@ fun hasMediaPermissions(context: Context): Boolean {
* Returns the list of permissions needed to read media files based on the Android version.
*/
fun getMediaPermissions(): Array<String> {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
return if (Build.VERSION.SDK_INT >= 33) {
arrayOf(
Manifest.permission.READ_MEDIA_IMAGES,
Manifest.permission.READ_MEDIA_VIDEO

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View File

@ -28,7 +28,7 @@ import org.signal.libsignal.protocol.NoSessionException;
import org.signal.libsignal.protocol.SessionBuilder;
import org.signal.libsignal.protocol.SignalProtocolAddress;
import org.signal.libsignal.protocol.groups.GroupSessionBuilder;
import org.signal.libsignal.protocol.logging.Log;
import org.signal.core.util.logging.Log;
import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
import org.signal.libsignal.protocol.message.PlaintextContent;
import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage;

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java
View File

@ -35,7 +35,7 @@ import org.signal.libsignal.protocol.SessionCipher;
import org.signal.libsignal.protocol.SignalProtocolAddress;
import org.signal.libsignal.protocol.UntrustedIdentityException;
import org.signal.libsignal.protocol.groups.GroupCipher;
import org.signal.libsignal.protocol.logging.Log;
import org.signal.core.util.logging.Log;
import org.signal.libsignal.protocol.message.CiphertextMessage;
import org.signal.libsignal.protocol.message.PlaintextContent;
import org.signal.libsignal.protocol.message.PreKeySignalMessage;

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java
View File

@ -2,7 +2,7 @@ package org.whispersystems.signalservice.api.groupsv2;
import org.signal.core.models.ServiceId;
import org.signal.core.models.ServiceId.ACI;
import org.signal.libsignal.protocol.logging.Log;
import org.signal.core.util.logging.Log;
import org.signal.storageservice.storage.protos.groups.AccessControl;
import org.signal.storageservice.storage.protos.groups.Member;
import org.signal.storageservice.storage.protos.groups.local.DecryptedApproveMember;

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java
View File

@ -4,7 +4,7 @@ import org.signal.core.models.ServiceId;
import org.signal.core.models.ServiceId.ACI;
import org.signal.core.models.ServiceId.PNI;
import org.signal.core.util.UuidUtil;
import org.signal.libsignal.protocol.logging.Log;
import org.signal.core.util.logging.Log;
import org.signal.libsignal.zkgroup.InvalidInputException;
import org.signal.libsignal.zkgroup.NotarySignature;
import org.signal.libsignal.zkgroup.ServerPublicParams;

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java
View File

@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.signal.libsignal.protocol.logging.Log;
import org.signal.core.util.logging.Log;
import org.signal.libsignal.zkgroup.InvalidInputException;
import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredentialResponse;
import org.signal.core.models.ServiceId;

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java
View File

@ -2,7 +2,7 @@ package org.whispersystems.signalservice.api.push.exceptions;
import org.signal.network.exceptions.NonSuccessfulResponseCodeException;
import org.signal.libsignal.protocol.logging.Log;
import org.signal.core.util.logging.Log;
import org.whispersystems.signalservice.internal.push.ProofRequiredResponse;
import java.util.HashSet;

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java
View File

@ -1,6 +1,6 @@
package org.whispersystems.signalservice.api.services;
import org.signal.libsignal.protocol.logging.Log;
import org.signal.core.util.logging.Log;
import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation;
import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialRequest;
import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialResponse;

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java
View File

@ -2,7 +2,7 @@ package org.whispersystems.signalservice.api.services;
import org.signal.core.util.Hex;
import org.signal.libsignal.protocol.IdentityKey;
import org.signal.libsignal.protocol.logging.Log;
import org.signal.core.util.logging.Log;
import org.signal.libsignal.zkgroup.VerificationFailedException;
import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt
View File

@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize
import okio.ByteString.Companion.toByteString
import org.signal.core.models.MasterKey
import org.signal.core.util.Hex
import org.signal.libsignal.protocol.logging.Log
import org.signal.core.util.logging.Log
import org.signal.libsignal.svr2.PinHash
import org.signal.network.NetworkResult
import org.signal.network.exceptions.NonSuccessfulResponseCodeException

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2Socket.kt
View File

@ -7,8 +7,8 @@ import okhttp3.WebSocketListener
import okio.ByteString
import okio.ByteString.Companion.toByteString
import org.signal.core.util.Hex
import org.signal.core.util.logging.Log
import org.signal.libsignal.attest.AttestationDataException
import org.signal.libsignal.protocol.logging.Log
import org.signal.libsignal.sgxsession.SgxCommunicationFailureException
import org.signal.libsignal.svr2.Svr2Client
import org.signal.network.exceptions.NonSuccessfulResponseCodeException

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/StreamDetails.java
View File

@ -1,6 +1,6 @@
package org.whispersystems.signalservice.api.util;
import org.signal.libsignal.protocol.logging.Log;
import org.signal.core.util.logging.Log;
import java.io.Closeable;
import java.io.IOException;

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
View File

@ -13,7 +13,7 @@ import com.squareup.wire.Message;
import org.signal.core.util.Base64;
import org.signal.core.util.Hex;
import org.signal.libsignal.protocol.InvalidKeyException;
import org.signal.libsignal.protocol.logging.Log;
import org.signal.core.util.logging.Log;
import org.signal.storageservice.storage.protos.groups.AvatarUploadAttributes;
import org.signal.storageservice.storage.protos.groups.ExternalGroupCredential;
import org.signal.storageservice.storage.protos.groups.Group;

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushTransportDetails.java
View File

@ -7,7 +7,7 @@
package org.whispersystems.signalservice.internal.push;
import org.signal.libsignal.protocol.logging.Log;
import org.signal.core.util.logging.Log;
public class PushTransportDetails {

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBody.kt
View File

@ -4,9 +4,9 @@ import okhttp3.MediaType
import okhttp3.MediaType.Companion.toMediaTypeOrNull
import okhttp3.RequestBody
import okio.BufferedSink
import org.signal.core.util.logging.Log
import org.signal.core.util.stream.NonClosingOutputStream
import org.signal.libsignal.protocol.incrementalmac.ChunkSizeChoice
import org.signal.libsignal.protocol.logging.Log
import org.whispersystems.signalservice.api.crypto.DigestingOutputStream
import org.whispersystems.signalservice.api.crypto.SkippingOutputStream
import org.whispersystems.signalservice.api.messages.AttachmentTransferProgress

2
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection.java
View File

@ -6,7 +6,7 @@ import org.signal.network.websocket.WebSocketMessage;
import org.signal.network.websocket.WebsocketResponse;
import org.jetbrains.annotations.NotNull;
import org.signal.libsignal.protocol.logging.Log;
import org.signal.core.util.logging.Log;
import org.whispersystems.signalservice.api.push.TrustStore;
import org.signal.network.exceptions.NonSuccessfulResponseCodeException;
import org.whispersystems.signalservice.api.util.CredentialsProvider;