From 54da77a89b9017e1e192579f4992c41e0dd71f46 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Fri, 12 Mar 2021 15:23:29 +1100 Subject: [PATCH] clean --- .../attachments/DatabaseAttachmentProvider.kt | 3 +- .../conversation/ConversationActivity.java | 6 +- .../conversation/ConversationFragment.java | 3 +- .../storage/SignalProtocolStoreImpl.java | 21 -- .../database/ContentValuesBuilder.java | 59 ----- .../securesms/database/MmsDatabase.java | 10 +- .../securesms/database/Storage.kt | 6 +- .../securesms/database/XmlBackup.java | 245 ------------------ .../SignalCommunicationModule.java | 5 - .../securesms/jobs/PushDecryptJob.java | 4 +- .../linkpreview/LinkPreviewRepository.java | 1 - .../loki/protocol/ClosedGroupsProtocolV2.kt | 4 - .../AndroidAutoReplyReceiver.java | 2 +- .../notifications/RemoteReplyReceiver.java | 2 +- .../service/ExpiringMessageManager.java | 2 +- .../transport/RetryLaterException.java | 9 - .../UndeliverableMessageException.java | 12 - .../signal}/IncomingMediaMessage.java | 2 +- .../OutgoingExpirationUpdateMessage.java | 2 +- .../signal}/OutgoingGroupMediaMessage.java | 2 +- .../signal}/OutgoingMediaMessage.java | 36 +-- .../signal}/OutgoingSecureMediaMessage.java | 2 +- 22 files changed, 23 insertions(+), 415 deletions(-) delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalProtocolStoreImpl.java delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/database/ContentValuesBuilder.java delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/database/XmlBackup.java delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/transport/RetryLaterException.java delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/transport/UndeliverableMessageException.java rename {app/src/main/java/org/thoughtcrime/securesms/mms => libsession/src/main/java/org/session/libsession/messaging/messages/signal}/IncomingMediaMessage.java (98%) rename {app/src/main/java/org/thoughtcrime/securesms/mms => libsession/src/main/java/org/session/libsession/messaging/messages/signal}/OutgoingExpirationUpdateMessage.java (94%) rename {app/src/main/java/org/thoughtcrime/securesms/mms => libsession/src/main/java/org/session/libsession/messaging/messages/signal}/OutgoingGroupMediaMessage.java (98%) rename {app/src/main/java/org/thoughtcrime/securesms/mms => libsession/src/main/java/org/session/libsession/messaging/messages/signal}/OutgoingMediaMessage.java (81%) rename {app/src/main/java/org/thoughtcrime/securesms/mms => libsession/src/main/java/org/session/libsession/messaging/messages/signal}/OutgoingSecureMediaMessage.java (96%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt index b65366f94c..85c3acbe49 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt @@ -22,7 +22,6 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper import org.thoughtcrime.securesms.events.PartProgressEvent import org.thoughtcrime.securesms.mms.MediaConstraints import org.thoughtcrime.securesms.mms.PartAuthority -import org.thoughtcrime.securesms.transport.UndeliverableMessageException import org.thoughtcrime.securesms.util.MediaUtil import java.io.IOException import java.io.InputStream @@ -157,7 +156,7 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper) val resized = constraints.getResizedMedia(context, attachment) attachmentDatabase.updateAttachmentData(attachment, resized) } else { - throw UndeliverableMessageException("Size constraints could not be met!") + throw Exception("Size constraints could not be met!") } } catch (e: Exception) { return null diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 9fc5aacf48..ca14153ed3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -158,9 +158,9 @@ import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.mms.ImageSlide; import org.thoughtcrime.securesms.mms.MediaConstraints; import org.thoughtcrime.securesms.mms.MmsException; -import org.thoughtcrime.securesms.mms.OutgoingExpirationUpdateMessage; -import org.thoughtcrime.securesms.mms.OutgoingMediaMessage; -import org.thoughtcrime.securesms.mms.OutgoingSecureMediaMessage; +import org.session.libsession.messaging.messages.signal.OutgoingExpirationUpdateMessage; +import org.session.libsession.messaging.messages.signal.OutgoingMediaMessage; +import org.session.libsession.messaging.messages.signal.OutgoingSecureMediaMessage; import org.thoughtcrime.securesms.mms.QuoteId; import org.thoughtcrime.securesms.mms.Slide; import org.thoughtcrime.securesms.mms.SlideDeck; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java index 54a1a57c8c..0d30b8ce97 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -59,7 +59,6 @@ import com.annimon.stream.Stream; import org.session.libsession.messaging.messages.visible.Quote; import org.session.libsession.messaging.messages.visible.VisibleMessage; -import org.session.libsession.messaging.opengroups.OpenGroup; import org.session.libsession.messaging.opengroups.OpenGroupAPI; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.MessageDetailsActivity; @@ -81,7 +80,7 @@ import org.session.libsignal.utilities.logging.Log; import org.thoughtcrime.securesms.longmessage.LongMessageActivity; import org.thoughtcrime.securesms.mediasend.Media; import org.thoughtcrime.securesms.mms.GlideApp; -import org.thoughtcrime.securesms.mms.OutgoingMediaMessage; +import org.session.libsession.messaging.messages.signal.OutgoingMediaMessage; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.mms.Slide; import org.thoughtcrime.securesms.permissions.Permissions; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalProtocolStoreImpl.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalProtocolStoreImpl.java deleted file mode 100644 index 0b36e7ec44..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalProtocolStoreImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.thoughtcrime.securesms.crypto.storage; - -import android.content.Context; - -import org.session.libsignal.libsignal.IdentityKeyPair; -import org.session.libsignal.libsignal.state.IdentityKeyStore; -import org.session.libsession.utilities.IdentityKeyUtil; - -public class SignalProtocolStoreImpl implements IdentityKeyStore { - - private final Context context; - - public SignalProtocolStoreImpl(Context context) { - this.context = context; - } - - @Override - public IdentityKeyPair getIdentityKeyPair() { - return IdentityKeyUtil.getIdentityKeyPair(context); - } -} diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ContentValuesBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/database/ContentValuesBuilder.java deleted file mode 100644 index 87c161fea3..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ContentValuesBuilder.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * 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 . - */ -package org.thoughtcrime.securesms.database; - -import android.content.ContentValues; - -import com.google.android.mms.pdu_alt.EncodedStringValue; - -import org.session.libsession.utilities.Util; - -public class ContentValuesBuilder { - - private final ContentValues contentValues; - - public ContentValuesBuilder(ContentValues contentValues) { - this.contentValues = contentValues; - } - - public void add(String key, String charsetKey, EncodedStringValue value) { - if (value != null) { - contentValues.put(key, Util.toIsoString(value.getTextString())); - contentValues.put(charsetKey, value.getCharacterSet()); - } - } - - public void add(String contentKey, byte[] value) { - if (value != null) { - contentValues.put(contentKey, Util.toIsoString(value)); - } - } - - public void add(String contentKey, int b) { - if (b != 0) - contentValues.put(contentKey, b); - } - - public void add(String contentKey, long value) { - if (value != -1L) - contentValues.put(contentKey, value); - } - - public ContentValues getContentValues() { - return contentValues; - } -} diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java index c7cd8a269b..6e8b85a2d3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java @@ -46,12 +46,12 @@ import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.NotificationMmsMessageRecord; import org.thoughtcrime.securesms.database.model.Quote; import org.thoughtcrime.securesms.jobs.TrimThreadJob; -import org.thoughtcrime.securesms.mms.IncomingMediaMessage; +import org.session.libsession.messaging.messages.signal.IncomingMediaMessage; import org.thoughtcrime.securesms.mms.MmsException; -import org.thoughtcrime.securesms.mms.OutgoingExpirationUpdateMessage; -import org.thoughtcrime.securesms.mms.OutgoingGroupMediaMessage; -import org.thoughtcrime.securesms.mms.OutgoingMediaMessage; -import org.thoughtcrime.securesms.mms.OutgoingSecureMediaMessage; +import org.session.libsession.messaging.messages.signal.OutgoingExpirationUpdateMessage; +import org.session.libsession.messaging.messages.signal.OutgoingGroupMediaMessage; +import org.session.libsession.messaging.messages.signal.OutgoingMediaMessage; +import org.session.libsession.messaging.messages.signal.OutgoingSecureMediaMessage; import org.thoughtcrime.securesms.mms.SlideDeck; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index 4ce1ac8356..6a0d42777d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -36,9 +36,9 @@ import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities import org.thoughtcrime.securesms.loki.utilities.get import org.thoughtcrime.securesms.loki.utilities.getString -import org.thoughtcrime.securesms.mms.IncomingMediaMessage -import org.thoughtcrime.securesms.mms.OutgoingGroupMediaMessage -import org.thoughtcrime.securesms.mms.OutgoingMediaMessage +import org.session.libsession.messaging.messages.signal.IncomingMediaMessage +import org.session.libsession.messaging.messages.signal.OutgoingGroupMediaMessage +import org.session.libsession.messaging.messages.signal.OutgoingMediaMessage import org.thoughtcrime.securesms.mms.PartAuthority import org.session.libsession.messaging.messages.signal.IncomingGroupMessage import org.session.libsession.messaging.messages.signal.IncomingTextMessage diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/XmlBackup.java b/app/src/main/java/org/thoughtcrime/securesms/database/XmlBackup.java deleted file mode 100644 index a206825a01..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/database/XmlBackup.java +++ /dev/null @@ -1,245 +0,0 @@ -package org.thoughtcrime.securesms.database; - -import android.text.TextUtils; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlPullParserFactory; - -import java.io.BufferedWriter; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileWriter; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Locale; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class XmlBackup { - - private static final String PROTOCOL = "protocol"; - private static final String ADDRESS = "address"; - private static final String CONTACT_NAME = "contact_name"; - private static final String DATE = "date"; - private static final String READABLE_DATE = "readable_date"; - private static final String TYPE = "type"; - private static final String SUBJECT = "subject"; - private static final String BODY = "body"; - private static final String SERVICE_CENTER = "service_center"; - private static final String READ = "read"; - private static final String STATUS = "status"; - private static final String TOA = "toa"; - private static final String SC_TOA = "sc_toa"; - private static final String LOCKED = "locked"; - - private static final SimpleDateFormat dateFormatter = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z"); - - private final XmlPullParser parser; - - public XmlBackup(String path) throws XmlPullParserException, FileNotFoundException { - this.parser = XmlPullParserFactory.newInstance().newPullParser(); - parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false); - parser.setInput(new FileInputStream(path), null); - } - - public XmlBackupItem getNext() throws IOException, XmlPullParserException { - while (parser.next() != XmlPullParser.END_DOCUMENT) { - if (parser.getEventType() != XmlPullParser.START_TAG) { - continue; - } - - String name = parser.getName(); - - if (!name.equalsIgnoreCase("sms")) { - continue; - } - - int attributeCount = parser.getAttributeCount(); - - if (attributeCount <= 0) { - continue; - } - - XmlBackupItem item = new XmlBackupItem(); - - for (int i=0;i"; - private static final String CREATED_BY = ""; - private static final String OPEN_TAG_SMSES = ""; - private static final String CLOSE_TAG_SMSES = ""; - private static final String OPEN_TAG_SMS = " void appendAttribute(StringBuilder stringBuilder, String name, T value) { - stringBuilder.append(name).append(OPEN_ATTRIBUTE).append(value).append(CLOSE_ATTRIBUTE); - } - - public void close() throws IOException { - bufferedWriter.newLine(); - bufferedWriter.write(CLOSE_TAG_SMSES); - bufferedWriter.close(); - } - - private String escapeXML(String s) { - if (TextUtils.isEmpty(s)) return s; - - Matcher matcher = PATTERN.matcher( s.replace("&", "&") - .replace("<", "<") - .replace(">", ">") - .replace("\"", """) - .replace("'", "'")); - StringBuffer st = new StringBuffer(); - - while (matcher.find()) { - String escaped=""; - for (char ch: matcher.group(0).toCharArray()) { - escaped += ("&#" + ((int) ch) + ";"); - } - matcher.appendReplacement(st, escaped); - } - matcher.appendTail(st); - return st.toString(); - } - - } -} diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java b/app/src/main/java/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java index e7d6f33e7d..f9d7fa6834 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java +++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java @@ -3,17 +3,12 @@ package org.thoughtcrime.securesms.dependencies; import android.content.Context; import org.session.libsignal.service.api.SignalServiceMessageReceiver; -import org.thoughtcrime.securesms.ApplicationContext; -import org.thoughtcrime.securesms.crypto.storage.SignalProtocolStoreImpl; -import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob; import org.thoughtcrime.securesms.jobs.AvatarDownloadJob; import org.thoughtcrime.securesms.jobs.PushDecryptJob; import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob; import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository; -import org.thoughtcrime.securesms.loki.api.SessionProtocolImpl; import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment; -import org.session.libsession.utilities.TextSecurePreferences; import dagger.Module; import dagger.Provides; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptJob.java index 6f32459c3d..6ab83939bf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptJob.java @@ -59,9 +59,9 @@ import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocolV2; import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol; import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol; import org.thoughtcrime.securesms.loki.utilities.MentionManagerUtilities; -import org.thoughtcrime.securesms.mms.IncomingMediaMessage; +import org.session.libsession.messaging.messages.signal.IncomingMediaMessage; import org.thoughtcrime.securesms.mms.MmsException; -import org.thoughtcrime.securesms.mms.OutgoingMediaMessage; +import org.session.libsession.messaging.messages.signal.OutgoingMediaMessage; import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.session.libsession.messaging.messages.signal.IncomingEncryptedMessage; import org.session.libsession.messaging.messages.signal.IncomingTextMessage; diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java index 467a7bed20..eae25110b0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java @@ -12,7 +12,6 @@ import com.google.android.gms.common.util.IOUtils; import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress; import org.session.libsession.utilities.MediaTypes; import org.thoughtcrime.securesms.ApplicationContext; -import org.thoughtcrime.securesms.database.AttachmentDatabase; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.session.libsignal.utilities.logging.Log; import org.thoughtcrime.securesms.net.CallRequestController; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt index 3b9a745154..d2b0ad11aa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt @@ -6,7 +6,6 @@ import com.google.protobuf.ByteString import org.session.libsignal.libsignal.ecc.DjbECPrivateKey import org.session.libsignal.libsignal.ecc.DjbECPublicKey import org.session.libsignal.libsignal.ecc.ECKeyPair -import org.session.libsignal.libsignal.util.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage @@ -19,9 +18,6 @@ import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager.ClosedGroupOperation import org.thoughtcrime.securesms.loki.api.SessionProtocolImpl import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase -import org.thoughtcrime.securesms.mms.OutgoingGroupMediaMessage -import org.session.libsession.messaging.messages.signal.IncomingGroupMessage -import org.session.libsession.messaging.messages.signal.IncomingTextMessage import org.session.libsession.messaging.sending_receiving.MessageSender import org.session.libsession.messaging.sending_receiving.generateAndSendNewEncryptionKeyPair import org.session.libsession.messaging.sending_receiving.pendingKeyPair diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java index c4dd4f5203..4aacc56cac 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java @@ -32,7 +32,7 @@ import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo; import org.thoughtcrime.securesms.mms.MmsException; -import org.thoughtcrime.securesms.mms.OutgoingMediaMessage; +import org.session.libsession.messaging.messages.signal.OutgoingMediaMessage; import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.messages.signal.OutgoingTextMessage; import org.session.libsignal.utilities.logging.Log; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java index 4ae3463f32..f49f5893e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java @@ -34,7 +34,7 @@ import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo; import org.thoughtcrime.securesms.mms.MmsException; -import org.thoughtcrime.securesms.mms.OutgoingMediaMessage; +import org.session.libsession.messaging.messages.signal.OutgoingMediaMessage; import org.session.libsession.messaging.threads.recipients.Recipient; import java.util.Collections; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java index 9232d7b135..77eee247cd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java @@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MmsDatabase; import org.thoughtcrime.securesms.database.SmsDatabase; import org.thoughtcrime.securesms.database.model.MessageRecord; -import org.thoughtcrime.securesms.mms.IncomingMediaMessage; +import org.session.libsession.messaging.messages.signal.IncomingMediaMessage; import org.thoughtcrime.securesms.mms.MmsException; import java.util.Comparator; diff --git a/app/src/main/java/org/thoughtcrime/securesms/transport/RetryLaterException.java b/app/src/main/java/org/thoughtcrime/securesms/transport/RetryLaterException.java deleted file mode 100644 index 626bbafcdf..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/transport/RetryLaterException.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.thoughtcrime.securesms.transport; - -public class RetryLaterException extends Exception { - public RetryLaterException() {} - - public RetryLaterException(Exception e) { - super(e); - } -} diff --git a/app/src/main/java/org/thoughtcrime/securesms/transport/UndeliverableMessageException.java b/app/src/main/java/org/thoughtcrime/securesms/transport/UndeliverableMessageException.java deleted file mode 100644 index 49e0f743dc..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/transport/UndeliverableMessageException.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.thoughtcrime.securesms.transport; - -public class UndeliverableMessageException extends Exception { - - public UndeliverableMessageException(String detailMessage) { - super(detailMessage); - } - - public UndeliverableMessageException(Throwable throwable) { - super(throwable); - } -} diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java similarity index 98% rename from app/src/main/java/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java rename to libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java index 7c1451056f..aa330ce227 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/IncomingMediaMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.mms; +package org.session.libsession.messaging.messages.signal; import org.session.libsession.messaging.messages.visible.VisibleMessage; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingExpirationUpdateMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingExpirationUpdateMessage.java similarity index 94% rename from app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingExpirationUpdateMessage.java rename to libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingExpirationUpdateMessage.java index 59f100cc0f..77996ba11e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingExpirationUpdateMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingExpirationUpdateMessage.java @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.mms; +package org.session.libsession.messaging.messages.signal; import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingGroupMediaMessage.java similarity index 98% rename from app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java rename to libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingGroupMediaMessage.java index e5c66d4923..45f6531608 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingGroupMediaMessage.java @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.mms; +package org.session.libsession.messaging.messages.signal; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java similarity index 81% rename from app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java rename to libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java index 7921506622..8d818d956c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java @@ -1,8 +1,7 @@ -package org.thoughtcrime.securesms.mms; +package org.session.libsession.messaging.messages.signal; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import android.text.TextUtils; import org.session.libsession.messaging.messages.visible.VisibleMessage; import org.session.libsession.messaging.threads.DistributionTypes; @@ -59,20 +58,6 @@ public class OutgoingMediaMessage { this.identityKeyMismatches.addAll(identityKeyMismatches); } - public OutgoingMediaMessage(Recipient recipient, SlideDeck slideDeck, String message, - long sentTimeMillis, int subscriptionId, long expiresIn, - int distributionType, @Nullable QuoteModel outgoingQuote, - @NonNull List contacts, - @NonNull List linkPreviews) - { - this(recipient, - buildMessage(message), - slideDeck.asAttachments(), - sentTimeMillis, subscriptionId, - expiresIn, distributionType, outgoingQuote, - contacts, linkPreviews, new LinkedList<>(), new LinkedList<>()); - } - public OutgoingMediaMessage(OutgoingMediaMessage that) { this.recipient = that.getRecipient(); this.body = that.body; @@ -116,10 +101,6 @@ public class OutgoingMediaMessage { return attachments; } - public int getDistributionType() { - return distributionType; - } - public boolean isSecure() { return true; } @@ -156,19 +137,4 @@ public class OutgoingMediaMessage { return linkPreviews; } - public @NonNull List getNetworkFailures() { - return networkFailures; - } - - public @NonNull List getIdentityKeyMismatches() { - return identityKeyMismatches; - } - - private static String buildMessage(String message) { - if (!TextUtils.isEmpty(message)) { - return message; - } - return ""; - } - } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingSecureMediaMessage.java similarity index 96% rename from app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java rename to libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingSecureMediaMessage.java index 527f7bdd0e..8b5e7ddef0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingSecureMediaMessage.java @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.mms; +package org.session.libsession.messaging.messages.signal; import androidx.annotation.NonNull; import androidx.annotation.Nullable;