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

Add a core-util-jvm module.

Browse source 
This is basically a location where we can put common utils that can also
be imported by libsignal-service (which is java-only, no android
dependency).
This commit is contained in:
Greyson Parrelli 2023-10-04 22:21:20 -04:00 • committed by Nicholas Tinsley
parent 6be1413d7d
commit 7d5786ea93
115 changed files with 323 additions and 591 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
View file

@ -90,8 +90,6 @@ import org.thoughtcrime.securesms.util.AppForegroundObserver;
import org.thoughtcrime.securesms.util.AppStartup;
import org.thoughtcrime.securesms.util.DynamicTheme;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.PowerManagerCompat;
import org.thoughtcrime.securesms.util.ServiceUtil;
import org.thoughtcrime.securesms.util.SignalLocalMetrics;
import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
@ -288,7 +286,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
@VisibleForTesting
protected void initializeLogging() {
org.signal.core.util.logging.Log.initialize(FeatureFlags::internalUser, new AndroidLogger(), new PersistentLogger(this));
Log.initialize(FeatureFlags::internalUser, new AndroidLogger(), new PersistentLogger(this));
SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());

1
app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java
View file

@ -6,7 +6,6 @@ import android.content.Intent;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import android.transition.TransitionInflater;
import android.view.View;

2
app/src/main/java/org/thoughtcrime/securesms/BaseActivity.java
View file

@ -5,7 +5,6 @@ import android.content.Intent;
import android.content.res.Configuration;
import android.os.Bundle;
import android.view.View;
import android.view.WindowManager;
import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
@ -18,7 +17,6 @@ import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.util.AppStartup;
import org.thoughtcrime.securesms.util.ConfigurationUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.WindowUtil;
import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;

2
app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java
View file

@ -5,13 +5,11 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.Vibrator;
import android.text.TextUtils;
import android.transition.TransitionInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;

1
app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
View file

@ -21,7 +21,6 @@ import android.app.KeyguardManager;
import android.content.Context;
import android.content.Intent;
import android.graphics.PorterDuff;
import android.os.Build;
import android.os.Bundle;
import android.text.Editable;
import android.text.InputType;

2
app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
View file

@ -53,8 +53,8 @@ import org.greenrobot.eventbus.ThreadMode;
import org.signal.core.util.ThreadUtil;
import org.signal.core.util.concurrent.LifecycleDisposable;
import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log;
import org.signal.libsignal.protocol.IdentityKey;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.components.TooltipPopup;
import org.thoughtcrime.securesms.components.sensors.DeviceOrientationMonitor;
import org.thoughtcrime.securesms.components.webrtc.CallLinkInfoSheet;

3
app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
View file

@ -5,13 +5,11 @@ import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.drawable.Drawable;
import android.text.SpannableStringBuilder;
import android.text.style.CharacterStyle;
import android.util.AttributeSet;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import org.signal.core.util.BreakIteratorCompat;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.emoji.SimpleEmojiTextView;
@ -20,7 +18,6 @@ import org.thoughtcrime.securesms.util.ContextUtil;
import org.thoughtcrime.securesms.util.SpanUtil;
import org.thoughtcrime.securesms.util.ViewUtil;
import java.util.Iterator;
import java.util.Objects;
public class FromTextView extends SimpleEmojiTextView {

1
app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
View file

@ -37,7 +37,6 @@ import org.thoughtcrime.securesms.util.ViewUtil;
import java.lang.reflect.Field;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.TimeUnit;
/**
* LinearLayout that, when a view container, will report back when it thinks a soft keyboard

1
app/src/main/java/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
View file

@ -1,7 +1,6 @@
package org.thoughtcrime.securesms.components;
import android.annotation.TargetApi;
import android.content.ContentUris;
import android.content.Context;
import android.database.Cursor;

1
app/src/main/java/org/thoughtcrime/securesms/components/TooltipPopup.java
View file

@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.components;
import android.content.Context;
import android.graphics.PorterDuff;
import android.os.Build;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

5
app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
View file

@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.components;
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.util.AttributeSet;
import android.view.MotionEvent;
@ -10,13 +9,9 @@ import android.view.View;
import android.widget.FrameLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.exifinterface.media.ExifInterface;
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.engine.GlideException;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.davemorrissey.labs.subscaleview.ImageSource;
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;

4
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
View file

@ -6,7 +6,6 @@ import android.graphics.ColorMatrixColorFilter;
import android.graphics.Point;
import android.graphics.Rect;
import android.os.Build;
import android.os.Looper;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
@ -26,7 +25,6 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.ConstraintSet;
import androidx.constraintlayout.widget.Guideline;
import androidx.core.util.Consumer;
import androidx.core.util.Preconditions;
import androidx.core.view.ViewKt;
import androidx.core.view.WindowInsetsCompat;
import androidx.recyclerview.widget.DefaultItemAnimator;
@ -74,8 +72,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import kotlin.concurrent.ThreadsKt;
public class WebRtcCallView extends ConstraintLayout {
private static final String TAG = Log.tag(WebRtcCallView.class);

1
app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java
View file

@ -11,7 +11,6 @@ import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;
import androidx.appcompat.app.AlertDialog;
import com.annimon.stream.Stream;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View file

@ -58,8 +58,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.core.content.ContextCompat;
import androidx.lifecycle.LifecycleOwner;
import androidx.media3.common.MediaItem;
import androidx.recyclerview.widget.ConcatAdapter;
import androidx.recyclerview.widget.ConversationLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;

1
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemBodyBubble.java
View file

@ -12,7 +12,6 @@ import androidx.annotation.Nullable;
import com.annimon.stream.Collectors;
import com.annimon.stream.Stream;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.components.Outliner;
import org.thoughtcrime.securesms.util.Projection;
import org.thoughtcrime.securesms.util.Util;

10
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java
View file

@ -1,7 +1,6 @@
package org.thoughtcrime.securesms.conversation;
import android.content.Context;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.annotation.WorkerThread;
@ -9,10 +8,7 @@ import androidx.annotation.WorkerThread;
import org.signal.core.util.StreamUtil;
import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery;
import org.thoughtcrime.securesms.database.DatabaseObserver;
import org.thoughtcrime.securesms.database.MessageTable;
import org.thoughtcrime.securesms.database.RecipientTable;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.ThreadTable;
import org.thoughtcrime.securesms.database.model.GroupRecord;
@ -23,13 +19,8 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.mms.PartAuthority;
import org.thoughtcrime.securesms.mms.TextSlide;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.recipients.RecipientUtil;
import org.thoughtcrime.securesms.util.BubbleUtil;
import org.thoughtcrime.securesms.util.ConversationUtil;
import org.thoughtcrime.securesms.util.MessageRecordUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.signalservice.api.push.ServiceId;
import java.io.IOException;
@ -40,7 +31,6 @@ import java.util.Optional;
import java.util.stream.Collectors;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.Single;
import io.reactivex.rxjava3.schedulers.Schedulers;

1
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
View file

@ -137,7 +137,6 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.events.ReminderUpdateEvent;
import org.thoughtcrime.securesms.exporter.flow.SmsExportDialogs;
import org.thoughtcrime.securesms.groups.SelectionLimits;
import org.thoughtcrime.securesms.jobs.MessageFetchJob;
import org.thoughtcrime.securesms.jobs.ServiceOutageDetectionJob;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity;

1
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
View file

@ -61,7 +61,6 @@ import org.thoughtcrime.securesms.components.FromTextView;
import org.thoughtcrime.securesms.components.TypingIndicatorView;
import org.thoughtcrime.securesms.components.emoji.EmojiStrings;
import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
import org.thoughtcrime.securesms.components.emoji.SimpleEmojiTextView;
import org.thoughtcrime.securesms.contacts.paged.ContactSearchData;
import org.thoughtcrime.securesms.conversation.MessageStyler;
import org.thoughtcrime.securesms.conversationlist.model.ConversationSet;

1
app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java
View file

@ -5,7 +5,6 @@ import androidx.annotation.NonNull;
import org.signal.core.util.logging.Log;
import org.signal.libsignal.protocol.InvalidKeyIdException;
import org.signal.libsignal.protocol.state.PreKeyRecord;
import org.signal.libsignal.protocol.state.PreKeyStore;
import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
import org.signal.libsignal.protocol.state.SignedPreKeyStore;
import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;

1
app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV2ProcessingLock.java
View file

@ -10,7 +10,6 @@ import org.thoughtcrime.securesms.util.FeatureFlags;
import java.io.Closeable;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
public final class GroupsV2ProcessingLock {

1
app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java
View file

@ -1,7 +1,6 @@
package org.thoughtcrime.securesms.jobmanager.impl;
import android.app.Application;
import android.content.Context;
import android.os.Build;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
View file

@ -8,7 +8,6 @@ import org.signal.libsignal.protocol.state.SignalProtocolStore;
import org.thoughtcrime.securesms.crypto.PreKeyUtil;
import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.keyvalue.SignalStore;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/ConversationShortcutUpdateJob.java
View file

@ -8,7 +8,6 @@ import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.ThreadTable;
import org.thoughtcrime.securesms.database.model.ThreadRecord;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.transport.RetryLaterException;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/EmojiSearchIndexDownloadJob.java
View file

@ -9,7 +9,6 @@ import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.model.EmojiSearchData;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.keyvalue.EmojiValues;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java
View file

@ -35,7 +35,6 @@ import org.thoughtcrime.securesms.PlayServicesProblemActivity;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.gcm.FcmUtil;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.keyvalue.SignalStore;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/MarkerJob.java
View file

@ -4,7 +4,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
/**

1
app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
View file

@ -9,7 +9,6 @@ import org.thoughtcrime.securesms.database.RecipientTable;
import org.thoughtcrime.securesms.database.RecipientTable.RecipientReader;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.net.NotPushRegisteredException;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceKeysUpdateJob.java
View file

@ -7,7 +7,6 @@ import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.keyvalue.SignalStore;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileContentUpdateJob.java
View file

@ -6,7 +6,6 @@ import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.net.NotPushRegisteredException;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
View file

@ -9,7 +9,6 @@ import org.signal.libsignal.zkgroup.profiles.ProfileKey;
import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.net.NotPushRegisteredException;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
View file

@ -9,7 +9,6 @@ import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.StickerTable.StickerPackRecordReader;
import org.thoughtcrime.securesms.database.model.StickerPackRecord;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.net.NotPushRegisteredException;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceStorageSyncRequestJob.java
View file

@ -6,7 +6,6 @@ import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.net.NotPushRegisteredException;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/ProfileUploadJob.java
View file

@ -5,7 +5,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.keyvalue.SignalStore;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/RemoteDeleteSendJob.java
View file

@ -37,7 +37,6 @@ import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedExcept
import java.io.IOException;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
public class RemoteDeleteSendJob extends BaseJob {

1
app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
View file

@ -41,7 +41,6 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.recipients.RecipientUtil;
import org.thoughtcrime.securesms.transport.RetryLaterException;
import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.IdentityUtil;
import org.thoughtcrime.securesms.util.ProfileUtil;
import org.thoughtcrime.securesms.util.Util;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
View file

@ -5,7 +5,6 @@ import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.keyvalue.CertificateType;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java
View file

@ -7,7 +7,6 @@ import org.greenrobot.eventbus.EventBus;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.BuildConfig;
import org.thoughtcrime.securesms.events.ReminderUpdateEvent;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.transport.RetryLaterException;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/StorageAccountRestoreJob.java
View file

@ -6,7 +6,6 @@ import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.JobManager;
import org.thoughtcrime.securesms.jobmanager.JobTracker;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/StorageForcePushJob.java
View file

@ -11,7 +11,6 @@ import org.thoughtcrime.securesms.database.RecipientTable;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.UnknownStorageIdTable;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.keyvalue.SignalStore;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/SubscriptionKeepAliveJob.java
View file

@ -6,7 +6,6 @@ import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.keyvalue.SignalStore;

1
app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java
View file

@ -16,7 +16,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.BuildConfig;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.service.UpdateApkReadyListener;

10
app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.kt
View file

@ -47,23 +47,23 @@ class PersistentLogger(
}.start()
}
override fun v(tag: String?, message: String?, t: Throwable?, keepLonger: Boolean) {
override fun v(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
write(LOG_V, tag, message, t, keepLonger)
}
override fun d(tag: String?, message: String?, t: Throwable?, keepLonger: Boolean) {
override fun d(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
write(LOG_D, tag, message, t, keepLonger)
}
override fun i(tag: String?, message: String?, t: Throwable?, keepLonger: Boolean) {
override fun i(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
write(LOG_I, tag, message, t, keepLonger)
}
override fun w(tag: String?, message: String?, t: Throwable?, keepLonger: Boolean) {
override fun w(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
write(LOG_W, tag, message, t, keepLonger)
}
override fun e(tag: String?, message: String?, t: Throwable?, keepLonger: Boolean) {
override fun e(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
write(LOG_E, tag, message, t, keepLonger)
}

1
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java
View file

@ -1,6 +1,5 @@
package org.thoughtcrime.securesms.mediasend;
import android.annotation.TargetApi;
import android.content.ContentUris;
import android.content.Context;
import android.database.Cursor;

1
app/src/main/java/org/thoughtcrime/securesms/mediasend/camerax/CameraXUtil.java
View file

@ -1,7 +1,6 @@
package org.thoughtcrime.securesms.mediasend.camerax;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;

1
app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
View file

@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.provider.Settings;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

2
app/src/main/java/org/thoughtcrime/securesms/megaphone/PinsForAllSchedule.java
View file

@ -3,9 +3,7 @@ package org.thoughtcrime.securesms.megaphone;
import androidx.annotation.VisibleForTesting;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import java.util.Locale;
import java.util.concurrent.TimeUnit;

1
app/src/main/java/org/thoughtcrime/securesms/migrations/MigrationJob.java
View file

@ -4,7 +4,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.JobLogger;
import org.thoughtcrime.securesms.jobmanager.impl.BackoffUtil;

1
app/src/main/java/org/thoughtcrime/securesms/migrations/PniAccountInitializationMigrationJob.java
View file

@ -5,7 +5,6 @@ import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.signal.libsignal.protocol.state.PreKeyRecord;
import org.signal.libsignal.protocol.state.SignalProtocolStore;
import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
import org.thoughtcrime.securesms.crypto.PreKeyUtil;
import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore;

2
app/src/main/java/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java
View file

@ -16,11 +16,9 @@
*/
package org.thoughtcrime.securesms.mms;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.Intent;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.os.Bundle;
import android.telephony.SmsManager;
import android.text.TextUtils;

2
app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java
View file

@ -17,8 +17,6 @@ import org.thoughtcrime.securesms.util.BitmapUtil;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.MemoryFileDescriptor;
import org.whispersystems.signalservice.api.crypto.AttachmentCipherOutputStream;
import org.whispersystems.signalservice.internal.crypto.PaddingInputStream;
import java.io.IOException;
import java.io.InputStream;

1
app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java
View file

@ -20,7 +20,6 @@ import android.annotation.TargetApi;
import android.content.Context;
import android.content.Intent;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.os.Bundle;
import android.telephony.SmsManager;

1
app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
View file

@ -10,7 +10,6 @@ import androidx.annotation.NonNull;
import com.annimon.stream.Collectors;
import com.annimon.stream.Stream;
import org.signal.core.util.Stopwatch;
import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.MessageTable.ExpirationInfo;

1
app/src/main/java/org/thoughtcrime/securesms/payments/confirm/ConfirmPaymentFragment.java
View file

@ -1,7 +1,6 @@
package org.thoughtcrime.securesms.payments.confirm;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;

1
app/src/main/java/org/thoughtcrime/securesms/payments/create/CreatePaymentViewModel.java
View file

@ -26,7 +26,6 @@ import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
import org.thoughtcrime.securesms.util.livedata.Store;
import org.whispersystems.signalservice.api.payments.FormatterOptions;
import org.whispersystems.signalservice.api.payments.Money;
import org.whispersystems.signalservice.api.util.OptionalUtil;
import java.io.IOException;
import java.math.BigDecimal;

2
app/src/main/java/org/thoughtcrime/securesms/preferences/BackupsPreferenceFragment.java
View file

@ -2,14 +2,12 @@ package org.thoughtcrime.securesms.preferences;
import android.Manifest;
import android.app.Activity;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.text.format.DateFormat;
import android.text.method.LinkMovementMethod;
import android.util.TimeUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

1
app/src/main/java/org/thoughtcrime/securesms/profiles/manage/ManageProfileFragment.java
View file

@ -41,7 +41,6 @@ import org.thoughtcrime.securesms.profiles.manage.ManageProfileViewModel.AvatarS
import org.thoughtcrime.securesms.recipients.Recipient;
import org.signal.core.util.concurrent.LifecycleDisposable;
import org.thoughtcrime.securesms.util.NameUtil;
import org.thoughtcrime.securesms.util.UsernameUtil;
import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;

1
app/src/main/java/org/thoughtcrime/securesms/ratelimit/RateLimitUtil.java
View file

@ -8,7 +8,6 @@ import androidx.annotation.WorkerThread;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.JsonJobData;
import org.thoughtcrime.securesms.jobs.PushGroupSendJob;
import org.thoughtcrime.securesms.jobs.IndividualSendJob;

1
app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsConversationView.java
View file

@ -15,7 +15,6 @@ import androidx.core.content.ContextCompat;
import com.annimon.stream.Stream;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.emoji.EmojiImageView;
import org.thoughtcrime.securesms.components.emoji.EmojiUtil;

1
app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientId.java
View file

@ -19,7 +19,6 @@ import org.thoughtcrime.securesms.util.DelimiterUtil;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.signalservice.api.push.ServiceId;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.util.UuidUtil;
import java.util.ArrayList;
import java.util.Collection;

1
app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientUtil.java
View file

@ -21,7 +21,6 @@ import org.thoughtcrime.securesms.groups.GroupChangeException;
import org.thoughtcrime.securesms.groups.GroupChangeFailedException;
import org.thoughtcrime.securesms.groups.GroupManager;
import org.thoughtcrime.securesms.jobs.MultiDeviceBlockedUpdateJob;
import org.thoughtcrime.securesms.jobs.MultiDeviceMessageRequestResponseJob;
import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob;
import org.thoughtcrime.securesms.jobs.RotateProfileKeyJob;
import org.thoughtcrime.securesms.keyvalue.SignalStore;

1
app/src/main/java/org/thoughtcrime/securesms/registration/PushChallengeRequest.java
View file

@ -7,7 +7,6 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.whispersystems.signalservice.api.SignalServiceAccountManager;
import java.io.IOException;

1
app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationNavigationActivity.java
View file

@ -7,7 +7,6 @@ import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.lifecycle.ViewModelProvider;
import org.signal.core.util.logging.Log;

1
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseRegistrationLockFragment.java
View file

@ -10,7 +10,6 @@ import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.CallSuper;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

1
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java
View file

@ -50,7 +50,6 @@ import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
import org.thoughtcrime.securesms.database.NoExternalStorageException;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.jobmanager.impl.DataRestoreConstraint;
import org.thoughtcrime.securesms.jobmanager.impl.DataRestoreConstraintObserver;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.notifications.NotificationChannels;
import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;

1
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/WelcomeFragment.java
View file

@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.registration.fragments;
import android.Manifest;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;

1
app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
View file

@ -12,7 +12,6 @@ import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.NotificationCompat;
import androidx.core.content.ContextCompat;
import org.signal.core.util.PendingIntentFlags;
import org.signal.core.util.logging.Log;

1
app/src/main/java/org/thoughtcrime/securesms/service/PendingRetryReceiptManager.java
View file

@ -16,7 +16,6 @@ import org.thoughtcrime.securesms.database.PendingRetryReceiptCache;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.model.PendingRetryReceiptModel;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.util.FeatureFlags;
import java.util.concurrent.TimeUnit;

1
app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java
View file

@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.service;
import android.content.Context;
import android.content.Intent;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.BuildConfig;

1
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/DeviceAwareActionProcessor.java
View file

@ -1,7 +1,6 @@
package org.thoughtcrime.securesms.service.webrtc;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.components.webrtc.BroadcastVideoSink;

1
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupActionProcessor.java
View file

@ -24,7 +24,6 @@ import org.webrtc.PeerConnection;
import org.webrtc.VideoTrack;
import org.whispersystems.signalservice.api.messages.calls.OfferMessage;
import org.whispersystems.signalservice.api.push.ServiceId.ACI;
import org.whispersystems.signalservice.api.push.ServiceId;
import java.util.ArrayList;
import java.util.Collection;

1
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupPreJoinActionProcessor.java
View file

@ -21,7 +21,6 @@ import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceStateBuilder
import org.thoughtcrime.securesms.util.NetworkUtil;
import org.whispersystems.signalservice.api.messages.calls.OfferMessage;
import org.whispersystems.signalservice.api.push.ServiceId.ACI;
import org.whispersystems.signalservice.api.push.ServiceId;
import java.util.List;

2
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/IncomingGroupCallActionProcessor.java
View file

@ -25,10 +25,8 @@ import org.thoughtcrime.securesms.service.webrtc.state.WebRtcServiceState;
import org.thoughtcrime.securesms.util.NetworkUtil;
import org.thoughtcrime.securesms.webrtc.locks.LockManager;
import org.whispersystems.signalservice.api.push.ServiceId.ACI;
import org.whispersystems.signalservice.api.push.ServiceId;
import java.util.Optional;
import java.util.UUID;
import static org.thoughtcrime.securesms.webrtc.CallNotificationBuilder.TYPE_INCOMING_CONNECTING;
import static org.thoughtcrime.securesms.webrtc.CallNotificationBuilder.TYPE_INCOMING_RINGING;

1
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java
View file

@ -61,7 +61,6 @@ import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import static org.thoughtcrime.securesms.service.webrtc.WebRtcData.AnswerMetadata;
import static org.thoughtcrime.securesms.service.webrtc.WebRtcData.HangupMetadata;

1
app/src/main/java/org/thoughtcrime/securesms/storage/AccountRecordProcessor.java
View file

@ -9,7 +9,6 @@ import org.signal.core.util.StringUtil;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
import org.whispersystems.signalservice.api.storage.SignalAccountRecord.PinnedConversation;
import org.whispersystems.signalservice.api.util.OptionalUtil;

2
app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java
View file

@ -11,10 +11,8 @@ import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.whispersystems.signalservice.api.push.ServiceId.ACI;
import org.whispersystems.signalservice.api.push.ServiceId.PNI;
import org.whispersystems.signalservice.api.push.ServiceId;
import org.whispersystems.signalservice.api.storage.SignalContactRecord;
import org.whispersystems.signalservice.api.util.OptionalUtil;
import org.whispersystems.signalservice.internal.storage.protos.ContactRecord.IdentityState;

1
app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
View file

@ -23,7 +23,6 @@ import org.thoughtcrime.securesms.payments.Entropy;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.subscription.Subscriber;
import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.signalservice.api.push.UsernameLinkComponents;

2
app/src/main/java/org/thoughtcrime/securesms/util/AlarmSleepTimer.java
View file

@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.util;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.app.Service;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@ -11,7 +10,6 @@ import android.os.Build;
import android.os.SystemClock;
import androidx.core.app.AlarmManagerCompat;
import androidx.core.content.ContextCompat;
import org.signal.core.util.PendingIntentFlags;
import org.signal.core.util.logging.Log;

1
app/src/main/java/org/thoughtcrime/securesms/util/DynamicTheme.java
View file

@ -11,7 +11,6 @@ import androidx.appcompat.app.AppCompatDelegate;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.keyvalue.SettingsValues;
import org.thoughtcrime.securesms.keyvalue.SettingsValues.Theme;
import org.thoughtcrime.securesms.keyvalue.SignalStore;

3
app/src/main/java/org/thoughtcrime/securesms/util/FullscreenHelper.java
View file

@ -12,9 +12,6 @@ import androidx.core.graphics.Insets;
import androidx.core.view.DisplayCutoutCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.core.view.WindowInsetsControllerCompat;
import org.signal.core.util.logging.Log;
/**
* Encapsulates logic to properly show/hide system UI/chrome in a full screen setting. Also

1
app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
View file

@ -10,7 +10,6 @@ import android.net.Uri;
import android.os.Build;
import android.os.Environment;
import android.provider.MediaStore;
import android.text.TextUtils;
import android.webkit.MimeTypeMap;
import android.widget.Toast;

1
app/src/main/java/org/thoughtcrime/securesms/util/Util.java
View file

@ -17,7 +17,6 @@
package org.thoughtcrime.securesms.util;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.ActivityManager;
import android.content.ClipData;
import android.content.ClipboardManager;

2
app/src/main/java/org/thoughtcrime/securesms/util/adapter/mapping/LayoutFactory.java
View file

@ -7,8 +7,6 @@ import android.view.ViewGroup;
import androidx.annotation.LayoutRes;
import androidx.annotation.NonNull;
import org.signal.core.util.logging.Log;
import java.util.function.Function;

1
app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java
View file

@ -39,7 +39,6 @@ import androidx.media3.exoplayer.source.DefaultMediaSourceFactory;
import androidx.media3.exoplayer.source.MediaSource;
import androidx.media3.ui.AspectRatioFrameLayout;
import androidx.media3.ui.LegacyPlayerControlView;
import androidx.media3.ui.PlayerControlView;
import androidx.media3.ui.PlayerView;
import org.signal.core.util.logging.Log;

1
app/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsExtractor.java
View file

@ -12,7 +12,6 @@ import androidx.annotation.RequiresApi;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.media.MediaInput;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;

1
app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java
View file

@ -8,7 +8,6 @@ import android.media.MediaPlayer;
import android.net.Uri;
import android.os.Build;
import android.os.Vibrator;
import android.provider.Settings;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

1
app/src/test/java/org/thoughtcrime/securesms/groups/v2/ProfileKeySetTest.java
View file

@ -6,7 +6,6 @@ import org.signal.libsignal.zkgroup.profiles.ProfileKey;
import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
import org.thoughtcrime.securesms.testutil.LogRecorder;
import org.whispersystems.signalservice.api.push.ServiceId.ACI;
import org.whispersystems.signalservice.api.push.ServiceId;
import java.util.Collections;
import java.util.UUID;

1
app/src/test/java/org/thoughtcrime/securesms/storage/StorageSyncHelperTest.java
View file

@ -13,7 +13,6 @@ import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.storage.StorageSyncHelper.IdDifferenceResult;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.whispersystems.signalservice.api.push.ServiceId;
import org.whispersystems.signalservice.api.push.ServiceId.ACI;
import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
import org.whispersystems.signalservice.api.storage.SignalContactRecord;

8
build.gradle
View file

@ -65,7 +65,9 @@ subprojects {
}
}
if (project.name != "Signal-Android" && project.name != "libsignal-service" && project.name != "lintchecks" && !project.name.endsWith("-app") && project.name != "benchmark") {
def skipQa = [ 'Signal-Android', 'libsignal-service', 'lintchecks', 'benchmark', 'core-util-jvm', 'logging' ] as Set
if (!skipQa.contains(project.name) && !project.name.endsWith("-app")) {
task qa {
group 'Verification'
description 'Quality Assurance. Run before pushing'
@ -93,7 +95,9 @@ task qa {
':libsignal-service:test',
':libsignal-service:ktlintCheck',
':Signal-Android:assemblePlayProdRelease',
':Signal-Android:compilePlayProdInstrumentationAndroidTestSources'
':Signal-Android:compilePlayProdInstrumentationAndroidTestSources',
':core-util-jvm:test',
':core-util-jvm:ktlintCheck'
}
task clean(type: Delete) {

1
core-util-jvm/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/build

21
core-util-jvm/build.gradle.kts Normal file
View file

@ -0,0 +1,21 @@
/*
* Copyright 2023 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
val signalJavaVersion: JavaVersion by rootProject.extra
plugins {
id("java-library")
id("org.jetbrains.kotlin.jvm")
id("ktlint")
}
java {
sourceCompatibility = signalJavaVersion
targetCompatibility = signalJavaVersion
}
dependencies {
testImplementation(testLibs.junit.junit)
}

5
core-util/src/main/java/org/signal/core/util/Bitmask.java → core-util-jvm/src/main/java/org/signal/core/util/Bitmask.java
View file

@ -1,3 +1,8 @@
/*
* Copyright 2023 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.signal.core.util;
import java.util.Locale;

0
core-util/src/main/java/org/signal/core/util/ByteExtensions.kt → core-util-jvm/src/main/java/org/signal/core/util/ByteExtensions.kt
View file

0
core-util/src/main/java/org/signal/core/util/DoubleExtensions.kt → core-util-jvm/src/main/java/org/signal/core/util/DoubleExtensions.kt
View file

0
core-util/src/main/java/org/signal/core/util/FloatExtensions.kt → core-util-jvm/src/main/java/org/signal/core/util/FloatExtensions.kt
View file

18
core-util/src/main/java/org/signal/core/util/Hex.java → core-util-jvm/src/main/java/org/signal/core/util/Hex.java
View file

@ -1,18 +1,6 @@
/**
* Copyright (C) 2011 Whisper Systems
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
/*
* Copyright 2023 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.signal.core.util;

5
core-util/src/main/java/org/signal/core/util/OptionalExtensions.kt → core-util-jvm/src/main/java/org/signal/core/util/OptionalExtensions.kt
View file

@ -1,3 +1,8 @@
/*
* Copyright 2023 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.signal.core.util
import java.util.Optional

5
core-util/src/main/java/org/signal/core/util/SetUtil.java → core-util-jvm/src/main/java/org/signal/core/util/SetUtil.java
View file

@ -1,3 +1,8 @@
/*
* Copyright 2023 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.signal.core.util;
import java.util.Arrays;

5
core-util/src/main/java/org/signal/core/util/Stopwatch.kt → core-util-jvm/src/main/java/org/signal/core/util/Stopwatch.kt
View file

@ -1,3 +1,8 @@
/*
* Copyright 2023 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.signal.core.util
import org.signal.core.util.logging.Log

48
core-util-jvm/src/main/java/org/signal/core/util/logging/CompoundLogger.kt Normal file
View file

@ -0,0 +1,48 @@
/*
* Copyright 2023 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.signal.core.util.logging
/**
* A way to treat N loggers as one. Wraps a bunch of other loggers and forwards the method calls to
* all of them.
*/
internal class CompoundLogger(private val loggers: List<Log.Logger>) : Log.Logger() {
override fun v(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
for (logger in loggers) {
logger.v(tag, message, t, keepLonger)
}
}
override fun d(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
for (logger in loggers) {
logger.d(tag, message, t, keepLonger)
}
}
override fun i(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
for (logger in loggers) {
logger.i(tag, message, t, keepLonger)
}
}
override fun w(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
for (logger in loggers) {
logger.w(tag, message, t, keepLonger)
}
}
override fun e(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
for (logger in loggers) {
logger.e(tag, message, t, keepLonger)
}
}
override fun flush() {
for (logger in loggers) {
logger.flush()
}
}
}

168
core-util-jvm/src/main/java/org/signal/core/util/logging/Log.kt Normal file
View file

@ -0,0 +1,168 @@
/*
* Copyright 2023 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.signal.core.util.logging
object Log {
private val NOOP_LOGGER: Logger = NoopLogger()
private var internalCheck: InternalCheck? = null
private var logger: Logger = NoopLogger()
/**
* @param internalCheck A checker that will indicate if this is an internal user
* @param loggers A list of loggers that will be given every log statement.
*/
@JvmStatic
fun initialize(internalCheck: InternalCheck?, vararg loggers: Logger) {
Log.internalCheck = internalCheck
logger = CompoundLogger(loggers.toList())
}
@JvmStatic
fun initialize(vararg loggers: Logger) {
initialize({ false }, *loggers)
}
@JvmStatic
fun v(tag: String, message: String) = v(tag, message, null)
@JvmStatic
fun v(tag: String, t: Throwable?) = v(tag, null, t)
@JvmStatic
fun v(tag: String, message: String?, t: Throwable?) = v(tag, message, t, false)
@JvmStatic
fun v(tag: String, message: String?, keepLonger: Boolean) = v(tag, message, null, keepLonger)
@JvmStatic
fun v(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = logger.v(tag, message, t, keepLonger)
@JvmStatic
fun d(tag: String, message: String) = d(tag, message, null)
@JvmStatic
fun d(tag: String, t: Throwable?) = d(tag, null, t)
@JvmStatic
fun d(tag: String, message: String?, t: Throwable? = null) = d(tag, message, t, false)
@JvmStatic
fun d(tag: String, message: String?, keepLonger: Boolean) = d(tag, message, null, keepLonger)
@JvmStatic
fun d(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = logger.d(tag, message, t, keepLonger)
@JvmStatic
fun i(tag: String, message: String) = i(tag, message, null)
@JvmStatic
fun i(tag: String, t: Throwable?) = i(tag, null, t)
@JvmStatic
fun i(tag: String, message: String?, t: Throwable? = null) = i(tag, message, t, false)
@JvmStatic
fun i(tag: String, message: String?, keepLonger: Boolean) = i(tag, message, null, keepLonger)
@JvmStatic
fun i(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = logger.i(tag, message, t, keepLonger)
@JvmStatic
fun w(tag: String, message: String) = w(tag, message, null)
@JvmStatic
fun w(tag: String, t: Throwable?) = w(tag, null, t)
@JvmStatic
fun w(tag: String, message: String?, t: Throwable? = null) = w(tag, message, t, false)
@JvmStatic
fun w(tag: String, message: String?, keepLonger: Boolean) = logger.w(tag, message, keepLonger)
@JvmStatic
fun w(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) {
logger.w(tag, message, t, keepLonger)
}
@JvmStatic
fun e(tag: String, message: String) = e(tag, message, null)
@JvmStatic
fun e(tag: String, t: Throwable?) = e(tag, null, t)
@JvmStatic
fun e(tag: String, message: String?, t: Throwable? = null) = e(tag, message, t, false)
@JvmStatic
fun e(tag: String, message: String?, keepLonger: Boolean) = e(tag, message, null, keepLonger)
@JvmStatic
fun e(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = logger.e(tag, message, t, keepLonger)
@JvmStatic
fun tag(clazz: Class<*>): String {
val simpleName = clazz.simpleName
return if (simpleName.length > 23) {
simpleName.substring(0, 23)
} else {
simpleName
}
}
/**
* Important: This is not something that can be used to log PII. Instead, it's intended use is for
* logs that might be too verbose or otherwise unnecessary for public users.
*
* @return The normal logger if this is an internal user, or a no-op logger if it isn't.
*/
@JvmStatic
fun internal(): Logger {
return if (internalCheck!!.isInternal()) {
logger
} else {
NOOP_LOGGER
}
}
@JvmStatic
fun blockUntilAllWritesFinished() {
logger.flush()
}
abstract class Logger {
abstract fun v(tag: String, message: String?, t: Throwable?, keepLonger: Boolean)
abstract fun d(tag: String, message: String?, t: Throwable?, keepLonger: Boolean)
abstract fun i(tag: String, message: String?, t: Throwable?, keepLonger: Boolean)
abstract fun w(tag: String, message: String?, t: Throwable?, keepLonger: Boolean)
abstract fun e(tag: String, message: String?, t: Throwable?, keepLonger: Boolean)
abstract fun flush()
fun v(tag: String, message: String?) = v(tag, message, null)
fun v(tag: String, message: String?, t: Throwable?) = v(tag, message, t, false)
fun v(tag: String, message: String?, keepLonger: Boolean) = v(tag, message, null, keepLonger)
fun d(tag: String, message: String?) = d(tag, message, null)
fun d(tag: String, message: String?, t: Throwable?) = d(tag, message, t, false)
fun d(tag: String, message: String?, keepLonger: Boolean) = d(tag, message, null, keepLonger)
fun i(tag: String, message: String?) = i(tag, message, null)
fun i(tag: String, message: String?, t: Throwable?) = i(tag, message, t, false)
fun i(tag: String, message: String?, keepLonger: Boolean) = i(tag, message, null, keepLonger)
fun w(tag: String, message: String?) = w(tag, message, null)
fun w(tag: String, message: String?, t: Throwable?) = w(tag, message, t, false)
fun w(tag: String, message: String?, keepLonger: Boolean) = w(tag, message, null, keepLonger)
fun e(tag: String, message: String?) = e(tag, message, null)
fun e(tag: String, message: String?, t: Throwable?) = e(tag, message, t, false)
fun e(tag: String, message: String?, keepLonger: Boolean) = e(tag, message, null, keepLonger)
}
fun interface InternalCheck {
fun isInternal(): Boolean
}
}

Some files were not shown because too many files have changed in this diff Show more