TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-29 12:39:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Raise deployment target and migrate to AndroidX

Browse Source
This commit is contained in:
nielsandriesse
2020-08-19 10:06:26 +10:00
parent 6e2cbb23cc
commit 96736a8095
763 changed files with 1733 additions and 1848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import android.text.TextUtils;
import org.greenrobot.eventbus.EventBus;
@@ -18,7 +18,6 @@ import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.mms.MmsException;
import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.util.AttachmentUtil;
import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.Hex;

2
src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.greenrobot.eventbus.EventBus;
import org.thoughtcrime.securesms.attachments.Attachment;

3
src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.graphics.Bitmap;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.GroupDatabase;
@@ -14,7 +14,6 @@ import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.mms.AttachmentStreamUriLoader.AttachmentModel;
import org.thoughtcrime.securesms.util.BitmapDecodingException;
import org.thoughtcrime.securesms.util.BitmapUtil;
import org.thoughtcrime.securesms.util.GroupUtil;
import org.thoughtcrime.securesms.util.Hex;
import org.whispersystems.libsignal.InvalidMessageException;
import org.whispersystems.libsignal.util.guava.Optional;

2
src/org/thoughtcrime/securesms/jobs/BaseJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.JobLogger;

2
src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.jobmanager.Job;

2
src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.content.Context;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
import org.thoughtcrime.securesms.crypto.PreKeyUtil;

4
src/org/thoughtcrime/securesms/jobs/FastJobStorage.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.annimon.stream.Stream;

2
src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.app.Application;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.jobmanager.Constraint;
import org.thoughtcrime.securesms.jobmanager.ConstraintObserver;

2
src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
View File

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs;
import android.Manifest;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.backup.BackupPassphrase;
import org.thoughtcrime.securesms.backup.FullBackupExporter;

4
src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
View File

@@ -1,8 +1,8 @@
package org.thoughtcrime.securesms.jobs;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.android.mms.pdu_alt.CharacterSets;
import com.google.android.mms.pdu_alt.EncodedStringValue;

2
src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java
View File

@@ -4,7 +4,7 @@ import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.logging.Log;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.Pair;
import com.google.android.mms.pdu_alt.GenericPdu;

3
src/org/thoughtcrime/securesms/jobs/MmsSendJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.content.Context;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import android.webkit.MimeTypeMap;
@@ -36,7 +36,6 @@ import org.thoughtcrime.securesms.mms.MmsException;
import org.thoughtcrime.securesms.mms.MmsSendResult;
import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
import org.thoughtcrime.securesms.mms.PartAuthority;
import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.transport.InsecureFallbackApprovalException;
import org.thoughtcrime.securesms.transport.UndeliverableMessageException;

2
src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.database.DatabaseFactory;

2
src/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.dependencies.InjectableType;

4
src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
View File

@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.jobs;
import android.content.Context;
import android.net.Uri;
import android.provider.ContactsContract;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.contacts.ContactAccessor.ContactData;

4
src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.database.Address;

2
src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.jobmanager.Job;

2
src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import com.annimon.stream.Stream;
import com.fasterxml.jackson.annotation.JsonProperty;

2
src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.dependencies.InjectableType;
import org.thoughtcrime.securesms.jobmanager.Data;

2
src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.dependencies.InjectableType;
import org.thoughtcrime.securesms.jobmanager.Data;

2
src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.database.Address;
import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus;

2
src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.content.Context;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.jobmanager.Job;

8
src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
View File

@@ -5,10 +5,10 @@ import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationManagerCompat;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat;
import android.text.TextUtils;
import android.util.Pair;

6
src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
View File

@@ -1,9 +1,9 @@
package org.thoughtcrime.securesms.jobs;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.WorkerThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;
import com.annimon.stream.Collectors;
import com.annimon.stream.Stream;

2
src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.database.Address;

4
src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
View File

@@ -1,8 +1,8 @@
package org.thoughtcrime.securesms.jobs;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.WorkerThread;
import androidx.annotation.NonNull;
import androidx.annotation.WorkerThread;
import com.annimon.stream.Stream;

2
src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.content.Context;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.dependencies.InjectableType;
import org.thoughtcrime.securesms.jobmanager.Data;

2
src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.annotation.SuppressLint;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.database.Address;
import org.thoughtcrime.securesms.database.DatabaseFactory;

5
src/org/thoughtcrime/securesms/jobs/PushSendJob.java
View File

@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.jobs;
import android.content.Context;
import android.graphics.Bitmap;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import com.annimon.stream.Stream;
@@ -24,7 +24,6 @@ import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
import org.thoughtcrime.securesms.mms.PartAuthority;
import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.BitmapDecodingException;

2
src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.Log;
import org.thoughtcrime.securesms.ApplicationContext;

2
src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.jobmanager.Data;

2
src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.dependencies.InjectableType;
import org.thoughtcrime.securesms.jobmanager.Data;

2
src/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
import org.thoughtcrime.securesms.dependencies.InjectableType;

2
src/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.database.Address;

2
src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
View File

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs;
import android.app.Application;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import org.thoughtcrime.securesms.database.Address;

2
src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
View File

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs;
import android.app.Application;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import org.thoughtcrime.securesms.ApplicationContext;

2
src/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
View File

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs;
import android.content.Context;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.dependencies.InjectableType;
import org.thoughtcrime.securesms.jobmanager.Data;

4
src/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;

2
src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;

2
src/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.database.Address;

4
src/org/thoughtcrime/securesms/jobs/SendJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import network.loki.messenger.BuildConfig;
import org.thoughtcrime.securesms.TextSecureExpiredException;

2
src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.database.Address;

2
src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.greenrobot.eventbus.EventBus;
import org.thoughtcrime.securesms.events.ReminderUpdateEvent;

5
src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.telephony.SmsMessage;
import org.thoughtcrime.securesms.ApplicationContext;
@@ -13,7 +13,6 @@ import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MessagingDatabase.InsertResult;
import org.thoughtcrime.securesms.database.SmsDatabase;
import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.sms.IncomingTextMessage;
import org.thoughtcrime.securesms.util.Base64;

3
src/org/thoughtcrime/securesms/jobs/SmsSendJob.java
View File

@@ -5,7 +5,7 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.telephony.PhoneNumberUtils;
import android.telephony.SmsManager;
@@ -19,7 +19,6 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.NoSuchMessageException;
import org.thoughtcrime.securesms.database.SmsDatabase;
import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.service.SmsDeliveryListener;
import org.thoughtcrime.securesms.transport.UndeliverableMessageException;

3
src/org/thoughtcrime/securesms/jobs/SmsSentJob.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.jobs;
import android.app.Activity;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.telephony.SmsManager;
import org.thoughtcrime.securesms.jobmanager.Data;
@@ -13,7 +13,6 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.NoSuchMessageException;
import org.thoughtcrime.securesms.database.SmsDatabase;
import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.service.SmsDeliveryListener;
public class SmsSentJob extends BaseJob {

2
src/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.StickerDatabase;

2
src/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.ApplicationContext;
import org.thoughtcrime.securesms.database.DatabaseFactory;

2
src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
View File

@@ -16,7 +16,7 @@
*/
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.jobmanager.Data;

2
src/org/thoughtcrime/securesms/jobs/TypingSendJob.java
View File

@@ -1,6 +1,6 @@
package org.thoughtcrime.securesms.jobs;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import com.annimon.stream.Stream;

4
src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java
View File

@@ -8,8 +8,8 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.fasterxml.jackson.annotation.JsonProperty;