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

Move files

Browse Source
This commit is contained in:
Niels Andriesse
2021-05-18 16:03:47 +10:00
parent ab83e49f93
commit 4078a9c4b5
128 changed files with 210 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsession/src/main/java/org/session/libsession/messaging/avatars/AvatarHelper.java → libsession/src/main/java/org/session/libsession/avatars/AvatarHelper.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.messaging.avatars;
package org.session.libsession.avatars;
import android.content.Context;

2
libsession/src/main/java/org/session/libsession/messaging/avatars/ContactColors.java → libsession/src/main/java/org/session/libsession/avatars/ContactColors.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.messaging.avatars;
package org.session.libsession.avatars;
import androidx.annotation.NonNull;

2
libsession/src/main/java/org/session/libsession/messaging/avatars/ContactPhoto.java → libsession/src/main/java/org/session/libsession/avatars/ContactPhoto.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.messaging.avatars;
package org.session.libsession.avatars;
import android.content.Context;
import android.net.Uri;

2
libsession/src/main/java/org/session/libsession/messaging/avatars/FallbackContactPhoto.java → libsession/src/main/java/org/session/libsession/avatars/FallbackContactPhoto.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.messaging.avatars;
package org.session.libsession.avatars;
import android.content.Context;
import android.graphics.drawable.Drawable;

2
libsession/src/main/java/org/session/libsession/messaging/avatars/GeneratedContactPhoto.java → libsession/src/main/java/org/session/libsession/avatars/GeneratedContactPhoto.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.messaging.avatars;
package org.session.libsession.avatars;
import android.content.Context;
import android.graphics.Color;

6
libsession/src/main/java/org/session/libsession/messaging/avatars/GroupRecordContactPhoto.java → libsession/src/main/java/org/session/libsession/avatars/GroupRecordContactPhoto.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.messaging.avatars;
package org.session.libsession.avatars;
import android.content.Context;
import android.net.Uri;
@@ -7,9 +7,9 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.session.libsession.messaging.MessagingModuleConfiguration;
import org.session.libsession.messaging.StorageProtocol;
import org.session.libsession.database.StorageProtocol;
import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.threads.GroupRecord;
import org.session.libsession.utilities.GroupRecord;
import org.session.libsession.utilities.Conversions;
import org.session.libsignal.utilities.guava.Optional;

2
libsession/src/main/java/org/session/libsession/messaging/avatars/ProfileContactPhoto.java → libsession/src/main/java/org/session/libsession/avatars/ProfileContactPhoto.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.messaging.avatars;
package org.session.libsession.avatars;
import android.content.Context;
import android.net.Uri;

2
libsession/src/main/java/org/session/libsession/messaging/avatars/ResourceContactPhoto.java → libsession/src/main/java/org/session/libsession/avatars/ResourceContactPhoto.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.messaging.avatars;
package org.session.libsession.avatars;
import android.content.Context;
import android.graphics.Color;

2
libsession/src/main/java/org/session/libsession/messaging/avatars/SystemContactPhoto.java → libsession/src/main/java/org/session/libsession/avatars/SystemContactPhoto.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.messaging.avatars;
package org.session.libsession.avatars;
import android.content.Context;
import android.net.Uri;

2
libsession/src/main/java/org/session/libsession/messaging/avatars/TransparentContactPhoto.java → libsession/src/main/java/org/session/libsession/avatars/TransparentContactPhoto.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.messaging.avatars;
package org.session.libsession.avatars;
import android.content.Context;
import android.graphics.drawable.Drawable;

6
libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt → libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt
View File

@@ -1,4 +1,4 @@
package org.session.libsession.messaging
package org.session.libsession.database
import android.content.Context
@@ -17,8 +17,8 @@ import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAt
import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview
import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel
import org.session.libsession.messaging.threads.Address
import org.session.libsession.messaging.threads.GroupRecord
import org.session.libsession.messaging.threads.recipients.Recipient.RecipientSettings
import org.session.libsession.utilities.GroupRecord
import org.session.libsession.utilities.recipients.Recipient.RecipientSettings
import org.session.libsignal.crypto.ecc.ECKeyPair
import org.session.libsignal.messages.SignalServiceAttachmentPointer
import org.session.libsignal.messages.SignalServiceGroup

11
libsession/src/main/java/org/session/libsession/messaging/MessagingModuleConfiguration.kt
View File

@@ -2,19 +2,20 @@ package org.session.libsession.messaging
import android.content.Context
import org.session.libsession.database.MessageDataProvider
import org.session.libsession.database.StorageProtocol
class MessagingModuleConfiguration(
val context: Context,
val storage: StorageProtocol,
val messageDataProvider: MessageDataProvider
val context: Context,
val storage: StorageProtocol,
val messageDataProvider: MessageDataProvider
) {
companion object {
lateinit var shared: MessagingModuleConfiguration
fun configure(context: Context,
storage: StorageProtocol,
messageDataProvider: MessageDataProvider
storage: StorageProtocol,
messageDataProvider: MessageDataProvider
) {
if (Companion::shared.isInitialized) { return }
shared = MessagingModuleConfiguration(context, storage, messageDataProvider)

2
libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt
View File

@@ -3,7 +3,7 @@ package org.session.libsession.messaging.messages.control
import com.google.protobuf.ByteString
import org.session.libsession.messaging.MessagingModuleConfiguration
import org.session.libsession.messaging.threads.Address
import org.session.libsession.messaging.threads.recipients.Recipient
import org.session.libsession.utilities.recipients.Recipient
import org.session.libsession.utilities.GroupUtil
import org.session.libsignal.crypto.ecc.DjbECPrivateKey
import org.session.libsignal.crypto.ecc.DjbECPublicKey

4
libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingExpirationUpdateMessage.java
View File

@@ -1,8 +1,8 @@
package org.session.libsession.messaging.messages.signal;
import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
import org.session.libsession.messaging.threads.DistributionTypes;
import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsession.utilities.DistributionTypes;
import org.session.libsession.utilities.recipients.Recipient;
import java.util.Collections;
import java.util.LinkedList;

4
libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingGroupMediaMessage.java
View File

@@ -3,12 +3,12 @@ package org.session.libsession.messaging.messages.signal;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.session.libsession.messaging.threads.DistributionTypes;
import org.session.libsession.utilities.DistributionTypes;
import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsession.utilities.recipients.Recipient;
import java.util.LinkedList;
import java.util.List;

8
libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java
View File

@@ -4,14 +4,14 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.session.libsession.messaging.messages.visible.VisibleMessage;
import org.session.libsession.messaging.threads.DistributionTypes;
import org.session.libsession.database.documents.IdentityKeyMismatch;
import org.session.libsession.database.documents.NetworkFailure;
import org.session.libsession.utilities.DistributionTypes;
import org.session.libsession.utilities.IdentityKeyMismatch;
import org.session.libsession.utilities.NetworkFailure;
import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsession.utilities.recipients.Recipient;
import java.util.Collections;
import java.util.LinkedList;

2
libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingSecureMediaMessage.java
View File

@@ -7,7 +7,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment
import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsession.utilities.recipients.Recipient;
import java.util.Collections;
import java.util.List;

2
libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.java
View File

@@ -2,7 +2,7 @@ package org.session.libsession.messaging.messages.signal;
import org.session.libsession.messaging.messages.visible.OpenGroupInvitation;
import org.session.libsession.messaging.messages.visible.VisibleMessage;
import org.session.libsession.messaging.threads.recipients.Recipient;
import org.session.libsession.utilities.recipients.Recipient;
import org.session.libsession.messaging.utilities.UpdateMessageData;
public class OutgoingTextMessage {

2
libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt
View File

@@ -5,7 +5,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration
import org.session.libsession.messaging.messages.Message
import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment
import org.session.libsession.messaging.threads.Address
import org.session.libsession.messaging.threads.recipients.Recipient
import org.session.libsession.utilities.recipients.Recipient
import org.session.libsession.utilities.GroupUtil
import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.utilities.Log

4
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
View File

@@ -14,8 +14,8 @@ import org.session.libsession.messaging.sending_receiving.link_preview.LinkPrevi
import org.session.libsession.messaging.sending_receiving.notifications.PushNotificationAPI
import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel
import org.session.libsession.messaging.threads.Address
import org.session.libsession.messaging.threads.GroupRecord
import org.session.libsession.messaging.threads.recipients.Recipient
import org.session.libsession.utilities.GroupRecord
import org.session.libsession.utilities.recipients.Recipient
import org.session.libsession.utilities.GroupUtil
import org.session.libsession.utilities.SSKEnvironment
import org.session.libsession.utilities.TextSecurePreferences

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/MessageNotifier.kt
View File

@@ -1,7 +1,7 @@
package org.session.libsession.messaging.sending_receiving.notifications
import android.content.Context
import org.session.libsession.messaging.threads.recipients.Recipient
import org.session.libsession.utilities.recipients.Recipient
interface MessageNotifier {
fun setVisibleThread(threadId: Long)

2
libsession/src/main/java/org/session/libsession/messaging/threads/DistributionTypes.kt → libsession/src/main/java/org/session/libsession/utilities/DistributionTypes.kt
View File

@@ -1,4 +1,4 @@
package org.session.libsession.messaging.threads
package org.session.libsession.utilities
object DistributionTypes {
const val DEFAULT = 2

2
libsession/src/main/java/org/session/libsession/database/documents/Document.java → libsession/src/main/java/org/session/libsession/utilities/Document.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.database.documents;
package org.session.libsession.utilities;
import java.util.List;

4
libsession/src/main/java/org/session/libsession/messaging/threads/GroupRecord.kt → libsession/src/main/java/org/session/libsession/utilities/GroupRecord.kt
View File

@@ -1,7 +1,7 @@
package org.session.libsession.messaging.threads
package org.session.libsession.utilities
import android.text.TextUtils
import org.session.libsession.utilities.GroupUtil
import org.session.libsession.messaging.threads.Address
import java.io.IOException
import java.util.*

2
libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java → libsession/src/main/java/org/session/libsession/utilities/IdentityKeyMismatch.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.database.documents;
package org.session.libsession.utilities;
import org.session.libsignal.utilities.Log;

2
libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatchList.java → libsession/src/main/java/org/session/libsession/utilities/IdentityKeyMismatchList.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.database.documents;
package org.session.libsession.utilities;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;

2
libsession/src/main/java/org/session/libsession/database/documents/NetworkFailure.java → libsession/src/main/java/org/session/libsession/utilities/NetworkFailure.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.database.documents;
package org.session.libsession.utilities;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;

2
libsession/src/main/java/org/session/libsession/database/documents/NetworkFailureList.java → libsession/src/main/java/org/session/libsession/utilities/NetworkFailureList.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.database.documents;
package org.session.libsession.utilities;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;

2
libsession/src/main/java/org/session/libsession/utilities/ProfilePictureModifiedEvent.kt
View File

@@ -1,5 +1,5 @@
package org.session.libsession.utilities
import org.session.libsession.messaging.threads.recipients.Recipient
import org.session.libsession.utilities.recipients.Recipient
data class ProfilePictureModifiedEvent(val recipient: Recipient)

2
libsession/src/main/java/org/session/libsession/utilities/SSKEnvironment.kt
View File

@@ -4,7 +4,7 @@ import android.content.Context
import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate
import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier
import org.session.libsession.messaging.threads.Address
import org.session.libsession.messaging.threads.recipients.Recipient
import org.session.libsession.utilities.recipients.Recipient
class SSKEnvironment(
val typingIndicators: TypingIndicatorsProtocol,

18
libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java → libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java
View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.session.libsession.messaging.threads.recipients;
package org.session.libsession.utilities.recipients;
import android.content.Context;
import android.graphics.drawable.Drawable;
@@ -29,20 +29,20 @@ import com.annimon.stream.function.Consumer;
import org.greenrobot.eventbus.EventBus;
import org.session.libsession.messaging.MessagingModuleConfiguration;
import org.session.libsession.messaging.avatars.TransparentContactPhoto;
import org.session.libsession.avatars.TransparentContactPhoto;
import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.threads.GroupRecord;
import org.session.libsession.messaging.threads.recipients.RecipientProvider.RecipientDetails;
import org.session.libsession.utilities.GroupRecord;
import org.session.libsession.utilities.recipients.RecipientProvider.RecipientDetails;
import org.session.libsession.utilities.TextSecurePreferences;
import org.session.libsession.utilities.Util;
import org.session.libsession.utilities.color.MaterialColor;
import org.session.libsignal.utilities.Log;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsession.messaging.avatars.ContactColors;
import org.session.libsession.messaging.avatars.ContactPhoto;
import org.session.libsession.messaging.avatars.GroupRecordContactPhoto;
import org.session.libsession.messaging.avatars.ProfileContactPhoto;
import org.session.libsession.messaging.avatars.SystemContactPhoto;
import org.session.libsession.avatars.ContactColors;
import org.session.libsession.avatars.ContactPhoto;
import org.session.libsession.avatars.GroupRecordContactPhoto;
import org.session.libsession.avatars.ProfileContactPhoto;
import org.session.libsession.avatars.SystemContactPhoto;
import org.session.libsession.utilities.ProfilePictureModifiedEvent;
import org.session.libsession.utilities.FutureTaskListener;
import org.session.libsession.utilities.ListenableFutureTask;

2
libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientExporter.java → libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientExporter.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.messaging.threads.recipients;
package org.session.libsession.utilities.recipients;
import android.content.Intent;
import android.provider.ContactsContract;

2
libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientFormattingException.java → libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientFormattingException.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.session.libsession.messaging.threads.recipients;
package org.session.libsession.utilities.recipients;
public class RecipientFormattingException extends Exception {
public RecipientFormattingException(String message) {

2
libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientModifiedListener.java → libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientModifiedListener.java
View File

@@ -1,4 +1,4 @@
package org.session.libsession.messaging.threads.recipients;
package org.session.libsession.utilities.recipients;
public interface RecipientModifiedListener {

12
libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientProvider.java → libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientProvider.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.session.libsession.messaging.threads.recipients;
package org.session.libsession.utilities.recipients;
import android.content.Context;
import android.net.Uri;
@@ -27,11 +27,11 @@ import org.session.libsession.messaging.MessagingModuleConfiguration;
import org.session.libsignal.utilities.guava.Optional;
import org.session.libsession.utilities.color.MaterialColor;
import org.session.libsession.messaging.threads.Address;
import org.session.libsession.messaging.threads.GroupRecord;
import org.session.libsession.messaging.threads.recipients.Recipient.RecipientSettings;
import org.session.libsession.messaging.threads.recipients.Recipient.RegisteredState;
import org.session.libsession.messaging.threads.recipients.Recipient.UnidentifiedAccessMode;
import org.session.libsession.messaging.threads.recipients.Recipient.VibrateState;
import org.session.libsession.utilities.GroupRecord;
import org.session.libsession.utilities.recipients.Recipient.RecipientSettings;
import org.session.libsession.utilities.recipients.Recipient.RegisteredState;
import org.session.libsession.utilities.recipients.Recipient.UnidentifiedAccessMode;
import org.session.libsession.utilities.recipients.Recipient.VibrateState;
import org.session.libsession.utilities.ListenableFutureTask;
import org.session.libsession.utilities.SoftHashMap;
import org.session.libsession.utilities.TextSecurePreferences;