diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/LogManager.kt b/app/src/main/kotlin/me/rhunk/snapenhance/LogManager.kt index 1649e257..639b3226 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/LogManager.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/LogManager.kt @@ -3,6 +3,7 @@ package me.rhunk.snapenhance import android.content.SharedPreferences import android.util.Log import com.google.gson.GsonBuilder +import me.rhunk.snapenhance.core.LogLevel import java.io.File import java.io.OutputStream import java.io.RandomAccessFile diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/bridge/BridgeService.kt b/app/src/main/kotlin/me/rhunk/snapenhance/bridge/BridgeService.kt index 7c807cf5..cff84850 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/bridge/BridgeService.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/bridge/BridgeService.kt @@ -3,7 +3,7 @@ package me.rhunk.snapenhance.bridge import android.app.Service import android.content.Intent import android.os.IBinder -import me.rhunk.snapenhance.LogLevel +import me.rhunk.snapenhance.core.LogLevel import me.rhunk.snapenhance.RemoteSideContext import me.rhunk.snapenhance.SharedContextHolder import me.rhunk.snapenhance.core.bridge.types.BridgeFileType @@ -14,7 +14,7 @@ import me.rhunk.snapenhance.core.database.objects.FriendInfo import me.rhunk.snapenhance.core.messaging.MessagingFriendInfo import me.rhunk.snapenhance.core.messaging.MessagingGroupInfo import me.rhunk.snapenhance.download.DownloadProcessor -import me.rhunk.snapenhance.util.SerializableDataObject +import me.rhunk.snapenhance.core.util.SerializableDataObject import kotlin.system.measureTimeMillis class BridgeService : Service() { diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/download/DownloadProcessor.kt b/app/src/main/kotlin/me/rhunk/snapenhance/download/DownloadProcessor.kt index 21840b30..74bdee9c 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/download/DownloadProcessor.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/download/DownloadProcessor.kt @@ -26,7 +26,7 @@ import me.rhunk.snapenhance.core.download.data.DownloadRequest import me.rhunk.snapenhance.core.download.data.DownloadStage import me.rhunk.snapenhance.core.download.data.InputMedia import me.rhunk.snapenhance.core.download.data.MediaEncryptionKeyPair -import me.rhunk.snapenhance.util.download.RemoteMediaResolver +import me.rhunk.snapenhance.core.util.download.RemoteMediaResolver import java.io.File import java.io.InputStream import java.net.HttpURLConnection diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/download/DownloadTaskManager.kt b/app/src/main/kotlin/me/rhunk/snapenhance/download/DownloadTaskManager.kt index 916fc83d..bceac6c4 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/download/DownloadTaskManager.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/download/DownloadTaskManager.kt @@ -6,9 +6,9 @@ import android.database.sqlite.SQLiteDatabase import me.rhunk.snapenhance.core.download.data.DownloadMetadata import me.rhunk.snapenhance.core.download.data.DownloadStage import me.rhunk.snapenhance.core.download.data.MediaDownloadSource -import me.rhunk.snapenhance.util.SQLiteDatabaseHelper -import me.rhunk.snapenhance.util.ktx.getIntOrNull -import me.rhunk.snapenhance.util.ktx.getStringOrNull +import me.rhunk.snapenhance.core.util.SQLiteDatabaseHelper +import me.rhunk.snapenhance.core.util.ktx.getIntOrNull +import me.rhunk.snapenhance.core.util.ktx.getStringOrNull class DownloadTaskManager { private lateinit var taskDatabase: SQLiteDatabase diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/download/FFMpegProcessor.kt b/app/src/main/kotlin/me/rhunk/snapenhance/download/FFMpegProcessor.kt index f85ed77e..691d0f4a 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/download/FFMpegProcessor.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/download/FFMpegProcessor.kt @@ -4,9 +4,9 @@ import com.arthenica.ffmpegkit.FFmpegKit import com.arthenica.ffmpegkit.FFmpegSession import com.arthenica.ffmpegkit.Level import kotlinx.coroutines.suspendCancellableCoroutine -import me.rhunk.snapenhance.LogLevel +import me.rhunk.snapenhance.core.LogLevel import me.rhunk.snapenhance.LogManager -import me.rhunk.snapenhance.Logger +import me.rhunk.snapenhance.core.Logger import me.rhunk.snapenhance.core.config.impl.DownloaderConfig import java.io.File import java.util.concurrent.Executors diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/messaging/ModDatabase.kt b/app/src/main/kotlin/me/rhunk/snapenhance/messaging/ModDatabase.kt index 1370e9eb..4264be91 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/messaging/ModDatabase.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/messaging/ModDatabase.kt @@ -7,10 +7,10 @@ import me.rhunk.snapenhance.core.messaging.FriendStreaks import me.rhunk.snapenhance.core.messaging.MessagingFriendInfo import me.rhunk.snapenhance.core.messaging.MessagingGroupInfo import me.rhunk.snapenhance.core.messaging.MessagingRuleType -import me.rhunk.snapenhance.util.SQLiteDatabaseHelper -import me.rhunk.snapenhance.util.ktx.getInteger -import me.rhunk.snapenhance.util.ktx.getLongOrNull -import me.rhunk.snapenhance.util.ktx.getStringOrNull +import me.rhunk.snapenhance.core.util.SQLiteDatabaseHelper +import me.rhunk.snapenhance.core.util.ktx.getInteger +import me.rhunk.snapenhance.core.util.ktx.getLongOrNull +import me.rhunk.snapenhance.core.util.ktx.getStringOrNull import java.util.concurrent.Executors diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/messaging/StreaksReminder.kt b/app/src/main/kotlin/me/rhunk/snapenhance/messaging/StreaksReminder.kt index fa79b5f2..56bc6fc1 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/messaging/StreaksReminder.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/messaging/StreaksReminder.kt @@ -15,7 +15,7 @@ import me.rhunk.snapenhance.RemoteSideContext import me.rhunk.snapenhance.SharedContextHolder import me.rhunk.snapenhance.bridge.ForceStartActivity import me.rhunk.snapenhance.ui.util.ImageRequestHelper -import me.rhunk.snapenhance.util.snap.BitmojiSelfie +import me.rhunk.snapenhance.core.util.snap.BitmojiSelfie class StreaksReminder( private val remoteSideContext: RemoteSideContext? = null diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/home/HomeSubSection.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/home/HomeSubSection.kt index 9c1448ee..21a40081 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/home/HomeSubSection.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/home/HomeSubSection.kt @@ -53,8 +53,8 @@ import androidx.compose.ui.window.Dialog import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import me.rhunk.snapenhance.Constants -import me.rhunk.snapenhance.LogChannels -import me.rhunk.snapenhance.LogLevel +import me.rhunk.snapenhance.core.LogChannels +import me.rhunk.snapenhance.core.LogLevel import me.rhunk.snapenhance.LogReader import me.rhunk.snapenhance.RemoteSideContext import me.rhunk.snapenhance.action.EnumAction diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/social/AddFriendDialog.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/social/AddFriendDialog.kt index 845444f6..b3fc94ea 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/social/AddFriendDialog.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/social/AddFriendDialog.kt @@ -47,7 +47,7 @@ import me.rhunk.snapenhance.RemoteSideContext import me.rhunk.snapenhance.core.bridge.BridgeClient import me.rhunk.snapenhance.core.messaging.MessagingFriendInfo import me.rhunk.snapenhance.core.messaging.MessagingGroupInfo -import me.rhunk.snapenhance.util.snap.SnapWidgetBroadcastReceiverHelper +import me.rhunk.snapenhance.core.util.snap.SnapWidgetBroadcastReceiverHelper class AddFriendDialog( private val context: RemoteSideContext, diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/social/ScopeContent.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/social/ScopeContent.kt index f07a4701..577a6015 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/social/ScopeContent.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/social/ScopeContent.kt @@ -31,7 +31,7 @@ import me.rhunk.snapenhance.RemoteSideContext import me.rhunk.snapenhance.core.messaging.MessagingRuleType import me.rhunk.snapenhance.core.messaging.SocialScope import me.rhunk.snapenhance.ui.util.BitmojiImage -import me.rhunk.snapenhance.util.snap.BitmojiSelfie +import me.rhunk.snapenhance.core.util.snap.BitmojiSelfie class ScopeContent( private val context: RemoteSideContext, diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/social/SocialSection.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/social/SocialSection.kt index 8f5558a8..19bd1095 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/social/SocialSection.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/manager/sections/social/SocialSection.kt @@ -57,7 +57,7 @@ import me.rhunk.snapenhance.ui.manager.Section import me.rhunk.snapenhance.ui.util.AlertDialogs import me.rhunk.snapenhance.ui.util.BitmojiImage import me.rhunk.snapenhance.ui.util.pagerTabIndicatorOffset -import me.rhunk.snapenhance.util.snap.BitmojiSelfie +import me.rhunk.snapenhance.core.util.snap.BitmojiSelfie class SocialSection : Section() { private lateinit var friendList: List diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/setup/screens/impl/MappingsScreen.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/setup/screens/impl/MappingsScreen.kt index 7d215f19..5a8cf392 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/setup/screens/impl/MappingsScreen.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/setup/screens/impl/MappingsScreen.kt @@ -1,14 +1,10 @@ package me.rhunk.snapenhance.ui.setup.screens.impl -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Button import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -21,7 +17,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import me.rhunk.snapenhance.Logger import me.rhunk.snapenhance.ui.setup.screens.SetupScreen import me.rhunk.snapenhance.ui.util.AlertDialogs diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/util/ActivityLauncherHelper.kt b/app/src/main/kotlin/me/rhunk/snapenhance/ui/util/ActivityLauncherHelper.kt index f9336a01..e0282d8b 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/util/ActivityLauncherHelper.kt +++ b/app/src/main/kotlin/me/rhunk/snapenhance/ui/util/ActivityLauncherHelper.kt @@ -4,7 +4,7 @@ import android.content.Intent import androidx.activity.ComponentActivity import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts -import me.rhunk.snapenhance.Logger +import me.rhunk.snapenhance.core.Logger typealias ActivityLauncherCallback = (resultCode: Int, intent: Intent?) -> Unit diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/EventDispatcher.kt b/core/src/main/kotlin/me/rhunk/snapenhance/EventDispatcher.kt index 28b0f457..1a918880 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/EventDispatcher.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/EventDispatcher.kt @@ -9,15 +9,15 @@ import me.rhunk.snapenhance.core.eventbus.events.impl.NetworkApiRequestEvent import me.rhunk.snapenhance.core.eventbus.events.impl.OnSnapInteractionEvent import me.rhunk.snapenhance.core.eventbus.events.impl.SendMessageWithContentEvent import me.rhunk.snapenhance.core.eventbus.events.impl.SnapWidgetBroadcastReceiveEvent +import me.rhunk.snapenhance.core.util.ktx.getObjectField +import me.rhunk.snapenhance.core.util.ktx.setObjectField +import me.rhunk.snapenhance.core.util.snap.SnapWidgetBroadcastReceiverHelper import me.rhunk.snapenhance.data.wrapper.impl.MessageContent import me.rhunk.snapenhance.data.wrapper.impl.MessageDestinations import me.rhunk.snapenhance.data.wrapper.impl.SnapUUID import me.rhunk.snapenhance.hook.HookStage import me.rhunk.snapenhance.hook.hook import me.rhunk.snapenhance.manager.Manager -import me.rhunk.snapenhance.util.ktx.getObjectField -import me.rhunk.snapenhance.util.ktx.setObjectField -import me.rhunk.snapenhance.util.snap.SnapWidgetBroadcastReceiverHelper class EventDispatcher( private val context: ModContext diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/ModContext.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ModContext.kt index 6ede07e6..736a7c0e 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/ModContext.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/ModContext.kt @@ -11,19 +11,20 @@ import android.widget.Toast import com.google.gson.Gson import com.google.gson.GsonBuilder import kotlinx.coroutines.asCoroutineDispatcher +import me.rhunk.snapenhance.core.Logger import me.rhunk.snapenhance.core.bridge.BridgeClient import me.rhunk.snapenhance.core.bridge.wrapper.LocaleWrapper import me.rhunk.snapenhance.core.bridge.wrapper.MappingsWrapper import me.rhunk.snapenhance.core.config.ModConfig import me.rhunk.snapenhance.core.database.DatabaseAccess import me.rhunk.snapenhance.core.eventbus.EventBus +import me.rhunk.snapenhance.core.util.download.HttpServer import me.rhunk.snapenhance.data.MessageSender import me.rhunk.snapenhance.features.Feature import me.rhunk.snapenhance.manager.impl.ActionManager import me.rhunk.snapenhance.manager.impl.FeatureManager import me.rhunk.snapenhance.nativelib.NativeConfig import me.rhunk.snapenhance.nativelib.NativeLib -import me.rhunk.snapenhance.util.download.HttpServer import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import kotlin.reflect.KClass diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/SnapEnhance.kt b/core/src/main/kotlin/me/rhunk/snapenhance/SnapEnhance.kt index f960cc5b..8c82f31e 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/SnapEnhance.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/SnapEnhance.kt @@ -8,16 +8,17 @@ import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext import me.rhunk.snapenhance.bridge.SyncCallback import me.rhunk.snapenhance.core.BuildConfig +import me.rhunk.snapenhance.core.Logger import me.rhunk.snapenhance.core.bridge.BridgeClient import me.rhunk.snapenhance.core.eventbus.events.impl.SnapWidgetBroadcastReceiveEvent import me.rhunk.snapenhance.core.eventbus.events.impl.UnaryCallEvent import me.rhunk.snapenhance.core.messaging.MessagingFriendInfo import me.rhunk.snapenhance.core.messaging.MessagingGroupInfo +import me.rhunk.snapenhance.core.util.ktx.getApplicationInfoCompat import me.rhunk.snapenhance.data.SnapClassCache import me.rhunk.snapenhance.hook.HookStage import me.rhunk.snapenhance.hook.Hooker import me.rhunk.snapenhance.hook.hook -import me.rhunk.snapenhance.util.ktx.getApplicationInfoCompat import kotlin.time.ExperimentalTime import kotlin.time.measureTime diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/action/impl/ExportChatMessages.kt b/core/src/main/kotlin/me/rhunk/snapenhance/action/impl/ExportChatMessages.kt index 2ba55c50..d059809c 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/action/impl/ExportChatMessages.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/action/impl/ExportChatMessages.kt @@ -11,17 +11,17 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.joinAll import kotlinx.coroutines.launch import kotlinx.coroutines.suspendCancellableCoroutine -import me.rhunk.snapenhance.Logger import me.rhunk.snapenhance.action.AbstractAction +import me.rhunk.snapenhance.core.Logger import me.rhunk.snapenhance.core.database.objects.FriendFeedEntry +import me.rhunk.snapenhance.core.util.CallbackBuilder +import me.rhunk.snapenhance.core.util.export.ExportFormat +import me.rhunk.snapenhance.core.util.export.MessageExporter import me.rhunk.snapenhance.data.ContentType import me.rhunk.snapenhance.data.wrapper.impl.Message import me.rhunk.snapenhance.data.wrapper.impl.SnapUUID import me.rhunk.snapenhance.features.impl.Messaging import me.rhunk.snapenhance.ui.ViewAppearanceHelper -import me.rhunk.snapenhance.util.CallbackBuilder -import me.rhunk.snapenhance.util.export.ExportFormat -import me.rhunk.snapenhance.util.export.MessageExporter import java.io.File import kotlin.math.absoluteValue diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/Logger.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/Logger.kt similarity index 99% rename from core/src/main/kotlin/me/rhunk/snapenhance/Logger.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/Logger.kt index 51cd4838..6470755d 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/Logger.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/Logger.kt @@ -1,4 +1,4 @@ -package me.rhunk.snapenhance +package me.rhunk.snapenhance.core import android.annotation.SuppressLint import android.util.Log diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/LocaleWrapper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/LocaleWrapper.kt index 110d0f94..751a8b09 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/LocaleWrapper.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/LocaleWrapper.kt @@ -3,7 +3,7 @@ package me.rhunk.snapenhance.core.bridge.wrapper import android.content.Context import com.google.gson.JsonObject import com.google.gson.JsonParser -import me.rhunk.snapenhance.Logger +import me.rhunk.snapenhance.core.Logger import me.rhunk.snapenhance.core.bridge.BridgeClient import me.rhunk.snapenhance.data.LocalePair import java.util.Locale diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/MappingsWrapper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/MappingsWrapper.kt index 02a5d957..d1a4f269 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/MappingsWrapper.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/MappingsWrapper.kt @@ -5,7 +5,7 @@ import com.google.gson.GsonBuilder import com.google.gson.JsonElement import com.google.gson.JsonParser import me.rhunk.snapenhance.Constants -import me.rhunk.snapenhance.Logger +import me.rhunk.snapenhance.core.Logger import me.rhunk.snapenhance.core.bridge.FileLoaderWrapper import me.rhunk.snapenhance.core.bridge.types.BridgeFileType import me.rhunk.snapmapper.Mapper diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/MessageLoggerWrapper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/MessageLoggerWrapper.kt index 75d6395c..c2acc4c5 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/MessageLoggerWrapper.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/bridge/wrapper/MessageLoggerWrapper.kt @@ -2,7 +2,7 @@ package me.rhunk.snapenhance.core.bridge.wrapper import android.content.ContentValues import android.database.sqlite.SQLiteDatabase -import me.rhunk.snapenhance.util.SQLiteDatabaseHelper +import me.rhunk.snapenhance.core.util.SQLiteDatabaseHelper import java.io.File class MessageLoggerWrapper( diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/database/DatabaseAccess.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/database/DatabaseAccess.kt index eb095f9e..2672622f 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/core/database/DatabaseAccess.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/database/DatabaseAccess.kt @@ -2,8 +2,8 @@ package me.rhunk.snapenhance.core.database import android.annotation.SuppressLint import android.database.sqlite.SQLiteDatabase -import me.rhunk.snapenhance.Logger import me.rhunk.snapenhance.ModContext +import me.rhunk.snapenhance.core.Logger import me.rhunk.snapenhance.core.database.objects.ConversationMessage import me.rhunk.snapenhance.core.database.objects.FriendFeedEntry import me.rhunk.snapenhance.core.database.objects.FriendInfo diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/ConversationMessage.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/ConversationMessage.kt index 6e6c41ff..2f9476be 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/ConversationMessage.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/ConversationMessage.kt @@ -4,12 +4,12 @@ import android.annotation.SuppressLint import android.database.Cursor import me.rhunk.snapenhance.Constants import me.rhunk.snapenhance.core.database.DatabaseObject +import me.rhunk.snapenhance.core.util.ktx.getBlobOrNull +import me.rhunk.snapenhance.core.util.ktx.getInteger +import me.rhunk.snapenhance.core.util.ktx.getLong +import me.rhunk.snapenhance.core.util.ktx.getStringOrNull +import me.rhunk.snapenhance.core.util.protobuf.ProtoReader import me.rhunk.snapenhance.data.ContentType -import me.rhunk.snapenhance.util.ktx.getBlobOrNull -import me.rhunk.snapenhance.util.ktx.getInteger -import me.rhunk.snapenhance.util.ktx.getLong -import me.rhunk.snapenhance.util.ktx.getStringOrNull -import me.rhunk.snapenhance.util.protobuf.ProtoReader @Suppress("ArrayInDataClass") data class ConversationMessage( diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/FriendFeedEntry.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/FriendFeedEntry.kt index 48d43835..dc28e7d1 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/FriendFeedEntry.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/FriendFeedEntry.kt @@ -3,10 +3,10 @@ package me.rhunk.snapenhance.core.database.objects import android.annotation.SuppressLint import android.database.Cursor import me.rhunk.snapenhance.core.database.DatabaseObject -import me.rhunk.snapenhance.util.ktx.getIntOrNull -import me.rhunk.snapenhance.util.ktx.getInteger -import me.rhunk.snapenhance.util.ktx.getLong -import me.rhunk.snapenhance.util.ktx.getStringOrNull +import me.rhunk.snapenhance.core.util.ktx.getIntOrNull +import me.rhunk.snapenhance.core.util.ktx.getInteger +import me.rhunk.snapenhance.core.util.ktx.getLong +import me.rhunk.snapenhance.core.util.ktx.getStringOrNull data class FriendFeedEntry( var id: Int = 0, diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/FriendInfo.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/FriendInfo.kt index 18bd832c..b36fbddf 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/FriendInfo.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/FriendInfo.kt @@ -3,10 +3,10 @@ package me.rhunk.snapenhance.core.database.objects import android.annotation.SuppressLint import android.database.Cursor import me.rhunk.snapenhance.core.database.DatabaseObject -import me.rhunk.snapenhance.util.SerializableDataObject -import me.rhunk.snapenhance.util.ktx.getInteger -import me.rhunk.snapenhance.util.ktx.getLong -import me.rhunk.snapenhance.util.ktx.getStringOrNull +import me.rhunk.snapenhance.core.util.SerializableDataObject +import me.rhunk.snapenhance.core.util.ktx.getInteger +import me.rhunk.snapenhance.core.util.ktx.getLong +import me.rhunk.snapenhance.core.util.ktx.getStringOrNull data class FriendInfo( var id: Int = 0, diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/StoryEntry.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/StoryEntry.kt index 016a2ec3..a6f83d8f 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/StoryEntry.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/StoryEntry.kt @@ -3,8 +3,8 @@ package me.rhunk.snapenhance.core.database.objects import android.annotation.SuppressLint import android.database.Cursor import me.rhunk.snapenhance.core.database.DatabaseObject -import me.rhunk.snapenhance.util.ktx.getInteger -import me.rhunk.snapenhance.util.ktx.getStringOrNull +import me.rhunk.snapenhance.core.util.ktx.getInteger +import me.rhunk.snapenhance.core.util.ktx.getStringOrNull data class StoryEntry( var id: Int = 0, diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/UserConversationLink.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/UserConversationLink.kt index 9590c6b1..c036618a 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/UserConversationLink.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/database/objects/UserConversationLink.kt @@ -3,8 +3,8 @@ package me.rhunk.snapenhance.core.database.objects import android.annotation.SuppressLint import android.database.Cursor import me.rhunk.snapenhance.core.database.DatabaseObject -import me.rhunk.snapenhance.util.ktx.getInteger -import me.rhunk.snapenhance.util.ktx.getStringOrNull +import me.rhunk.snapenhance.core.util.ktx.getInteger +import me.rhunk.snapenhance.core.util.ktx.getStringOrNull class UserConversationLink( var userId: String? = null, diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/messaging/MessagingCoreObjects.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/messaging/MessagingCoreObjects.kt index b8fa48e1..94a15581 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/core/messaging/MessagingCoreObjects.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/messaging/MessagingCoreObjects.kt @@ -1,6 +1,6 @@ package me.rhunk.snapenhance.core.messaging -import me.rhunk.snapenhance.util.SerializableDataObject +import me.rhunk.snapenhance.core.util.SerializableDataObject enum class RuleState( diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/CallbackBuilder.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/CallbackBuilder.kt similarity index 98% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/CallbackBuilder.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/CallbackBuilder.kt index b3b82860..7bd93fce 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/CallbackBuilder.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/CallbackBuilder.kt @@ -1,4 +1,4 @@ -package me.rhunk.snapenhance.util +package me.rhunk.snapenhance.core.util import de.robv.android.xposed.XC_MethodHook import me.rhunk.snapenhance.hook.HookAdapter diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/ReflectionHelper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/ReflectionHelper.kt similarity index 98% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/ReflectionHelper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/ReflectionHelper.kt index 86a026fc..b2f910ef 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/ReflectionHelper.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/ReflectionHelper.kt @@ -1,4 +1,4 @@ -package me.rhunk.snapenhance.util +package me.rhunk.snapenhance.core.util import java.lang.reflect.Field import java.lang.reflect.Method diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/SQLiteDatabaseHelper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/SQLiteDatabaseHelper.kt similarity index 94% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/SQLiteDatabaseHelper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/SQLiteDatabaseHelper.kt index c9768089..0e84ccd0 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/SQLiteDatabaseHelper.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/SQLiteDatabaseHelper.kt @@ -1,8 +1,8 @@ -package me.rhunk.snapenhance.util +package me.rhunk.snapenhance.core.util import android.annotation.SuppressLint import android.database.sqlite.SQLiteDatabase -import me.rhunk.snapenhance.Logger +import me.rhunk.snapenhance.core.Logger object SQLiteDatabaseHelper { @SuppressLint("Range") diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/SerializableDataObject.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/SerializableDataObject.kt similarity index 93% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/SerializableDataObject.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/SerializableDataObject.kt index 2e4e0bde..cf64babd 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/SerializableDataObject.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/SerializableDataObject.kt @@ -1,4 +1,4 @@ -package me.rhunk.snapenhance.util +package me.rhunk.snapenhance.core.util import com.google.gson.Gson import com.google.gson.GsonBuilder diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/download/HttpServer.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/download/HttpServer.kt similarity index 98% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/download/HttpServer.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/download/HttpServer.kt index e50496a2..47479774 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/download/HttpServer.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/download/HttpServer.kt @@ -1,11 +1,11 @@ -package me.rhunk.snapenhance.util.download +package me.rhunk.snapenhance.core.util.download import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import me.rhunk.snapenhance.Logger +import me.rhunk.snapenhance.core.Logger import java.io.BufferedReader import java.io.InputStream import java.io.InputStreamReader diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/download/RemoteMediaResolver.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/download/RemoteMediaResolver.kt similarity index 95% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/download/RemoteMediaResolver.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/download/RemoteMediaResolver.kt index 839093d0..d7b8bf12 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/download/RemoteMediaResolver.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/download/RemoteMediaResolver.kt @@ -1,7 +1,7 @@ -package me.rhunk.snapenhance.util.download +package me.rhunk.snapenhance.core.util.download import me.rhunk.snapenhance.Constants -import me.rhunk.snapenhance.Logger +import me.rhunk.snapenhance.core.Logger import okhttp3.OkHttpClient import okhttp3.Request import java.io.ByteArrayInputStream diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/export/MessageExporter.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/export/MessageExporter.kt similarity index 98% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/export/MessageExporter.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/export/MessageExporter.kt index e5b14816..15feca36 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/export/MessageExporter.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/export/MessageExporter.kt @@ -1,4 +1,4 @@ -package me.rhunk.snapenhance.util.export +package me.rhunk.snapenhance.core.util.export import android.os.Environment import android.util.Base64InputStream @@ -11,14 +11,14 @@ import me.rhunk.snapenhance.ModContext import me.rhunk.snapenhance.core.BuildConfig import me.rhunk.snapenhance.core.database.objects.FriendFeedEntry import me.rhunk.snapenhance.core.database.objects.FriendInfo +import me.rhunk.snapenhance.core.util.protobuf.ProtoReader +import me.rhunk.snapenhance.core.util.snap.EncryptionHelper +import me.rhunk.snapenhance.core.util.snap.MediaDownloaderHelper import me.rhunk.snapenhance.data.ContentType import me.rhunk.snapenhance.data.FileType import me.rhunk.snapenhance.data.MediaReferenceType import me.rhunk.snapenhance.data.wrapper.impl.Message import me.rhunk.snapenhance.data.wrapper.impl.SnapUUID -import me.rhunk.snapenhance.util.protobuf.ProtoReader -import me.rhunk.snapenhance.util.snap.EncryptionHelper -import me.rhunk.snapenhance.util.snap.MediaDownloaderHelper import java.io.File import java.io.FileOutputStream import java.io.InputStream diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/ktx/AndroidCompatExtensions.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/ktx/AndroidCompatExtensions.kt similarity index 91% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/ktx/AndroidCompatExtensions.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/ktx/AndroidCompatExtensions.kt index 7a1b3757..7a6a4783 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/ktx/AndroidCompatExtensions.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/ktx/AndroidCompatExtensions.kt @@ -1,4 +1,4 @@ -package me.rhunk.snapenhance.util.ktx +package me.rhunk.snapenhance.core.util.ktx import android.content.pm.PackageManager import android.content.pm.PackageManager.ApplicationInfoFlags diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/ktx/DbCursorExt.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/ktx/DbCursorExt.kt similarity index 96% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/ktx/DbCursorExt.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/ktx/DbCursorExt.kt index 3141119f..e377aae1 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/ktx/DbCursorExt.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/ktx/DbCursorExt.kt @@ -1,4 +1,4 @@ -package me.rhunk.snapenhance.util.ktx +package me.rhunk.snapenhance.core.util.ktx import android.database.Cursor diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/ktx/XposedHelperExt.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/ktx/XposedHelperExt.kt similarity index 93% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/ktx/XposedHelperExt.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/ktx/XposedHelperExt.kt index 03202378..05f4c5c0 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/ktx/XposedHelperExt.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/ktx/XposedHelperExt.kt @@ -1,4 +1,4 @@ -package me.rhunk.snapenhance.util.ktx +package me.rhunk.snapenhance.core.util.ktx import de.robv.android.xposed.XposedHelpers diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoEditor.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/protobuf/ProtoEditor.kt similarity index 98% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoEditor.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/protobuf/ProtoEditor.kt index 377a769b..c9359cc7 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoEditor.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/protobuf/ProtoEditor.kt @@ -1,4 +1,4 @@ -package me.rhunk.snapenhance.util.protobuf +package me.rhunk.snapenhance.core.util.protobuf typealias WireCallback = EditorContext.() -> Unit diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoReader.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/protobuf/ProtoReader.kt similarity index 99% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoReader.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/protobuf/ProtoReader.kt index f0ba5f8f..a4830ccb 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoReader.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/protobuf/ProtoReader.kt @@ -1,4 +1,4 @@ -package me.rhunk.snapenhance.util.protobuf +package me.rhunk.snapenhance.core.util.protobuf data class Wire(val id: Int, val type: WireType, val value: Any) diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoWriter.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/protobuf/ProtoWriter.kt similarity index 98% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoWriter.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/protobuf/ProtoWriter.kt index 941abcd0..74522135 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoWriter.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/protobuf/ProtoWriter.kt @@ -1,4 +1,4 @@ -package me.rhunk.snapenhance.util.protobuf +package me.rhunk.snapenhance.core.util.protobuf import java.io.ByteArrayOutputStream diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/WireType.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/protobuf/WireType.kt similarity index 84% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/WireType.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/protobuf/WireType.kt index a5d55c61..005d5b86 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/WireType.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/protobuf/WireType.kt @@ -1,4 +1,4 @@ -package me.rhunk.snapenhance.util.protobuf; +package me.rhunk.snapenhance.core.util.protobuf; enum class WireType(val value: Int) { VARINT(0), diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/snap/BitmojiSelfie.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/snap/BitmojiSelfie.kt similarity index 93% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/snap/BitmojiSelfie.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/snap/BitmojiSelfie.kt index 71981a48..eda374ff 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/snap/BitmojiSelfie.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/snap/BitmojiSelfie.kt @@ -1,4 +1,4 @@ -package me.rhunk.snapenhance.util.snap +package me.rhunk.snapenhance.core.util.snap object BitmojiSelfie { enum class BitmojiSelfieType( diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/snap/EncryptionHelper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/snap/EncryptionHelper.kt similarity index 88% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/snap/EncryptionHelper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/snap/EncryptionHelper.kt index 80f6af5c..5511231b 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/snap/EncryptionHelper.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/snap/EncryptionHelper.kt @@ -1,8 +1,8 @@ -package me.rhunk.snapenhance.util.snap +package me.rhunk.snapenhance.core.util.snap import me.rhunk.snapenhance.Constants +import me.rhunk.snapenhance.core.util.protobuf.ProtoReader import me.rhunk.snapenhance.data.ContentType -import me.rhunk.snapenhance.util.protobuf.ProtoReader import java.io.InputStream import java.util.Base64 import javax.crypto.Cipher @@ -12,7 +12,11 @@ import javax.crypto.spec.SecretKeySpec object EncryptionHelper { fun getEncryptionKeys(contentType: ContentType, messageProto: ProtoReader, isArroyo: Boolean): Pair? { - val mediaEncryptionInfo = MediaDownloaderHelper.getMessageMediaEncryptionInfo(messageProto, contentType, isArroyo) ?: return null + val mediaEncryptionInfo = MediaDownloaderHelper.getMessageMediaEncryptionInfo( + messageProto, + contentType, + isArroyo + ) ?: return null val encryptionProtoIndex = if (mediaEncryptionInfo.contains(Constants.ENCRYPTION_PROTO_INDEX_V2)) { Constants.ENCRYPTION_PROTO_INDEX_V2 } else { diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/snap/MediaDownloaderHelper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/snap/MediaDownloaderHelper.kt similarity index 95% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/snap/MediaDownloaderHelper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/snap/MediaDownloaderHelper.kt index d55d5dec..d65b1faf 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/snap/MediaDownloaderHelper.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/snap/MediaDownloaderHelper.kt @@ -1,11 +1,11 @@ -package me.rhunk.snapenhance.util.snap +package me.rhunk.snapenhance.core.util.snap import me.rhunk.snapenhance.Constants import me.rhunk.snapenhance.core.download.data.SplitMediaAssetType +import me.rhunk.snapenhance.core.util.download.RemoteMediaResolver +import me.rhunk.snapenhance.core.util.protobuf.ProtoReader import me.rhunk.snapenhance.data.ContentType import me.rhunk.snapenhance.data.FileType -import me.rhunk.snapenhance.util.download.RemoteMediaResolver -import me.rhunk.snapenhance.util.protobuf.ProtoReader import java.io.ByteArrayInputStream import java.io.FileNotFoundException import java.io.InputStream diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/snap/PreviewUtils.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/snap/PreviewUtils.kt similarity index 98% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/snap/PreviewUtils.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/snap/PreviewUtils.kt index acef7a62..2c822818 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/snap/PreviewUtils.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/snap/PreviewUtils.kt @@ -1,4 +1,4 @@ -package me.rhunk.snapenhance.util.snap +package me.rhunk.snapenhance.core.util.snap import android.graphics.Bitmap import android.graphics.BitmapFactory diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/util/snap/SnapWidgetBroadcastReceiverHelper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/snap/SnapWidgetBroadcastReceiverHelper.kt similarity index 94% rename from core/src/main/kotlin/me/rhunk/snapenhance/util/snap/SnapWidgetBroadcastReceiverHelper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/core/util/snap/SnapWidgetBroadcastReceiverHelper.kt index 2b825de3..24fd9461 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/util/snap/SnapWidgetBroadcastReceiverHelper.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/util/snap/SnapWidgetBroadcastReceiverHelper.kt @@ -1,4 +1,4 @@ -package me.rhunk.snapenhance.util.snap +package me.rhunk.snapenhance.core.util.snap import android.content.Intent import me.rhunk.snapenhance.Constants diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/data/FileType.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/FileType.kt index ab7fd153..cc07413e 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/data/FileType.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/data/FileType.kt @@ -1,6 +1,6 @@ package me.rhunk.snapenhance.data -import me.rhunk.snapenhance.Logger +import me.rhunk.snapenhance.core.Logger import java.io.File import java.io.InputStream diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/data/MessageSender.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/MessageSender.kt index f1c52251..f4715f20 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/data/MessageSender.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/data/MessageSender.kt @@ -1,12 +1,12 @@ package me.rhunk.snapenhance.data import me.rhunk.snapenhance.ModContext +import me.rhunk.snapenhance.core.util.CallbackBuilder +import me.rhunk.snapenhance.core.util.protobuf.ProtoWriter import me.rhunk.snapenhance.data.wrapper.AbstractWrapper import me.rhunk.snapenhance.data.wrapper.impl.MessageDestinations import me.rhunk.snapenhance.data.wrapper.impl.SnapUUID import me.rhunk.snapenhance.features.impl.Messaging -import me.rhunk.snapenhance.util.CallbackBuilder -import me.rhunk.snapenhance.util.protobuf.ProtoWriter class MessageSender( private val context: ModContext, diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/AbstractWrapper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/AbstractWrapper.kt index 7ea76574..de432fd3 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/AbstractWrapper.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/AbstractWrapper.kt @@ -1,7 +1,7 @@ package me.rhunk.snapenhance.data.wrapper import de.robv.android.xposed.XposedHelpers -import me.rhunk.snapenhance.util.CallbackBuilder +import me.rhunk.snapenhance.core.util.CallbackBuilder import kotlin.reflect.KProperty abstract class AbstractWrapper( diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/Message.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/Message.kt index 12821618..9ad75553 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/Message.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/Message.kt @@ -1,8 +1,8 @@ package me.rhunk.snapenhance.data.wrapper.impl +import me.rhunk.snapenhance.core.util.ktx.getObjectField import me.rhunk.snapenhance.data.MessageState import me.rhunk.snapenhance.data.wrapper.AbstractWrapper -import me.rhunk.snapenhance.util.ktx.getObjectField class Message(obj: Any?) : AbstractWrapper(obj) { val orderKey get() = instanceNonNull().getObjectField("mOrderKey") as Long diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageContent.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageContent.kt index 7911bcaa..69ec5266 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageContent.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageContent.kt @@ -1,9 +1,9 @@ package me.rhunk.snapenhance.data.wrapper.impl +import me.rhunk.snapenhance.core.util.ktx.getObjectField +import me.rhunk.snapenhance.core.util.ktx.setObjectField import me.rhunk.snapenhance.data.ContentType import me.rhunk.snapenhance.data.wrapper.AbstractWrapper -import me.rhunk.snapenhance.util.ktx.getObjectField -import me.rhunk.snapenhance.util.ktx.setObjectField class MessageContent(obj: Any?) : AbstractWrapper(obj) { var content diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDescriptor.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDescriptor.kt index b168b5d0..ce1bce99 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDescriptor.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDescriptor.kt @@ -1,7 +1,7 @@ package me.rhunk.snapenhance.data.wrapper.impl +import me.rhunk.snapenhance.core.util.ktx.getObjectField import me.rhunk.snapenhance.data.wrapper.AbstractWrapper -import me.rhunk.snapenhance.util.ktx.getObjectField class MessageDescriptor(obj: Any?) : AbstractWrapper(obj) { val messageId: Long get() = instanceNonNull().getObjectField("mMessageId") as Long diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDestinations.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDestinations.kt index 44170fa0..bb41d8c0 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDestinations.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDestinations.kt @@ -1,8 +1,8 @@ package me.rhunk.snapenhance.data.wrapper.impl +import me.rhunk.snapenhance.core.util.ktx.getObjectField +import me.rhunk.snapenhance.core.util.ktx.setObjectField import me.rhunk.snapenhance.data.wrapper.AbstractWrapper -import me.rhunk.snapenhance.util.ktx.getObjectField -import me.rhunk.snapenhance.util.ktx.setObjectField @Suppress("UNCHECKED_CAST") class MessageDestinations(obj: Any) : AbstractWrapper(obj){ diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageMetadata.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageMetadata.kt index 2c767a4b..bd4e12be 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageMetadata.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageMetadata.kt @@ -1,8 +1,8 @@ package me.rhunk.snapenhance.data.wrapper.impl +import me.rhunk.snapenhance.core.util.ktx.getObjectField import me.rhunk.snapenhance.data.PlayableSnapState import me.rhunk.snapenhance.data.wrapper.AbstractWrapper -import me.rhunk.snapenhance.util.ktx.getObjectField class MessageMetadata(obj: Any?) : AbstractWrapper(obj){ val createdAt: Long get() = instanceNonNull().getObjectField("mCreatedAt") as Long diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/SnapUUID.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/SnapUUID.kt index d3c381ca..95805420 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/SnapUUID.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/SnapUUID.kt @@ -1,8 +1,8 @@ package me.rhunk.snapenhance.data.wrapper.impl import me.rhunk.snapenhance.SnapEnhance +import me.rhunk.snapenhance.core.util.ktx.getObjectField import me.rhunk.snapenhance.data.wrapper.AbstractWrapper -import me.rhunk.snapenhance.util.ktx.getObjectField import java.nio.ByteBuffer import java.util.UUID diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/UserIdToReaction.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/UserIdToReaction.kt index 88d3a79d..809c299f 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/UserIdToReaction.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/UserIdToReaction.kt @@ -1,7 +1,7 @@ package me.rhunk.snapenhance.data.wrapper.impl +import me.rhunk.snapenhance.core.util.ktx.getObjectField import me.rhunk.snapenhance.data.wrapper.AbstractWrapper -import me.rhunk.snapenhance.util.ktx.getObjectField class UserIdToReaction(obj: Any?) : AbstractWrapper(obj) { val userId = SnapUUID(instanceNonNull().getObjectField("mUserId")) diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/MediaInfo.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/MediaInfo.kt index 747cb494..ae21b773 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/MediaInfo.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/MediaInfo.kt @@ -1,8 +1,8 @@ package me.rhunk.snapenhance.data.wrapper.impl.media import android.os.Parcelable +import me.rhunk.snapenhance.core.util.ktx.getObjectField import me.rhunk.snapenhance.data.wrapper.AbstractWrapper -import me.rhunk.snapenhance.util.ktx.getObjectField import java.lang.reflect.Field diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/Layer.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/Layer.kt index 4ac1fd9e..efe88e5c 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/Layer.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/Layer.kt @@ -1,7 +1,7 @@ package me.rhunk.snapenhance.data.wrapper.impl.media.opera +import me.rhunk.snapenhance.core.util.ReflectionHelper import me.rhunk.snapenhance.data.wrapper.AbstractWrapper -import me.rhunk.snapenhance.util.ReflectionHelper class Layer(obj: Any?) : AbstractWrapper(obj) { val paramMap: ParamMap diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/LayerController.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/LayerController.kt index 2dccd48d..5d17be80 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/LayerController.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/LayerController.kt @@ -1,8 +1,8 @@ package me.rhunk.snapenhance.data.wrapper.impl.media.opera import de.robv.android.xposed.XposedHelpers +import me.rhunk.snapenhance.core.util.ReflectionHelper import me.rhunk.snapenhance.data.wrapper.AbstractWrapper -import me.rhunk.snapenhance.util.ReflectionHelper import java.lang.reflect.Field import java.util.concurrent.ConcurrentHashMap diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/ParamMap.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/ParamMap.kt index 14be6eb9..f28b7cc9 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/ParamMap.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/ParamMap.kt @@ -1,8 +1,8 @@ package me.rhunk.snapenhance.data.wrapper.impl.media.opera +import me.rhunk.snapenhance.core.util.ReflectionHelper +import me.rhunk.snapenhance.core.util.ktx.getObjectField import me.rhunk.snapenhance.data.wrapper.AbstractWrapper -import me.rhunk.snapenhance.util.ReflectionHelper -import me.rhunk.snapenhance.util.ktx.getObjectField import java.lang.reflect.Field import java.util.concurrent.ConcurrentHashMap diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ConfigurationOverride.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ConfigurationOverride.kt index c037872e..78e6fb9b 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ConfigurationOverride.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ConfigurationOverride.kt @@ -1,11 +1,11 @@ package me.rhunk.snapenhance.features.impl import de.robv.android.xposed.XposedHelpers +import me.rhunk.snapenhance.core.util.ktx.setObjectField import me.rhunk.snapenhance.features.Feature import me.rhunk.snapenhance.features.FeatureLoadParams import me.rhunk.snapenhance.hook.HookStage import me.rhunk.snapenhance.hook.hook -import me.rhunk.snapenhance.util.ktx.setObjectField class ConfigurationOverride : Feature("Configuration Override", loadParams = FeatureLoadParams.INIT_SYNC) { override fun init() { diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/Messaging.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/Messaging.kt index 8af58a85..9545bc98 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/Messaging.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/Messaging.kt @@ -1,6 +1,7 @@ package me.rhunk.snapenhance.features.impl import me.rhunk.snapenhance.core.eventbus.events.impl.OnSnapInteractionEvent +import me.rhunk.snapenhance.core.util.ktx.getObjectField import me.rhunk.snapenhance.data.wrapper.impl.SnapUUID import me.rhunk.snapenhance.features.Feature import me.rhunk.snapenhance.features.FeatureLoadParams @@ -8,7 +9,6 @@ import me.rhunk.snapenhance.features.impl.spying.StealthMode import me.rhunk.snapenhance.hook.HookStage import me.rhunk.snapenhance.hook.Hooker import me.rhunk.snapenhance.hook.hook -import me.rhunk.snapenhance.util.ktx.getObjectField class Messaging : Feature("Messaging", loadParams = FeatureLoadParams.ACTIVITY_CREATE_SYNC or FeatureLoadParams.INIT_ASYNC or FeatureLoadParams.INIT_SYNC) { lateinit var conversationManager: Any diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/MediaDownloader.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/MediaDownloader.kt index 167c757a..362d53fd 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/MediaDownloader.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/MediaDownloader.kt @@ -16,6 +16,13 @@ import me.rhunk.snapenhance.core.download.data.MediaDownloadSource import me.rhunk.snapenhance.core.download.data.SplitMediaAssetType import me.rhunk.snapenhance.core.download.data.toKeyPair import me.rhunk.snapenhance.core.messaging.MessagingRuleType +import me.rhunk.snapenhance.core.util.download.RemoteMediaResolver +import me.rhunk.snapenhance.core.util.ktx.getObjectField +import me.rhunk.snapenhance.core.util.protobuf.ProtoReader +import me.rhunk.snapenhance.core.util.snap.BitmojiSelfie +import me.rhunk.snapenhance.core.util.snap.EncryptionHelper +import me.rhunk.snapenhance.core.util.snap.MediaDownloaderHelper +import me.rhunk.snapenhance.core.util.snap.PreviewUtils import me.rhunk.snapenhance.data.ContentType import me.rhunk.snapenhance.data.FileType import me.rhunk.snapenhance.data.wrapper.impl.media.MediaInfo @@ -31,13 +38,6 @@ import me.rhunk.snapenhance.hook.HookAdapter import me.rhunk.snapenhance.hook.HookStage import me.rhunk.snapenhance.hook.Hooker import me.rhunk.snapenhance.ui.ViewAppearanceHelper -import me.rhunk.snapenhance.util.download.RemoteMediaResolver -import me.rhunk.snapenhance.util.ktx.getObjectField -import me.rhunk.snapenhance.util.protobuf.ProtoReader -import me.rhunk.snapenhance.util.snap.BitmojiSelfie -import me.rhunk.snapenhance.util.snap.EncryptionHelper -import me.rhunk.snapenhance.util.snap.MediaDownloaderHelper -import me.rhunk.snapenhance.util.snap.PreviewUtils import java.nio.file.Paths import java.text.SimpleDateFormat import java.util.Locale diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/ProfilePictureDownloader.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/ProfilePictureDownloader.kt index 5cd16311..6e5d6cbc 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/ProfilePictureDownloader.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/ProfilePictureDownloader.kt @@ -5,12 +5,12 @@ import android.widget.Button import android.widget.RelativeLayout import me.rhunk.snapenhance.core.eventbus.events.impl.AddViewEvent import me.rhunk.snapenhance.core.eventbus.events.impl.NetworkApiRequestEvent +import me.rhunk.snapenhance.core.util.protobuf.ProtoReader import me.rhunk.snapenhance.features.Feature import me.rhunk.snapenhance.features.FeatureLoadParams import me.rhunk.snapenhance.hook.HookStage import me.rhunk.snapenhance.hook.Hooker import me.rhunk.snapenhance.ui.ViewAppearanceHelper -import me.rhunk.snapenhance.util.protobuf.ProtoReader import java.nio.ByteBuffer class ProfilePictureDownloader : Feature("ProfilePictureDownloader", loadParams = FeatureLoadParams.ACTIVITY_CREATE_ASYNC) { diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/UnlimitedMultiSnap.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/UnlimitedMultiSnap.kt index 94822200..2c81e11c 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/UnlimitedMultiSnap.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/UnlimitedMultiSnap.kt @@ -1,10 +1,10 @@ package me.rhunk.snapenhance.features.impl.experiments +import me.rhunk.snapenhance.core.util.ktx.setObjectField import me.rhunk.snapenhance.features.Feature import me.rhunk.snapenhance.features.FeatureLoadParams import me.rhunk.snapenhance.hook.HookStage import me.rhunk.snapenhance.hook.hookConstructor -import me.rhunk.snapenhance.util.ktx.setObjectField class UnlimitedMultiSnap : Feature("UnlimitedMultiSnap", loadParams = FeatureLoadParams.ACTIVITY_CREATE_ASYNC) { override fun asyncOnActivityCreate() { diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/AnonymousStoryViewing.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/AnonymousStoryViewing.kt index 086776b1..3891de77 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/AnonymousStoryViewing.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/AnonymousStoryViewing.kt @@ -2,9 +2,9 @@ package me.rhunk.snapenhance.features.impl.spying import kotlinx.coroutines.runBlocking import me.rhunk.snapenhance.core.eventbus.events.impl.NetworkApiRequestEvent +import me.rhunk.snapenhance.core.util.download.HttpServer import me.rhunk.snapenhance.features.Feature import me.rhunk.snapenhance.features.FeatureLoadParams -import me.rhunk.snapenhance.util.download.HttpServer import kotlin.coroutines.suspendCoroutine class AnonymousStoryViewing : Feature("Anonymous Story Viewing", loadParams = FeatureLoadParams.ACTIVITY_CREATE_ASYNC) { diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/AutoSave.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/AutoSave.kt index 37048665..0a8d00a7 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/AutoSave.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/AutoSave.kt @@ -1,7 +1,9 @@ package me.rhunk.snapenhance.features.impl.tweaks -import me.rhunk.snapenhance.Logger +import me.rhunk.snapenhance.core.Logger import me.rhunk.snapenhance.core.messaging.MessagingRuleType +import me.rhunk.snapenhance.core.util.CallbackBuilder +import me.rhunk.snapenhance.core.util.ktx.getObjectField import me.rhunk.snapenhance.data.MessageState import me.rhunk.snapenhance.data.wrapper.impl.Message import me.rhunk.snapenhance.data.wrapper.impl.SnapUUID @@ -12,8 +14,6 @@ import me.rhunk.snapenhance.features.impl.spying.MessageLogger import me.rhunk.snapenhance.features.impl.spying.StealthMode import me.rhunk.snapenhance.hook.HookStage import me.rhunk.snapenhance.hook.Hooker -import me.rhunk.snapenhance.util.CallbackBuilder -import me.rhunk.snapenhance.util.ktx.getObjectField import java.util.concurrent.Executors class AutoSave : MessagingRuleFeature("Auto Save", MessagingRuleType.AUTO_SAVE, loadParams = FeatureLoadParams.ACTIVITY_CREATE_ASYNC) { diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/CameraTweaks.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/CameraTweaks.kt index f6dc2407..56411172 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/CameraTweaks.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/CameraTweaks.kt @@ -8,13 +8,13 @@ import android.hardware.camera2.CameraCharacteristics import android.hardware.camera2.CameraCharacteristics.Key import android.hardware.camera2.CameraManager import android.util.Range +import me.rhunk.snapenhance.core.util.ktx.setObjectField import me.rhunk.snapenhance.data.wrapper.impl.ScSize import me.rhunk.snapenhance.features.Feature import me.rhunk.snapenhance.features.FeatureLoadParams import me.rhunk.snapenhance.hook.HookStage import me.rhunk.snapenhance.hook.hook import me.rhunk.snapenhance.hook.hookConstructor -import me.rhunk.snapenhance.util.ktx.setObjectField class CameraTweaks : Feature("Camera Tweaks", loadParams = FeatureLoadParams.ACTIVITY_CREATE_SYNC) { companion object { diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/DisableReplayInFF.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/DisableReplayInFF.kt index 43921171..a64e51e1 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/DisableReplayInFF.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/DisableReplayInFF.kt @@ -1,11 +1,11 @@ package me.rhunk.snapenhance.features.impl.tweaks +import me.rhunk.snapenhance.core.util.ktx.getObjectField +import me.rhunk.snapenhance.core.util.ktx.setEnumField import me.rhunk.snapenhance.features.Feature import me.rhunk.snapenhance.features.FeatureLoadParams import me.rhunk.snapenhance.hook.HookStage import me.rhunk.snapenhance.hook.hookConstructor -import me.rhunk.snapenhance.util.ktx.getObjectField -import me.rhunk.snapenhance.util.ktx.setEnumField class DisableReplayInFF : Feature("DisableReplayInFF", loadParams = FeatureLoadParams.ACTIVITY_CREATE_ASYNC) { override fun asyncOnActivityCreate() { diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/Notifications.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/Notifications.kt index 2f414928..cd5d09ac 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/Notifications.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/Notifications.kt @@ -12,9 +12,16 @@ import android.os.Bundle import android.os.UserHandle import de.robv.android.xposed.XposedBridge import de.robv.android.xposed.XposedHelpers -import me.rhunk.snapenhance.Logger +import me.rhunk.snapenhance.core.Logger import me.rhunk.snapenhance.core.download.data.SplitMediaAssetType import me.rhunk.snapenhance.core.eventbus.events.impl.SnapWidgetBroadcastReceiveEvent +import me.rhunk.snapenhance.core.util.CallbackBuilder +import me.rhunk.snapenhance.core.util.ktx.setObjectField +import me.rhunk.snapenhance.core.util.protobuf.ProtoReader +import me.rhunk.snapenhance.core.util.snap.EncryptionHelper +import me.rhunk.snapenhance.core.util.snap.MediaDownloaderHelper +import me.rhunk.snapenhance.core.util.snap.PreviewUtils +import me.rhunk.snapenhance.core.util.snap.SnapWidgetBroadcastReceiverHelper import me.rhunk.snapenhance.data.ContentType import me.rhunk.snapenhance.data.MediaReferenceType import me.rhunk.snapenhance.data.wrapper.impl.Message @@ -26,13 +33,6 @@ import me.rhunk.snapenhance.features.impl.downloader.MediaDownloader import me.rhunk.snapenhance.hook.HookStage import me.rhunk.snapenhance.hook.Hooker import me.rhunk.snapenhance.hook.hook -import me.rhunk.snapenhance.util.CallbackBuilder -import me.rhunk.snapenhance.util.ktx.setObjectField -import me.rhunk.snapenhance.util.protobuf.ProtoReader -import me.rhunk.snapenhance.util.snap.EncryptionHelper -import me.rhunk.snapenhance.util.snap.MediaDownloaderHelper -import me.rhunk.snapenhance.util.snap.PreviewUtils -import me.rhunk.snapenhance.util.snap.SnapWidgetBroadcastReceiverHelper class Notifications : Feature("Notifications", loadParams = FeatureLoadParams.INIT_SYNC) { companion object{ diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/OldBitmojiSelfie.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/OldBitmojiSelfie.kt index b860c575..d08f3718 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/OldBitmojiSelfie.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/OldBitmojiSelfie.kt @@ -1,9 +1,9 @@ package me.rhunk.snapenhance.features.impl.tweaks import me.rhunk.snapenhance.core.eventbus.events.impl.NetworkApiRequestEvent +import me.rhunk.snapenhance.core.util.snap.BitmojiSelfie import me.rhunk.snapenhance.features.Feature import me.rhunk.snapenhance.features.FeatureLoadParams -import me.rhunk.snapenhance.util.snap.BitmojiSelfie class OldBitmojiSelfie : Feature("OldBitmojiSelfie", loadParams = FeatureLoadParams.INIT_SYNC) { override fun init() { diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/SendOverride.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/SendOverride.kt index a7e0672f..2ebdb34c 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/SendOverride.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/SendOverride.kt @@ -3,13 +3,13 @@ package me.rhunk.snapenhance.features.impl.tweaks import me.rhunk.snapenhance.Constants import me.rhunk.snapenhance.core.eventbus.events.impl.SendMessageWithContentEvent import me.rhunk.snapenhance.core.eventbus.events.impl.UnaryCallEvent +import me.rhunk.snapenhance.core.util.protobuf.ProtoEditor +import me.rhunk.snapenhance.core.util.protobuf.ProtoReader import me.rhunk.snapenhance.data.ContentType import me.rhunk.snapenhance.data.MessageSender import me.rhunk.snapenhance.features.Feature import me.rhunk.snapenhance.features.FeatureLoadParams import me.rhunk.snapenhance.ui.ViewAppearanceHelper -import me.rhunk.snapenhance.util.protobuf.ProtoEditor -import me.rhunk.snapenhance.util.protobuf.ProtoReader class SendOverride : Feature("Send Override", loadParams = FeatureLoadParams.INIT_SYNC) { private var isLastSnapSavable = false diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/UnlimitedSnapViewTime.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/UnlimitedSnapViewTime.kt index be32bc7c..94d988ca 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/UnlimitedSnapViewTime.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/UnlimitedSnapViewTime.kt @@ -1,20 +1,20 @@ package me.rhunk.snapenhance.features.impl.tweaks +import me.rhunk.snapenhance.core.util.protobuf.ProtoEditor +import me.rhunk.snapenhance.core.util.protobuf.ProtoReader import me.rhunk.snapenhance.data.ContentType import me.rhunk.snapenhance.data.MessageState import me.rhunk.snapenhance.data.wrapper.impl.Message import me.rhunk.snapenhance.features.Feature import me.rhunk.snapenhance.features.FeatureLoadParams import me.rhunk.snapenhance.hook.HookStage -import me.rhunk.snapenhance.hook.Hooker -import me.rhunk.snapenhance.util.protobuf.ProtoEditor -import me.rhunk.snapenhance.util.protobuf.ProtoReader +import me.rhunk.snapenhance.hook.hookConstructor class UnlimitedSnapViewTime : Feature("UnlimitedSnapViewTime", loadParams = FeatureLoadParams.ACTIVITY_CREATE_SYNC) { override fun onActivityCreate() { val state by context.config.messaging.unlimitedSnapViewTime - Hooker.hookConstructor(context.classCache.message, HookStage.AFTER, { state }) { param -> + context.classCache.message.hookConstructor(HookStage.AFTER, { state }) { param -> val message = Message(param.thisObject()) if (message.messageState != MessageState.COMMITTED) return@hookConstructor if (message.messageContent.contentType != ContentType.SNAP) return@hookConstructor diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/PinConversations.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/PinConversations.kt index 5b6b57c8..2422a728 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/PinConversations.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/PinConversations.kt @@ -1,14 +1,14 @@ package me.rhunk.snapenhance.features.impl.ui import me.rhunk.snapenhance.core.bridge.types.BridgeFileType +import me.rhunk.snapenhance.core.util.ktx.getObjectField +import me.rhunk.snapenhance.core.util.ktx.setObjectField import me.rhunk.snapenhance.data.wrapper.impl.SnapUUID import me.rhunk.snapenhance.features.BridgeFileFeature import me.rhunk.snapenhance.features.FeatureLoadParams import me.rhunk.snapenhance.hook.HookStage import me.rhunk.snapenhance.hook.hook import me.rhunk.snapenhance.hook.hookConstructor -import me.rhunk.snapenhance.util.ktx.getObjectField -import me.rhunk.snapenhance.util.ktx.setObjectField class PinConversations : BridgeFileFeature("PinConversations", BridgeFileType.PINNED_CONVERSATIONS, loadParams = FeatureLoadParams.ACTIVITY_CREATE_SYNC) { override fun onActivityCreate() { diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/manager/impl/FeatureManager.kt b/core/src/main/kotlin/me/rhunk/snapenhance/manager/impl/FeatureManager.kt index dd2ec57c..ed69fb89 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/manager/impl/FeatureManager.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/manager/impl/FeatureManager.kt @@ -1,7 +1,7 @@ package me.rhunk.snapenhance.manager.impl -import me.rhunk.snapenhance.Logger import me.rhunk.snapenhance.ModContext +import me.rhunk.snapenhance.core.Logger import me.rhunk.snapenhance.features.Feature import me.rhunk.snapenhance.features.FeatureLoadParams import me.rhunk.snapenhance.features.impl.ConfigurationOverride @@ -34,8 +34,8 @@ import me.rhunk.snapenhance.features.impl.tweaks.OldBitmojiSelfie import me.rhunk.snapenhance.features.impl.tweaks.SendOverride import me.rhunk.snapenhance.features.impl.tweaks.SnapchatPlus import me.rhunk.snapenhance.features.impl.tweaks.UnlimitedSnapViewTime -import me.rhunk.snapenhance.features.impl.ui.PinConversations import me.rhunk.snapenhance.features.impl.ui.ClientBootstrapOverride +import me.rhunk.snapenhance.features.impl.ui.PinConversations import me.rhunk.snapenhance.features.impl.ui.UITweaks import me.rhunk.snapenhance.manager.Manager import me.rhunk.snapenhance.ui.menu.impl.MenuViewInjector diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/FriendFeedInfoMenu.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/FriendFeedInfoMenu.kt index 918d89d4..21a069f8 100644 --- a/core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/FriendFeedInfoMenu.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/FriendFeedInfoMenu.kt @@ -14,6 +14,7 @@ import android.widget.Switch import me.rhunk.snapenhance.core.database.objects.ConversationMessage import me.rhunk.snapenhance.core.database.objects.FriendInfo import me.rhunk.snapenhance.core.database.objects.UserConversationLink +import me.rhunk.snapenhance.core.util.snap.BitmojiSelfie import me.rhunk.snapenhance.data.ContentType import me.rhunk.snapenhance.features.MessagingRuleFeature import me.rhunk.snapenhance.features.impl.Messaging @@ -22,7 +23,6 @@ import me.rhunk.snapenhance.features.impl.spying.StealthMode import me.rhunk.snapenhance.features.impl.tweaks.AutoSave import me.rhunk.snapenhance.ui.ViewAppearanceHelper import me.rhunk.snapenhance.ui.menu.AbstractMenu -import me.rhunk.snapenhance.util.snap.BitmojiSelfie import java.net.HttpURLConnection import java.net.URL import java.text.DateFormat