From c72aeed8bba4d5ca873b36b4edb2b8eda9c24ec7 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 23 Jan 2021 16:57:36 +0100 Subject: [PATCH] Extract lib module --- build.gradle.kts | 3 +- lib/build.gradle.kts | 30 ++++++++++++++++++ .../manager/AttachmentInvalidException.java | 0 .../asamk/signal/manager/AttachmentStore.java | 0 .../org/asamk/signal/manager/AvatarStore.java | 0 .../asamk/signal/manager/DeviceLinkInfo.java | 0 .../asamk/signal/manager/HandleAction.java | 0 .../asamk/signal/manager/IasTrustStore.java | 0 .../asamk/signal/manager/JsonStickerPack.java | 0 .../asamk/signal/manager/LibSignalLogger.java | 0 .../org/asamk/signal/manager/Manager.java | 0 .../manager/NotRegisteredException.java | 0 .../org/asamk/signal/manager/PathConfig.java | 0 .../signal/manager/ProvisioningManager.java | 0 .../signal/manager/RegistrationManager.java | 0 .../asamk/signal/manager/ServiceConfig.java | 0 .../manager/StickerPackInvalidException.java | 0 .../org/asamk/signal/manager/TrustLevel.java | 0 .../signal/manager/UserAlreadyExists.java | 0 .../signal/manager/WhisperTrustStore.java | 0 .../asamk/signal/manager/groups/GroupId.java | 0 .../groups/GroupIdFormatException.java | 0 .../signal/manager/groups/GroupIdV1.java | 0 .../signal/manager/groups/GroupIdV2.java | 0 .../manager/groups/GroupInviteLinkUrl.java | 0 .../manager/groups/GroupLinkPassword.java | 0 .../groups/GroupNotFoundException.java | 0 .../signal/manager/groups/GroupUtils.java | 0 .../groups/NotAGroupMemberException.java | 0 .../helper/GroupAuthorizationProvider.java | 0 .../signal/manager/helper/GroupHelper.java | 0 .../manager/helper/MessagePipeProvider.java | 0 .../helper/MessageReceiverProvider.java | 0 .../signal/manager/helper/PinHelper.java | 0 .../signal/manager/helper/ProfileHelper.java | 0 .../helper/ProfileKeyCredentialProvider.java | 0 .../manager/helper/ProfileKeyProvider.java | 0 .../manager/helper/ProfileProvider.java | 0 .../manager/helper/SelfAddressProvider.java | 0 .../helper/SelfProfileKeyProvider.java | 0 .../helper/UnidentifiedAccessHelper.java | 0 .../helper/UnidentifiedAccessProvider.java | 0 ...tifiedAccessSenderCertificateProvider.java | 0 .../signal/manager/storage/SignalAccount.java | 0 .../manager/storage/contacts/ContactInfo.java | 0 .../storage/contacts/JsonContactsStore.java | 0 .../manager/storage/groups/GroupInfo.java | 0 .../manager/storage/groups/GroupInfoV1.java | 0 .../manager/storage/groups/GroupInfoV2.java | 0 .../storage/groups/JsonGroupStore.java | 2 +- .../storage/messageCache/CachedMessage.java | 0 .../storage/messageCache/MessageCache.java | 0 .../storage/profiles/ProfileStore.java | 0 .../storage/profiles/SignalProfile.java | 0 .../storage/profiles/SignalProfileEntry.java | 0 .../storage/protocol/IdentityInfo.java | 0 .../protocol/JsonIdentityKeyStore.java | 0 .../storage/protocol/JsonPreKeyStore.java | 0 .../storage/protocol/JsonSessionStore.java | 0 .../protocol/JsonSignalProtocolStore.java | 0 .../protocol/JsonSignedPreKeyStore.java | 0 .../storage/protocol/RecipientStore.java | 0 .../manager/storage/protocol/SessionInfo.java | 0 .../SignalServiceAddressResolver.java | 0 .../manager/storage/stickers/Sticker.java | 0 .../storage/stickers/StickerStore.java | 0 .../threads/LegacyJsonThreadStore.java | 0 .../manager/storage/threads/ThreadInfo.java | 0 .../signal/manager/util/AttachmentUtils.java | 0 .../asamk/signal/manager/util/IOUtils.java | 0 .../asamk/signal/manager/util/KeyUtils.java | 8 +++-- .../manager/util/MessageCacheUtils.java | 0 .../asamk/signal/manager/util/PinHashing.java | 0 .../signal/manager/util/ProfileUtils.java | 0 .../signal/manager/util/StickerUtils.java | 0 .../org/asamk/signal/manager/util/Utils.java | 0 .../org/asamk/signal/manager/ias.store | Bin .../org/asamk/signal/manager/whisper.store | Bin settings.gradle.kts | 1 + 79 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 lib/build.gradle.kts rename {src => lib/src}/main/java/org/asamk/signal/manager/AttachmentInvalidException.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/AttachmentStore.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/AvatarStore.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/DeviceLinkInfo.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/HandleAction.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/IasTrustStore.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/JsonStickerPack.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/LibSignalLogger.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/Manager.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/NotRegisteredException.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/PathConfig.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/ProvisioningManager.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/RegistrationManager.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/ServiceConfig.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/StickerPackInvalidException.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/TrustLevel.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/UserAlreadyExists.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/WhisperTrustStore.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/groups/GroupId.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/groups/GroupIdFormatException.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/groups/GroupIdV1.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/groups/GroupIdV2.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/groups/GroupLinkPassword.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/groups/GroupNotFoundException.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/groups/GroupUtils.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/groups/NotAGroupMemberException.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/helper/GroupAuthorizationProvider.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/helper/GroupHelper.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/helper/MessagePipeProvider.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/helper/MessageReceiverProvider.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/helper/PinHelper.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/helper/ProfileHelper.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/helper/ProfileKeyCredentialProvider.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/helper/ProfileKeyProvider.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/helper/ProfileProvider.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/helper/SelfAddressProvider.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/helper/SelfProfileKeyProvider.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessProvider.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessSenderCertificateProvider.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/SignalAccount.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/contacts/ContactInfo.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/contacts/JsonContactsStore.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java (99%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/profiles/SignalProfileEntry.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/protocol/IdentityInfo.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/protocol/JsonSignalProtocolStore.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/protocol/RecipientStore.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/protocol/SessionInfo.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/protocol/SignalServiceAddressResolver.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/stickers/Sticker.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/util/AttachmentUtils.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/util/IOUtils.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/util/KeyUtils.java (93%) rename {src => lib/src}/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/util/PinHashing.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/util/ProfileUtils.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/util/StickerUtils.java (100%) rename {src => lib/src}/main/java/org/asamk/signal/manager/util/Utils.java (100%) rename {src => lib/src}/main/resources/org/asamk/signal/manager/ias.store (100%) rename {src => lib/src}/main/resources/org/asamk/signal/manager/whisper.store (100%) diff --git a/build.gradle.kts b/build.gradle.kts index b2bd53e4..8a3a8aae 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,12 +21,11 @@ repositories { } dependencies { - implementation("com.google.protobuf:protobuf-javalite:3.10.0") - implementation("com.github.turasa:signal-service-java:2.15.3_unofficial_18") implementation("org.bouncycastle:bcprov-jdk15on:1.68") implementation("net.sourceforge.argparse4j:argparse4j:0.8.1") implementation("com.github.hypfvieh:dbus-java:3.2.4") implementation("org.slf4j:slf4j-simple:1.7.30") + implementation(project(":lib")) } configurations { diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts new file mode 100644 index 00000000..5eb6c9b4 --- /dev/null +++ b/lib/build.gradle.kts @@ -0,0 +1,30 @@ +plugins { + `java-library` +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} + +repositories { + mavenLocal() + mavenCentral() +} + +dependencies { + api("com.github.turasa:signal-service-java:2.15.3_unofficial_18") + implementation("com.google.protobuf:protobuf-javalite:3.10.0") + implementation("org.bouncycastle:bcprov-jdk15on:1.68") + implementation("org.slf4j:slf4j-api:1.7.30") +} + +configurations { + implementation { + resolutionStrategy.failOnVersionConflict() + } +} + +tasks.withType { + options.encoding = "UTF-8" +} diff --git a/src/main/java/org/asamk/signal/manager/AttachmentInvalidException.java b/lib/src/main/java/org/asamk/signal/manager/AttachmentInvalidException.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/AttachmentInvalidException.java rename to lib/src/main/java/org/asamk/signal/manager/AttachmentInvalidException.java diff --git a/src/main/java/org/asamk/signal/manager/AttachmentStore.java b/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/AttachmentStore.java rename to lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java diff --git a/src/main/java/org/asamk/signal/manager/AvatarStore.java b/lib/src/main/java/org/asamk/signal/manager/AvatarStore.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/AvatarStore.java rename to lib/src/main/java/org/asamk/signal/manager/AvatarStore.java diff --git a/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java b/lib/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java rename to lib/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java diff --git a/src/main/java/org/asamk/signal/manager/HandleAction.java b/lib/src/main/java/org/asamk/signal/manager/HandleAction.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/HandleAction.java rename to lib/src/main/java/org/asamk/signal/manager/HandleAction.java diff --git a/src/main/java/org/asamk/signal/manager/IasTrustStore.java b/lib/src/main/java/org/asamk/signal/manager/IasTrustStore.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/IasTrustStore.java rename to lib/src/main/java/org/asamk/signal/manager/IasTrustStore.java diff --git a/src/main/java/org/asamk/signal/manager/JsonStickerPack.java b/lib/src/main/java/org/asamk/signal/manager/JsonStickerPack.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/JsonStickerPack.java rename to lib/src/main/java/org/asamk/signal/manager/JsonStickerPack.java diff --git a/src/main/java/org/asamk/signal/manager/LibSignalLogger.java b/lib/src/main/java/org/asamk/signal/manager/LibSignalLogger.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/LibSignalLogger.java rename to lib/src/main/java/org/asamk/signal/manager/LibSignalLogger.java diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/Manager.java rename to lib/src/main/java/org/asamk/signal/manager/Manager.java diff --git a/src/main/java/org/asamk/signal/manager/NotRegisteredException.java b/lib/src/main/java/org/asamk/signal/manager/NotRegisteredException.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/NotRegisteredException.java rename to lib/src/main/java/org/asamk/signal/manager/NotRegisteredException.java diff --git a/src/main/java/org/asamk/signal/manager/PathConfig.java b/lib/src/main/java/org/asamk/signal/manager/PathConfig.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/PathConfig.java rename to lib/src/main/java/org/asamk/signal/manager/PathConfig.java diff --git a/src/main/java/org/asamk/signal/manager/ProvisioningManager.java b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/ProvisioningManager.java rename to lib/src/main/java/org/asamk/signal/manager/ProvisioningManager.java diff --git a/src/main/java/org/asamk/signal/manager/RegistrationManager.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/RegistrationManager.java rename to lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java diff --git a/src/main/java/org/asamk/signal/manager/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/ServiceConfig.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/ServiceConfig.java rename to lib/src/main/java/org/asamk/signal/manager/ServiceConfig.java diff --git a/src/main/java/org/asamk/signal/manager/StickerPackInvalidException.java b/lib/src/main/java/org/asamk/signal/manager/StickerPackInvalidException.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/StickerPackInvalidException.java rename to lib/src/main/java/org/asamk/signal/manager/StickerPackInvalidException.java diff --git a/src/main/java/org/asamk/signal/manager/TrustLevel.java b/lib/src/main/java/org/asamk/signal/manager/TrustLevel.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/TrustLevel.java rename to lib/src/main/java/org/asamk/signal/manager/TrustLevel.java diff --git a/src/main/java/org/asamk/signal/manager/UserAlreadyExists.java b/lib/src/main/java/org/asamk/signal/manager/UserAlreadyExists.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/UserAlreadyExists.java rename to lib/src/main/java/org/asamk/signal/manager/UserAlreadyExists.java diff --git a/src/main/java/org/asamk/signal/manager/WhisperTrustStore.java b/lib/src/main/java/org/asamk/signal/manager/WhisperTrustStore.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/WhisperTrustStore.java rename to lib/src/main/java/org/asamk/signal/manager/WhisperTrustStore.java diff --git a/src/main/java/org/asamk/signal/manager/groups/GroupId.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupId.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/groups/GroupId.java rename to lib/src/main/java/org/asamk/signal/manager/groups/GroupId.java diff --git a/src/main/java/org/asamk/signal/manager/groups/GroupIdFormatException.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupIdFormatException.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/groups/GroupIdFormatException.java rename to lib/src/main/java/org/asamk/signal/manager/groups/GroupIdFormatException.java diff --git a/src/main/java/org/asamk/signal/manager/groups/GroupIdV1.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV1.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/groups/GroupIdV1.java rename to lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV1.java diff --git a/src/main/java/org/asamk/signal/manager/groups/GroupIdV2.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV2.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/groups/GroupIdV2.java rename to lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV2.java diff --git a/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java rename to lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java diff --git a/src/main/java/org/asamk/signal/manager/groups/GroupLinkPassword.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupLinkPassword.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/groups/GroupLinkPassword.java rename to lib/src/main/java/org/asamk/signal/manager/groups/GroupLinkPassword.java diff --git a/src/main/java/org/asamk/signal/manager/groups/GroupNotFoundException.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupNotFoundException.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/groups/GroupNotFoundException.java rename to lib/src/main/java/org/asamk/signal/manager/groups/GroupNotFoundException.java diff --git a/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/groups/GroupUtils.java rename to lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java diff --git a/src/main/java/org/asamk/signal/manager/groups/NotAGroupMemberException.java b/lib/src/main/java/org/asamk/signal/manager/groups/NotAGroupMemberException.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/groups/NotAGroupMemberException.java rename to lib/src/main/java/org/asamk/signal/manager/groups/NotAGroupMemberException.java diff --git a/src/main/java/org/asamk/signal/manager/helper/GroupAuthorizationProvider.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupAuthorizationProvider.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/helper/GroupAuthorizationProvider.java rename to lib/src/main/java/org/asamk/signal/manager/helper/GroupAuthorizationProvider.java diff --git a/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/helper/GroupHelper.java rename to lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java diff --git a/src/main/java/org/asamk/signal/manager/helper/MessagePipeProvider.java b/lib/src/main/java/org/asamk/signal/manager/helper/MessagePipeProvider.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/helper/MessagePipeProvider.java rename to lib/src/main/java/org/asamk/signal/manager/helper/MessagePipeProvider.java diff --git a/src/main/java/org/asamk/signal/manager/helper/MessageReceiverProvider.java b/lib/src/main/java/org/asamk/signal/manager/helper/MessageReceiverProvider.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/helper/MessageReceiverProvider.java rename to lib/src/main/java/org/asamk/signal/manager/helper/MessageReceiverProvider.java diff --git a/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/helper/PinHelper.java rename to lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java diff --git a/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java rename to lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java diff --git a/src/main/java/org/asamk/signal/manager/helper/ProfileKeyCredentialProvider.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileKeyCredentialProvider.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/helper/ProfileKeyCredentialProvider.java rename to lib/src/main/java/org/asamk/signal/manager/helper/ProfileKeyCredentialProvider.java diff --git a/src/main/java/org/asamk/signal/manager/helper/ProfileKeyProvider.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileKeyProvider.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/helper/ProfileKeyProvider.java rename to lib/src/main/java/org/asamk/signal/manager/helper/ProfileKeyProvider.java diff --git a/src/main/java/org/asamk/signal/manager/helper/ProfileProvider.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileProvider.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/helper/ProfileProvider.java rename to lib/src/main/java/org/asamk/signal/manager/helper/ProfileProvider.java diff --git a/src/main/java/org/asamk/signal/manager/helper/SelfAddressProvider.java b/lib/src/main/java/org/asamk/signal/manager/helper/SelfAddressProvider.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/helper/SelfAddressProvider.java rename to lib/src/main/java/org/asamk/signal/manager/helper/SelfAddressProvider.java diff --git a/src/main/java/org/asamk/signal/manager/helper/SelfProfileKeyProvider.java b/lib/src/main/java/org/asamk/signal/manager/helper/SelfProfileKeyProvider.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/helper/SelfProfileKeyProvider.java rename to lib/src/main/java/org/asamk/signal/manager/helper/SelfProfileKeyProvider.java diff --git a/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java rename to lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java diff --git a/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessProvider.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessProvider.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessProvider.java rename to lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessProvider.java diff --git a/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessSenderCertificateProvider.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessSenderCertificateProvider.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessSenderCertificateProvider.java rename to lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessSenderCertificateProvider.java diff --git a/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/SignalAccount.java rename to lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java diff --git a/src/main/java/org/asamk/signal/manager/storage/contacts/ContactInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/contacts/ContactInfo.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/contacts/ContactInfo.java rename to lib/src/main/java/org/asamk/signal/manager/storage/contacts/ContactInfo.java diff --git a/src/main/java/org/asamk/signal/manager/storage/contacts/JsonContactsStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/contacts/JsonContactsStore.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/contacts/JsonContactsStore.java rename to lib/src/main/java/org/asamk/signal/manager/storage/contacts/JsonContactsStore.java diff --git a/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java rename to lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java diff --git a/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java rename to lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java diff --git a/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java rename to lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java diff --git a/src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java similarity index 99% rename from src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java rename to lib/src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java index f7292596..52b789c7 100644 --- a/src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/JsonGroupStore.java @@ -17,12 +17,12 @@ import org.asamk.signal.manager.groups.GroupIdV1; import org.asamk.signal.manager.groups.GroupIdV2; import org.asamk.signal.manager.groups.GroupUtils; import org.asamk.signal.manager.util.IOUtils; -import org.asamk.signal.util.Hex; import org.signal.storageservice.protos.groups.local.DecryptedGroup; import org.signal.zkgroup.InvalidInputException; import org.signal.zkgroup.groups.GroupMasterKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.whispersystems.libsignal.util.Hex; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java rename to lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java diff --git a/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java rename to lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java diff --git a/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java rename to lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java diff --git a/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java rename to lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfile.java diff --git a/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfileEntry.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfileEntry.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfileEntry.java rename to lib/src/main/java/org/asamk/signal/manager/storage/profiles/SignalProfileEntry.java diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/IdentityInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/IdentityInfo.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/protocol/IdentityInfo.java rename to lib/src/main/java/org/asamk/signal/manager/storage/protocol/IdentityInfo.java diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java rename to lib/src/main/java/org/asamk/signal/manager/storage/protocol/JsonIdentityKeyStore.java diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java rename to lib/src/main/java/org/asamk/signal/manager/storage/protocol/JsonPreKeyStore.java diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java rename to lib/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignalProtocolStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignalProtocolStore.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignalProtocolStore.java rename to lib/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignalProtocolStore.java diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java rename to lib/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSignedPreKeyStore.java diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/RecipientStore.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/protocol/RecipientStore.java rename to lib/src/main/java/org/asamk/signal/manager/storage/protocol/RecipientStore.java diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/SessionInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SessionInfo.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/protocol/SessionInfo.java rename to lib/src/main/java/org/asamk/signal/manager/storage/protocol/SessionInfo.java diff --git a/src/main/java/org/asamk/signal/manager/storage/protocol/SignalServiceAddressResolver.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalServiceAddressResolver.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/protocol/SignalServiceAddressResolver.java rename to lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalServiceAddressResolver.java diff --git a/src/main/java/org/asamk/signal/manager/storage/stickers/Sticker.java b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/Sticker.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/stickers/Sticker.java rename to lib/src/main/java/org/asamk/signal/manager/storage/stickers/Sticker.java diff --git a/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java rename to lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java diff --git a/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java rename to lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java diff --git a/src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java rename to lib/src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java diff --git a/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java rename to lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java diff --git a/src/main/java/org/asamk/signal/manager/util/IOUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/IOUtils.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/util/IOUtils.java rename to lib/src/main/java/org/asamk/signal/manager/util/IOUtils.java diff --git a/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java similarity index 93% rename from src/main/java/org/asamk/signal/manager/util/KeyUtils.java rename to lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java index 3285e65a..b5567b57 100644 --- a/src/main/java/org/asamk/signal/manager/util/KeyUtils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java @@ -1,6 +1,5 @@ package org.asamk.signal.manager.util; -import org.asamk.signal.util.RandomUtils; import org.signal.zkgroup.InvalidInputException; import org.signal.zkgroup.profiles.ProfileKey; import org.whispersystems.libsignal.IdentityKey; @@ -14,12 +13,15 @@ import org.whispersystems.libsignal.state.SignedPreKeyRecord; import org.whispersystems.libsignal.util.Medium; import org.whispersystems.signalservice.api.kbs.MasterKey; +import java.security.SecureRandom; import java.util.ArrayList; import java.util.Base64; import java.util.List; public class KeyUtils { + private static final SecureRandom secureRandom = new SecureRandom(); + private KeyUtils() { } @@ -77,7 +79,7 @@ public class KeyUtils { } public static MasterKey createMasterKey() { - return MasterKey.createNew(RandomUtils.getSecureRandom()); + return MasterKey.createNew(secureRandom); } private static String getSecret(int size) { @@ -87,7 +89,7 @@ public class KeyUtils { public static byte[] getSecretBytes(int size) { byte[] secret = new byte[size]; - RandomUtils.getSecureRandom().nextBytes(secret); + secureRandom.nextBytes(secret); return secret; } } diff --git a/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java rename to lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java diff --git a/src/main/java/org/asamk/signal/manager/util/PinHashing.java b/lib/src/main/java/org/asamk/signal/manager/util/PinHashing.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/util/PinHashing.java rename to lib/src/main/java/org/asamk/signal/manager/util/PinHashing.java diff --git a/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/util/ProfileUtils.java rename to lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java diff --git a/src/main/java/org/asamk/signal/manager/util/StickerUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/util/StickerUtils.java rename to lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java diff --git a/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java similarity index 100% rename from src/main/java/org/asamk/signal/manager/util/Utils.java rename to lib/src/main/java/org/asamk/signal/manager/util/Utils.java diff --git a/src/main/resources/org/asamk/signal/manager/ias.store b/lib/src/main/resources/org/asamk/signal/manager/ias.store similarity index 100% rename from src/main/resources/org/asamk/signal/manager/ias.store rename to lib/src/main/resources/org/asamk/signal/manager/ias.store diff --git a/src/main/resources/org/asamk/signal/manager/whisper.store b/lib/src/main/resources/org/asamk/signal/manager/whisper.store similarity index 100% rename from src/main/resources/org/asamk/signal/manager/whisper.store rename to lib/src/main/resources/org/asamk/signal/manager/whisper.store diff --git a/settings.gradle.kts b/settings.gradle.kts index e837999a..eb34b67b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1 +1,2 @@ rootProject.name = "signal-cli" +include("lib") -- 2.50.1