diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index f6c50924..6d1ced79 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -31,5 +31,5 @@ # Gson -keep class org.fossify.commons.models.SimpleContact { *; } --keep class org.fossify.smsmessenger.models.Attachment { *; } --keep class org.fossify.smsmessenger.models.MessageAttachment { *; } +-keep class org.fossify.messages.models.Attachment { *; } +-keep class org.fossify.messages.models.MessageAttachment { *; } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b77eb23f..f6a3b83f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -221,7 +221,7 @@ android:enabled="true" android:exported="true"> - + @@ -230,7 +230,7 @@ android:enabled="true" android:exported="true"> - + @@ -239,7 +239,7 @@ android:enabled="true" android:exported="true"> - + diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/App.kt b/app/src/main/kotlin/org/fossify/messages/App.kt similarity index 86% rename from app/src/main/kotlin/org/fossify/smsmessenger/App.kt rename to app/src/main/kotlin/org/fossify/messages/App.kt index 3e85c740..f9b3ebae 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/App.kt +++ b/app/src/main/kotlin/org/fossify/messages/App.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger +package org.fossify.messages import android.app.Application import org.fossify.commons.extensions.checkUseEnglish diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/activities/ArchivedConversationsActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/ArchivedConversationsActivity.kt similarity index 90% rename from app/src/main/kotlin/org/fossify/smsmessenger/activities/ArchivedConversationsActivity.kt rename to app/src/main/kotlin/org/fossify/messages/activities/ArchivedConversationsActivity.kt index 51b00a23..6cfb9705 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/activities/ArchivedConversationsActivity.kt +++ b/app/src/main/kotlin/org/fossify/messages/activities/ArchivedConversationsActivity.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.activities +package org.fossify.messages.activities import android.annotation.SuppressLint import android.content.Intent @@ -8,16 +8,16 @@ import org.fossify.commons.extensions.* import org.fossify.commons.helpers.NavigationIcon import org.fossify.commons.helpers.WAS_PROTECTION_HANDLED import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.adapters.ArchivedConversationsAdapter -import org.fossify.smsmessenger.databinding.ActivityArchivedConversationsBinding -import org.fossify.smsmessenger.extensions.config -import org.fossify.smsmessenger.extensions.conversationsDB -import org.fossify.smsmessenger.extensions.removeAllArchivedConversations -import org.fossify.smsmessenger.helpers.THREAD_ID -import org.fossify.smsmessenger.helpers.THREAD_TITLE -import org.fossify.smsmessenger.models.Conversation -import org.fossify.smsmessenger.models.Events +import org.fossify.messages.R +import org.fossify.messages.adapters.ArchivedConversationsAdapter +import org.fossify.messages.databinding.ActivityArchivedConversationsBinding +import org.fossify.messages.extensions.config +import org.fossify.messages.extensions.conversationsDB +import org.fossify.messages.extensions.removeAllArchivedConversations +import org.fossify.messages.helpers.THREAD_ID +import org.fossify.messages.helpers.THREAD_TITLE +import org.fossify.messages.models.Conversation +import org.fossify.messages.models.Events import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/activities/ConversationDetailsActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/ConversationDetailsActivity.kt similarity index 94% rename from app/src/main/kotlin/org/fossify/smsmessenger/activities/ConversationDetailsActivity.kt rename to app/src/main/kotlin/org/fossify/messages/activities/ConversationDetailsActivity.kt index acccbf4e..f5c40a15 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/activities/ConversationDetailsActivity.kt +++ b/app/src/main/kotlin/org/fossify/messages/activities/ConversationDetailsActivity.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.activities +package org.fossify.messages.activities import android.app.NotificationChannel import android.app.NotificationManager @@ -16,12 +16,12 @@ import org.fossify.commons.helpers.NavigationIcon import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.helpers.isOreoPlus import org.fossify.commons.models.SimpleContact -import org.fossify.smsmessenger.adapters.ContactsAdapter -import org.fossify.smsmessenger.databinding.ActivityConversationDetailsBinding -import org.fossify.smsmessenger.dialogs.RenameConversationDialog -import org.fossify.smsmessenger.extensions.* -import org.fossify.smsmessenger.helpers.THREAD_ID -import org.fossify.smsmessenger.models.Conversation +import org.fossify.messages.adapters.ContactsAdapter +import org.fossify.messages.databinding.ActivityConversationDetailsBinding +import org.fossify.messages.dialogs.RenameConversationDialog +import org.fossify.messages.extensions.* +import org.fossify.messages.helpers.THREAD_ID +import org.fossify.messages.models.Conversation class ConversationDetailsActivity : SimpleActivity() { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/MainActivity.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/activities/MainActivity.kt rename to app/src/main/kotlin/org/fossify/messages/activities/MainActivity.kt index 1ccab329..92ca5a5f 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/messages/activities/MainActivity.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.activities +package org.fossify.messages.activities import android.annotation.SuppressLint import android.app.Activity @@ -17,19 +17,19 @@ import org.fossify.commons.extensions.* import org.fossify.commons.helpers.* import org.fossify.commons.models.FAQItem import org.fossify.commons.models.Release -import org.fossify.smsmessenger.BuildConfig -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.adapters.ConversationsAdapter -import org.fossify.smsmessenger.adapters.SearchResultsAdapter -import org.fossify.smsmessenger.databinding.ActivityMainBinding -import org.fossify.smsmessenger.extensions.* -import org.fossify.smsmessenger.helpers.SEARCHED_MESSAGE_ID -import org.fossify.smsmessenger.helpers.THREAD_ID -import org.fossify.smsmessenger.helpers.THREAD_TITLE -import org.fossify.smsmessenger.models.Conversation -import org.fossify.smsmessenger.models.Events -import org.fossify.smsmessenger.models.Message -import org.fossify.smsmessenger.models.SearchResult +import org.fossify.messages.BuildConfig +import org.fossify.messages.R +import org.fossify.messages.adapters.ConversationsAdapter +import org.fossify.messages.adapters.SearchResultsAdapter +import org.fossify.messages.databinding.ActivityMainBinding +import org.fossify.messages.extensions.* +import org.fossify.messages.helpers.SEARCHED_MESSAGE_ID +import org.fossify.messages.helpers.THREAD_ID +import org.fossify.messages.helpers.THREAD_TITLE +import org.fossify.messages.models.Conversation +import org.fossify.messages.models.Events +import org.fossify.messages.models.Message +import org.fossify.messages.models.SearchResult import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/activities/ManageBlockedKeywordsActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/ManageBlockedKeywordsActivity.kt similarity index 88% rename from app/src/main/kotlin/org/fossify/smsmessenger/activities/ManageBlockedKeywordsActivity.kt rename to app/src/main/kotlin/org/fossify/messages/activities/ManageBlockedKeywordsActivity.kt index 9a4bd991..a294acc0 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/activities/ManageBlockedKeywordsActivity.kt +++ b/app/src/main/kotlin/org/fossify/messages/activities/ManageBlockedKeywordsActivity.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.activities +package org.fossify.messages.activities import android.os.Bundle import org.fossify.commons.activities.BaseSimpleActivity @@ -8,12 +8,12 @@ import org.fossify.commons.helpers.APP_LAUNCHER_NAME import org.fossify.commons.helpers.NavigationIcon import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.interfaces.RefreshRecyclerViewListener -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.databinding.ActivityManageBlockedKeywordsBinding -import org.fossify.smsmessenger.dialogs.AddBlockedKeywordDialog -import org.fossify.smsmessenger.dialogs.ManageBlockedKeywordsAdapter -import org.fossify.smsmessenger.extensions.config -import org.fossify.smsmessenger.extensions.toArrayList +import org.fossify.messages.R +import org.fossify.messages.databinding.ActivityManageBlockedKeywordsBinding +import org.fossify.messages.dialogs.AddBlockedKeywordDialog +import org.fossify.messages.dialogs.ManageBlockedKeywordsAdapter +import org.fossify.messages.extensions.config +import org.fossify.messages.extensions.toArrayList class ManageBlockedKeywordsActivity : BaseSimpleActivity(), RefreshRecyclerViewListener { override fun getAppIconIDs() = intent.getIntegerArrayListExtra(APP_ICON_IDS) ?: ArrayList() diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/activities/NewConversationActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/NewConversationActivity.kt similarity index 95% rename from app/src/main/kotlin/org/fossify/smsmessenger/activities/NewConversationActivity.kt rename to app/src/main/kotlin/org/fossify/messages/activities/NewConversationActivity.kt index 1670d3a9..5ea63e0a 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/activities/NewConversationActivity.kt +++ b/app/src/main/kotlin/org/fossify/messages/activities/NewConversationActivity.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.activities +package org.fossify.messages.activities import android.content.Intent import android.net.Uri @@ -12,14 +12,14 @@ import org.fossify.commons.extensions.* import org.fossify.commons.helpers.* import org.fossify.commons.models.RadioItem import org.fossify.commons.models.SimpleContact -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.adapters.ContactsAdapter -import org.fossify.smsmessenger.databinding.ActivityNewConversationBinding -import org.fossify.smsmessenger.databinding.ItemSuggestedContactBinding -import org.fossify.smsmessenger.extensions.getSuggestedContacts -import org.fossify.smsmessenger.extensions.getThreadId -import org.fossify.smsmessenger.helpers.* -import org.fossify.smsmessenger.messaging.isShortCodeWithLetters +import org.fossify.messages.R +import org.fossify.messages.adapters.ContactsAdapter +import org.fossify.messages.databinding.ActivityNewConversationBinding +import org.fossify.messages.databinding.ItemSuggestedContactBinding +import org.fossify.messages.extensions.getSuggestedContacts +import org.fossify.messages.extensions.getThreadId +import org.fossify.messages.helpers.* +import org.fossify.messages.messaging.isShortCodeWithLetters import java.net.URLDecoder import java.util.Locale diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/activities/RecycleBinConversationsActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/RecycleBinConversationsActivity.kt similarity index 89% rename from app/src/main/kotlin/org/fossify/smsmessenger/activities/RecycleBinConversationsActivity.kt rename to app/src/main/kotlin/org/fossify/messages/activities/RecycleBinConversationsActivity.kt index c64ae220..bb9f751a 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/activities/RecycleBinConversationsActivity.kt +++ b/app/src/main/kotlin/org/fossify/messages/activities/RecycleBinConversationsActivity.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.activities +package org.fossify.messages.activities import android.annotation.SuppressLint import android.content.Intent @@ -8,17 +8,17 @@ import org.fossify.commons.extensions.* import org.fossify.commons.helpers.NavigationIcon import org.fossify.commons.helpers.WAS_PROTECTION_HANDLED import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.adapters.RecycleBinConversationsAdapter -import org.fossify.smsmessenger.databinding.ActivityRecycleBinConversationsBinding -import org.fossify.smsmessenger.extensions.config -import org.fossify.smsmessenger.extensions.conversationsDB -import org.fossify.smsmessenger.extensions.emptyMessagesRecycleBin -import org.fossify.smsmessenger.helpers.IS_RECYCLE_BIN -import org.fossify.smsmessenger.helpers.THREAD_ID -import org.fossify.smsmessenger.helpers.THREAD_TITLE -import org.fossify.smsmessenger.models.Conversation -import org.fossify.smsmessenger.models.Events +import org.fossify.messages.R +import org.fossify.messages.adapters.RecycleBinConversationsAdapter +import org.fossify.messages.databinding.ActivityRecycleBinConversationsBinding +import org.fossify.messages.extensions.config +import org.fossify.messages.extensions.conversationsDB +import org.fossify.messages.extensions.emptyMessagesRecycleBin +import org.fossify.messages.helpers.IS_RECYCLE_BIN +import org.fossify.messages.helpers.THREAD_ID +import org.fossify.messages.helpers.THREAD_TITLE +import org.fossify.messages.models.Conversation +import org.fossify.messages.models.Events import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/SettingsActivity.kt similarity index 97% rename from app/src/main/kotlin/org/fossify/smsmessenger/activities/SettingsActivity.kt rename to app/src/main/kotlin/org/fossify/messages/activities/SettingsActivity.kt index 7f3546b4..a31f1eb0 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/org/fossify/messages/activities/SettingsActivity.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.activities +package org.fossify.messages.activities import android.annotation.TargetApi import android.content.Intent @@ -13,13 +13,13 @@ import org.fossify.commons.dialogs.* import org.fossify.commons.extensions.* import org.fossify.commons.helpers.* import org.fossify.commons.models.RadioItem -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.databinding.ActivitySettingsBinding -import org.fossify.smsmessenger.dialogs.ExportMessagesDialog -import org.fossify.smsmessenger.extensions.config -import org.fossify.smsmessenger.extensions.emptyMessagesRecycleBin -import org.fossify.smsmessenger.extensions.messagesDB -import org.fossify.smsmessenger.helpers.* +import org.fossify.messages.R +import org.fossify.messages.databinding.ActivitySettingsBinding +import org.fossify.messages.dialogs.ExportMessagesDialog +import org.fossify.messages.extensions.config +import org.fossify.messages.extensions.emptyMessagesRecycleBin +import org.fossify.messages.extensions.messagesDB +import org.fossify.messages.helpers.* import java.util.Locale import kotlin.system.exitProcess diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/activities/SimpleActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/SimpleActivity.kt similarity index 92% rename from app/src/main/kotlin/org/fossify/smsmessenger/activities/SimpleActivity.kt rename to app/src/main/kotlin/org/fossify/messages/activities/SimpleActivity.kt index e86e5474..56e12c13 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/org/fossify/messages/activities/SimpleActivity.kt @@ -1,7 +1,7 @@ -package org.fossify.smsmessenger.activities +package org.fossify.messages.activities import org.fossify.commons.activities.BaseSimpleActivity -import org.fossify.smsmessenger.R +import org.fossify.messages.R open class SimpleActivity : BaseSimpleActivity() { override fun getAppIconIDs() = arrayListOf( diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/activities/SplashActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/SplashActivity.kt similarity index 85% rename from app/src/main/kotlin/org/fossify/smsmessenger/activities/SplashActivity.kt rename to app/src/main/kotlin/org/fossify/messages/activities/SplashActivity.kt index 54b91380..c1014e5c 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/activities/SplashActivity.kt +++ b/app/src/main/kotlin/org/fossify/messages/activities/SplashActivity.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.activities +package org.fossify.messages.activities import android.content.Intent import org.fossify.commons.activities.BaseSplashActivity diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/ThreadActivity.kt similarity index 98% rename from app/src/main/kotlin/org/fossify/smsmessenger/activities/ThreadActivity.kt rename to app/src/main/kotlin/org/fossify/messages/activities/ThreadActivity.kt index dcb9fdf8..4c41e1c5 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/org/fossify/messages/activities/ThreadActivity.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.activities +package org.fossify.messages.activities import android.annotation.SuppressLint import android.app.Activity @@ -53,21 +53,21 @@ import org.fossify.commons.models.PhoneNumber import org.fossify.commons.models.RadioItem import org.fossify.commons.models.SimpleContact import org.fossify.commons.views.MyRecyclerView -import org.fossify.smsmessenger.BuildConfig -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.adapters.AttachmentsAdapter -import org.fossify.smsmessenger.adapters.AutoCompleteTextViewAdapter -import org.fossify.smsmessenger.adapters.ThreadAdapter -import org.fossify.smsmessenger.databinding.ActivityThreadBinding -import org.fossify.smsmessenger.databinding.ItemSelectedContactBinding -import org.fossify.smsmessenger.dialogs.InvalidNumberDialog -import org.fossify.smsmessenger.dialogs.RenameConversationDialog -import org.fossify.smsmessenger.dialogs.ScheduleMessageDialog -import org.fossify.smsmessenger.extensions.* -import org.fossify.smsmessenger.helpers.* -import org.fossify.smsmessenger.messaging.* -import org.fossify.smsmessenger.models.* -import org.fossify.smsmessenger.models.ThreadItem.* +import org.fossify.messages.BuildConfig +import org.fossify.messages.R +import org.fossify.messages.adapters.AttachmentsAdapter +import org.fossify.messages.adapters.AutoCompleteTextViewAdapter +import org.fossify.messages.adapters.ThreadAdapter +import org.fossify.messages.databinding.ActivityThreadBinding +import org.fossify.messages.databinding.ItemSelectedContactBinding +import org.fossify.messages.dialogs.InvalidNumberDialog +import org.fossify.messages.dialogs.RenameConversationDialog +import org.fossify.messages.dialogs.ScheduleMessageDialog +import org.fossify.messages.extensions.* +import org.fossify.messages.helpers.* +import org.fossify.messages.messaging.* +import org.fossify.messages.models.* +import org.fossify.messages.models.ThreadItem.* import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/activities/VCardViewerActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/VCardViewerActivity.kt similarity index 85% rename from app/src/main/kotlin/org/fossify/smsmessenger/activities/VCardViewerActivity.kt rename to app/src/main/kotlin/org/fossify/messages/activities/VCardViewerActivity.kt index 93dc9eda..b06e91c0 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/activities/VCardViewerActivity.kt +++ b/app/src/main/kotlin/org/fossify/messages/activities/VCardViewerActivity.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.activities +package org.fossify.messages.activities import android.content.Intent import android.net.Uri @@ -10,14 +10,14 @@ import org.fossify.commons.extensions.normalizePhoneNumber import org.fossify.commons.extensions.sendEmailIntent import org.fossify.commons.extensions.viewBinding import org.fossify.commons.helpers.NavigationIcon -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.adapters.VCardViewerAdapter -import org.fossify.smsmessenger.databinding.ActivityVcardViewerBinding -import org.fossify.smsmessenger.extensions.dialNumber -import org.fossify.smsmessenger.helpers.EXTRA_VCARD_URI -import org.fossify.smsmessenger.helpers.parseVCardFromUri -import org.fossify.smsmessenger.models.VCardPropertyWrapper -import org.fossify.smsmessenger.models.VCardWrapper +import org.fossify.messages.R +import org.fossify.messages.adapters.VCardViewerAdapter +import org.fossify.messages.databinding.ActivityVcardViewerBinding +import org.fossify.messages.extensions.dialNumber +import org.fossify.messages.helpers.EXTRA_VCARD_URI +import org.fossify.messages.helpers.parseVCardFromUri +import org.fossify.messages.models.VCardPropertyWrapper +import org.fossify.messages.models.VCardWrapper class VCardViewerActivity : SimpleActivity() { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ArchivedConversationsAdapter.kt b/app/src/main/kotlin/org/fossify/messages/adapters/ArchivedConversationsAdapter.kt similarity index 88% rename from app/src/main/kotlin/org/fossify/smsmessenger/adapters/ArchivedConversationsAdapter.kt rename to app/src/main/kotlin/org/fossify/messages/adapters/ArchivedConversationsAdapter.kt index b388dd20..7b1695aa 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ArchivedConversationsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/messages/adapters/ArchivedConversationsAdapter.kt @@ -1,16 +1,16 @@ -package org.fossify.smsmessenger.adapters +package org.fossify.messages.adapters import android.view.Menu import org.fossify.commons.dialogs.ConfirmationDialog import org.fossify.commons.extensions.notificationManager import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.views.MyRecyclerView -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.activities.SimpleActivity -import org.fossify.smsmessenger.extensions.deleteConversation -import org.fossify.smsmessenger.extensions.updateConversationArchivedStatus -import org.fossify.smsmessenger.helpers.refreshMessages -import org.fossify.smsmessenger.models.Conversation +import org.fossify.messages.R +import org.fossify.messages.activities.SimpleActivity +import org.fossify.messages.extensions.deleteConversation +import org.fossify.messages.extensions.updateConversationArchivedStatus +import org.fossify.messages.helpers.refreshMessages +import org.fossify.messages.models.Conversation class ArchivedConversationsAdapter( activity: SimpleActivity, recyclerView: MyRecyclerView, onRefresh: () -> Unit, itemClick: (Any) -> Unit diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/AttachmentsAdapter.kt b/app/src/main/kotlin/org/fossify/messages/adapters/AttachmentsAdapter.kt similarity index 94% rename from app/src/main/kotlin/org/fossify/smsmessenger/adapters/AttachmentsAdapter.kt rename to app/src/main/kotlin/org/fossify/messages/adapters/AttachmentsAdapter.kt index ca56a225..8f1d0427 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/AttachmentsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/messages/adapters/AttachmentsAdapter.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.adapters +package org.fossify.messages.adapters import android.content.Intent import android.graphics.drawable.Drawable @@ -20,14 +20,14 @@ import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target import org.fossify.commons.activities.BaseSimpleActivity import org.fossify.commons.extensions.* -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.activities.VCardViewerActivity -import org.fossify.smsmessenger.databinding.ItemAttachmentDocumentPreviewBinding -import org.fossify.smsmessenger.databinding.ItemAttachmentMediaPreviewBinding -import org.fossify.smsmessenger.databinding.ItemAttachmentVcardPreviewBinding -import org.fossify.smsmessenger.extensions.* -import org.fossify.smsmessenger.helpers.* -import org.fossify.smsmessenger.models.AttachmentSelection +import org.fossify.messages.R +import org.fossify.messages.activities.VCardViewerActivity +import org.fossify.messages.databinding.ItemAttachmentDocumentPreviewBinding +import org.fossify.messages.databinding.ItemAttachmentMediaPreviewBinding +import org.fossify.messages.databinding.ItemAttachmentVcardPreviewBinding +import org.fossify.messages.extensions.* +import org.fossify.messages.helpers.* +import org.fossify.messages.models.AttachmentSelection class AttachmentsAdapter( val activity: BaseSimpleActivity, diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/AutoCompleteTextViewAdapter.kt b/app/src/main/kotlin/org/fossify/messages/adapters/AutoCompleteTextViewAdapter.kt similarity index 97% rename from app/src/main/kotlin/org/fossify/smsmessenger/adapters/AutoCompleteTextViewAdapter.kt rename to app/src/main/kotlin/org/fossify/messages/adapters/AutoCompleteTextViewAdapter.kt index 9ab8304e..19c1e376 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/AutoCompleteTextViewAdapter.kt +++ b/app/src/main/kotlin/org/fossify/messages/adapters/AutoCompleteTextViewAdapter.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.adapters +package org.fossify.messages.adapters import android.view.LayoutInflater import android.view.View @@ -12,7 +12,7 @@ import org.fossify.commons.extensions.getProperBackgroundColor import org.fossify.commons.extensions.normalizeString import org.fossify.commons.helpers.SimpleContactsHelper import org.fossify.commons.models.SimpleContact -import org.fossify.smsmessenger.activities.SimpleActivity +import org.fossify.messages.activities.SimpleActivity class AutoCompleteTextViewAdapter(val activity: SimpleActivity, val contacts: ArrayList) : ArrayAdapter(activity, 0, contacts) { var resultList = ArrayList() diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/BaseConversationsAdapter.kt b/app/src/main/kotlin/org/fossify/messages/adapters/BaseConversationsAdapter.kt similarity index 95% rename from app/src/main/kotlin/org/fossify/smsmessenger/adapters/BaseConversationsAdapter.kt rename to app/src/main/kotlin/org/fossify/messages/adapters/BaseConversationsAdapter.kt index 45b165f6..ac064d68 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/BaseConversationsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/messages/adapters/BaseConversationsAdapter.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.adapters +package org.fossify.messages.adapters import android.graphics.Typeface import android.os.Parcelable @@ -14,11 +14,11 @@ import org.fossify.commons.extensions.* import org.fossify.commons.helpers.SimpleContactsHelper import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.views.MyRecyclerView -import org.fossify.smsmessenger.activities.SimpleActivity -import org.fossify.smsmessenger.databinding.ItemConversationBinding -import org.fossify.smsmessenger.extensions.config -import org.fossify.smsmessenger.extensions.getAllDrafts -import org.fossify.smsmessenger.models.Conversation +import org.fossify.messages.activities.SimpleActivity +import org.fossify.messages.databinding.ItemConversationBinding +import org.fossify.messages.extensions.config +import org.fossify.messages.extensions.getAllDrafts +import org.fossify.messages.models.Conversation @Suppress("LeakingThis") abstract class BaseConversationsAdapter( diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ContactsAdapter.kt b/app/src/main/kotlin/org/fossify/messages/adapters/ContactsAdapter.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/adapters/ContactsAdapter.kt rename to app/src/main/kotlin/org/fossify/messages/adapters/ContactsAdapter.kt index 85c56b24..dd8c2e2f 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/messages/adapters/ContactsAdapter.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.adapters +package org.fossify.messages.adapters import android.text.TextUtils import android.util.TypedValue @@ -12,7 +12,7 @@ import org.fossify.commons.extensions.getTextSize import org.fossify.commons.helpers.SimpleContactsHelper import org.fossify.commons.models.SimpleContact import org.fossify.commons.views.MyRecyclerView -import org.fossify.smsmessenger.activities.SimpleActivity +import org.fossify.messages.activities.SimpleActivity class ContactsAdapter( activity: SimpleActivity, var contacts: ArrayList, recyclerView: MyRecyclerView, itemClick: (Any) -> Unit diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ConversationsAdapter.kt b/app/src/main/kotlin/org/fossify/messages/adapters/ConversationsAdapter.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/adapters/ConversationsAdapter.kt rename to app/src/main/kotlin/org/fossify/messages/adapters/ConversationsAdapter.kt index 379e37b4..c10c04a0 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ConversationsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/messages/adapters/ConversationsAdapter.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.adapters +package org.fossify.messages.adapters import android.content.Intent import android.text.TextUtils @@ -10,13 +10,13 @@ import org.fossify.commons.helpers.KEY_PHONE import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.helpers.isNougatPlus import org.fossify.commons.views.MyRecyclerView -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.activities.SimpleActivity -import org.fossify.smsmessenger.dialogs.RenameConversationDialog -import org.fossify.smsmessenger.extensions.* -import org.fossify.smsmessenger.helpers.refreshMessages -import org.fossify.smsmessenger.messaging.isShortCodeWithLetters -import org.fossify.smsmessenger.models.Conversation +import org.fossify.messages.R +import org.fossify.messages.activities.SimpleActivity +import org.fossify.messages.dialogs.RenameConversationDialog +import org.fossify.messages.extensions.* +import org.fossify.messages.helpers.refreshMessages +import org.fossify.messages.messaging.isShortCodeWithLetters +import org.fossify.messages.models.Conversation class ConversationsAdapter( activity: SimpleActivity, recyclerView: MyRecyclerView, onRefresh: () -> Unit, itemClick: (Any) -> Unit diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/RecycleBinConversationsAdapter.kt b/app/src/main/kotlin/org/fossify/messages/adapters/RecycleBinConversationsAdapter.kt similarity index 89% rename from app/src/main/kotlin/org/fossify/smsmessenger/adapters/RecycleBinConversationsAdapter.kt rename to app/src/main/kotlin/org/fossify/messages/adapters/RecycleBinConversationsAdapter.kt index ce60e6b3..d805f025 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/RecycleBinConversationsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/messages/adapters/RecycleBinConversationsAdapter.kt @@ -1,16 +1,16 @@ -package org.fossify.smsmessenger.adapters +package org.fossify.messages.adapters import android.view.Menu import org.fossify.commons.dialogs.ConfirmationDialog import org.fossify.commons.extensions.notificationManager import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.views.MyRecyclerView -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.activities.SimpleActivity -import org.fossify.smsmessenger.extensions.deleteConversation -import org.fossify.smsmessenger.extensions.restoreAllMessagesFromRecycleBinForConversation -import org.fossify.smsmessenger.helpers.refreshMessages -import org.fossify.smsmessenger.models.Conversation +import org.fossify.messages.R +import org.fossify.messages.activities.SimpleActivity +import org.fossify.messages.extensions.deleteConversation +import org.fossify.messages.extensions.restoreAllMessagesFromRecycleBinForConversation +import org.fossify.messages.helpers.refreshMessages +import org.fossify.messages.models.Conversation class RecycleBinConversationsAdapter( activity: SimpleActivity, recyclerView: MyRecyclerView, onRefresh: () -> Unit, itemClick: (Any) -> Unit diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/SearchResultsAdapter.kt b/app/src/main/kotlin/org/fossify/messages/adapters/SearchResultsAdapter.kt similarity index 94% rename from app/src/main/kotlin/org/fossify/smsmessenger/adapters/SearchResultsAdapter.kt rename to app/src/main/kotlin/org/fossify/messages/adapters/SearchResultsAdapter.kt index 15f7ae38..01523c4f 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/SearchResultsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/messages/adapters/SearchResultsAdapter.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.adapters +package org.fossify.messages.adapters import android.util.TypedValue import android.view.Menu @@ -10,9 +10,9 @@ import org.fossify.commons.extensions.getTextSize import org.fossify.commons.extensions.highlightTextPart import org.fossify.commons.helpers.SimpleContactsHelper import org.fossify.commons.views.MyRecyclerView -import org.fossify.smsmessenger.activities.SimpleActivity -import org.fossify.smsmessenger.databinding.ItemSearchResultBinding -import org.fossify.smsmessenger.models.SearchResult +import org.fossify.messages.activities.SimpleActivity +import org.fossify.messages.databinding.ItemSearchResultBinding +import org.fossify.messages.models.SearchResult class SearchResultsAdapter( activity: SimpleActivity, var searchResults: ArrayList, recyclerView: MyRecyclerView, highlightText: String, itemClick: (Any) -> Unit diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ThreadAdapter.kt b/app/src/main/kotlin/org/fossify/messages/adapters/ThreadAdapter.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/adapters/ThreadAdapter.kt rename to app/src/main/kotlin/org/fossify/messages/adapters/ThreadAdapter.kt index 20c12415..88f4b15b 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/ThreadAdapter.kt +++ b/app/src/main/kotlin/org/fossify/messages/adapters/ThreadAdapter.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.adapters +package org.fossify.messages.adapters import android.annotation.SuppressLint import android.content.Intent @@ -34,21 +34,21 @@ import org.fossify.commons.extensions.* import org.fossify.commons.helpers.SimpleContactsHelper import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.views.MyRecyclerView -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.activities.NewConversationActivity -import org.fossify.smsmessenger.activities.SimpleActivity -import org.fossify.smsmessenger.activities.ThreadActivity -import org.fossify.smsmessenger.activities.VCardViewerActivity -import org.fossify.smsmessenger.databinding.* -import org.fossify.smsmessenger.dialogs.DeleteConfirmationDialog -import org.fossify.smsmessenger.dialogs.MessageDetailsDialog -import org.fossify.smsmessenger.dialogs.SelectTextDialog -import org.fossify.smsmessenger.extensions.* -import org.fossify.smsmessenger.helpers.* -import org.fossify.smsmessenger.models.Attachment -import org.fossify.smsmessenger.models.Message -import org.fossify.smsmessenger.models.ThreadItem -import org.fossify.smsmessenger.models.ThreadItem.* +import org.fossify.messages.R +import org.fossify.messages.activities.NewConversationActivity +import org.fossify.messages.activities.SimpleActivity +import org.fossify.messages.activities.ThreadActivity +import org.fossify.messages.activities.VCardViewerActivity +import org.fossify.messages.databinding.* +import org.fossify.messages.dialogs.DeleteConfirmationDialog +import org.fossify.messages.dialogs.MessageDetailsDialog +import org.fossify.messages.dialogs.SelectTextDialog +import org.fossify.messages.extensions.* +import org.fossify.messages.helpers.* +import org.fossify.messages.models.Attachment +import org.fossify.messages.models.Message +import org.fossify.messages.models.ThreadItem +import org.fossify.messages.models.ThreadItem.* class ThreadAdapter( activity: SimpleActivity, diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/VCardViewerAdapter.kt b/app/src/main/kotlin/org/fossify/messages/adapters/VCardViewerAdapter.kt similarity index 94% rename from app/src/main/kotlin/org/fossify/smsmessenger/adapters/VCardViewerAdapter.kt rename to app/src/main/kotlin/org/fossify/messages/adapters/VCardViewerAdapter.kt index 4cfcc54a..aef32bad 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/adapters/VCardViewerAdapter.kt +++ b/app/src/main/kotlin/org/fossify/messages/adapters/VCardViewerAdapter.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.adapters +package org.fossify.messages.adapters import android.util.TypedValue import android.view.ViewGroup @@ -11,12 +11,12 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import com.bumptech.glide.request.RequestOptions import org.fossify.commons.extensions.* import org.fossify.commons.helpers.SimpleContactsHelper -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.activities.SimpleActivity -import org.fossify.smsmessenger.databinding.ItemVcardContactBinding -import org.fossify.smsmessenger.databinding.ItemVcardContactPropertyBinding -import org.fossify.smsmessenger.models.VCardPropertyWrapper -import org.fossify.smsmessenger.models.VCardWrapper +import org.fossify.messages.R +import org.fossify.messages.activities.SimpleActivity +import org.fossify.messages.databinding.ItemVcardContactBinding +import org.fossify.messages.databinding.ItemVcardContactPropertyBinding +import org.fossify.messages.models.VCardPropertyWrapper +import org.fossify.messages.models.VCardWrapper private const val TYPE_VCARD_CONTACT = 1 private const val TYPE_VCARD_CONTACT_PROPERTY = 2 diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/databases/MessagesDatabase.kt b/app/src/main/kotlin/org/fossify/messages/databases/MessagesDatabase.kt similarity index 94% rename from app/src/main/kotlin/org/fossify/smsmessenger/databases/MessagesDatabase.kt rename to app/src/main/kotlin/org/fossify/messages/databases/MessagesDatabase.kt index 6920274f..bf843a9c 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/databases/MessagesDatabase.kt +++ b/app/src/main/kotlin/org/fossify/messages/databases/MessagesDatabase.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.databases +package org.fossify.messages.databases import android.content.Context import androidx.room.Database @@ -7,12 +7,12 @@ import androidx.room.RoomDatabase import androidx.room.TypeConverters import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase -import org.fossify.smsmessenger.helpers.Converters -import org.fossify.smsmessenger.interfaces.AttachmentsDao -import org.fossify.smsmessenger.interfaces.ConversationsDao -import org.fossify.smsmessenger.interfaces.MessageAttachmentsDao -import org.fossify.smsmessenger.interfaces.MessagesDao -import org.fossify.smsmessenger.models.* +import org.fossify.messages.helpers.Converters +import org.fossify.messages.interfaces.AttachmentsDao +import org.fossify.messages.interfaces.ConversationsDao +import org.fossify.messages.interfaces.MessageAttachmentsDao +import org.fossify.messages.interfaces.MessagesDao +import org.fossify.messages.models.* @Database(entities = [Conversation::class, Attachment::class, MessageAttachment::class, Message::class, RecycleBinMessage::class], version = 8) @TypeConverters(Converters::class) diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/AddBlockedKeywordDialog.kt b/app/src/main/kotlin/org/fossify/messages/dialogs/AddBlockedKeywordDialog.kt similarity index 91% rename from app/src/main/kotlin/org/fossify/smsmessenger/dialogs/AddBlockedKeywordDialog.kt rename to app/src/main/kotlin/org/fossify/messages/dialogs/AddBlockedKeywordDialog.kt index e7284bad..18b1181e 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/AddBlockedKeywordDialog.kt +++ b/app/src/main/kotlin/org/fossify/messages/dialogs/AddBlockedKeywordDialog.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.dialogs +package org.fossify.messages.dialogs import androidx.appcompat.app.AlertDialog import org.fossify.commons.activities.BaseSimpleActivity @@ -6,8 +6,8 @@ import org.fossify.commons.extensions.getAlertDialogBuilder import org.fossify.commons.extensions.setupDialogStuff import org.fossify.commons.extensions.showKeyboard import org.fossify.commons.extensions.value -import org.fossify.smsmessenger.databinding.DialogAddBlockedKeywordBinding -import org.fossify.smsmessenger.extensions.config +import org.fossify.messages.databinding.DialogAddBlockedKeywordBinding +import org.fossify.messages.extensions.config class AddBlockedKeywordDialog(val activity: BaseSimpleActivity, private val originalKeyword: String? = null, val callback: () -> Unit) { init { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/DeleteConfirmationDialog.kt b/app/src/main/kotlin/org/fossify/messages/dialogs/DeleteConfirmationDialog.kt similarity index 91% rename from app/src/main/kotlin/org/fossify/smsmessenger/dialogs/DeleteConfirmationDialog.kt rename to app/src/main/kotlin/org/fossify/messages/dialogs/DeleteConfirmationDialog.kt index ce1a3d1a..e91c68fa 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/DeleteConfirmationDialog.kt +++ b/app/src/main/kotlin/org/fossify/messages/dialogs/DeleteConfirmationDialog.kt @@ -1,11 +1,11 @@ -package org.fossify.smsmessenger.dialogs +package org.fossify.messages.dialogs import android.app.Activity import androidx.appcompat.app.AlertDialog import org.fossify.commons.extensions.beGoneIf import org.fossify.commons.extensions.getAlertDialogBuilder import org.fossify.commons.extensions.setupDialogStuff -import org.fossify.smsmessenger.databinding.DialogDeleteConfirmationBinding +import org.fossify.messages.databinding.DialogDeleteConfirmationBinding class DeleteConfirmationDialog( private val activity: Activity, diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ExportMessagesDialog.kt b/app/src/main/kotlin/org/fossify/messages/dialogs/ExportMessagesDialog.kt similarity index 87% rename from app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ExportMessagesDialog.kt rename to app/src/main/kotlin/org/fossify/messages/dialogs/ExportMessagesDialog.kt index b1deaf0c..e10c87d3 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ExportMessagesDialog.kt +++ b/app/src/main/kotlin/org/fossify/messages/dialogs/ExportMessagesDialog.kt @@ -1,11 +1,11 @@ -package org.fossify.smsmessenger.dialogs +package org.fossify.messages.dialogs import androidx.appcompat.app.AlertDialog import org.fossify.commons.extensions.* -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.activities.SimpleActivity -import org.fossify.smsmessenger.databinding.DialogExportMessagesBinding -import org.fossify.smsmessenger.extensions.config +import org.fossify.messages.R +import org.fossify.messages.activities.SimpleActivity +import org.fossify.messages.databinding.DialogExportMessagesBinding +import org.fossify.messages.extensions.config class ExportMessagesDialog( private val activity: SimpleActivity, diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ImportMessagesDialog.kt b/app/src/main/kotlin/org/fossify/messages/dialogs/ImportMessagesDialog.kt similarity index 86% rename from app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ImportMessagesDialog.kt rename to app/src/main/kotlin/org/fossify/messages/dialogs/ImportMessagesDialog.kt index 299e79d3..750c1b68 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ImportMessagesDialog.kt +++ b/app/src/main/kotlin/org/fossify/messages/dialogs/ImportMessagesDialog.kt @@ -1,17 +1,17 @@ -package org.fossify.smsmessenger.dialogs +package org.fossify.messages.dialogs import androidx.appcompat.app.AlertDialog import org.fossify.commons.extensions.getAlertDialogBuilder import org.fossify.commons.extensions.setupDialogStuff import org.fossify.commons.extensions.toast import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.activities.SimpleActivity -import org.fossify.smsmessenger.databinding.DialogImportMessagesBinding -import org.fossify.smsmessenger.extensions.config -import org.fossify.smsmessenger.helpers.MessagesImporter -import org.fossify.smsmessenger.models.ImportResult -import org.fossify.smsmessenger.models.MessagesBackup +import org.fossify.messages.R +import org.fossify.messages.activities.SimpleActivity +import org.fossify.messages.databinding.DialogImportMessagesBinding +import org.fossify.messages.extensions.config +import org.fossify.messages.helpers.MessagesImporter +import org.fossify.messages.models.ImportResult +import org.fossify.messages.models.MessagesBackup class ImportMessagesDialog( private val activity: SimpleActivity, diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/InvalidNumberDialog.kt b/app/src/main/kotlin/org/fossify/messages/dialogs/InvalidNumberDialog.kt similarity index 85% rename from app/src/main/kotlin/org/fossify/smsmessenger/dialogs/InvalidNumberDialog.kt rename to app/src/main/kotlin/org/fossify/messages/dialogs/InvalidNumberDialog.kt index 7f2ace3f..34433d14 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/InvalidNumberDialog.kt +++ b/app/src/main/kotlin/org/fossify/messages/dialogs/InvalidNumberDialog.kt @@ -1,9 +1,9 @@ -package org.fossify.smsmessenger.dialogs +package org.fossify.messages.dialogs import org.fossify.commons.activities.BaseSimpleActivity import org.fossify.commons.extensions.getAlertDialogBuilder import org.fossify.commons.extensions.setupDialogStuff -import org.fossify.smsmessenger.databinding.DialogInvalidNumberBinding +import org.fossify.messages.databinding.DialogInvalidNumberBinding class InvalidNumberDialog(val activity: BaseSimpleActivity, val text: String) { init { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ManageBlockedKeywordsAdapter.kt b/app/src/main/kotlin/org/fossify/messages/dialogs/ManageBlockedKeywordsAdapter.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ManageBlockedKeywordsAdapter.kt rename to app/src/main/kotlin/org/fossify/messages/dialogs/ManageBlockedKeywordsAdapter.kt index 3278fcfe..05ff3bbf 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ManageBlockedKeywordsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/messages/dialogs/ManageBlockedKeywordsAdapter.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.dialogs +package org.fossify.messages.dialogs import android.view.* import android.widget.PopupMenu @@ -10,9 +10,9 @@ import org.fossify.commons.extensions.getProperTextColor import org.fossify.commons.extensions.setupViewBackground import org.fossify.commons.interfaces.RefreshRecyclerViewListener import org.fossify.commons.views.MyRecyclerView -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.databinding.ItemManageBlockedKeywordBinding -import org.fossify.smsmessenger.extensions.config +import org.fossify.messages.R +import org.fossify.messages.databinding.ItemManageBlockedKeywordBinding +import org.fossify.messages.extensions.config class ManageBlockedKeywordsAdapter( activity: BaseSimpleActivity, var blockedKeywords: ArrayList, val listener: RefreshRecyclerViewListener?, diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/MessageDetailsDialog.kt b/app/src/main/kotlin/org/fossify/messages/dialogs/MessageDetailsDialog.kt similarity index 91% rename from app/src/main/kotlin/org/fossify/smsmessenger/dialogs/MessageDetailsDialog.kt rename to app/src/main/kotlin/org/fossify/messages/dialogs/MessageDetailsDialog.kt index 4e05ac18..c9340d05 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/MessageDetailsDialog.kt +++ b/app/src/main/kotlin/org/fossify/messages/dialogs/MessageDetailsDialog.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.dialogs +package org.fossify.messages.dialogs import android.annotation.SuppressLint import android.telephony.SubscriptionInfo @@ -7,10 +7,10 @@ import org.fossify.commons.dialogs.BasePropertiesDialog import org.fossify.commons.extensions.getAlertDialogBuilder import org.fossify.commons.extensions.getTimeFormat import org.fossify.commons.extensions.setupDialogStuff -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.extensions.config -import org.fossify.smsmessenger.extensions.subscriptionManagerCompat -import org.fossify.smsmessenger.models.Message +import org.fossify.messages.R +import org.fossify.messages.extensions.config +import org.fossify.messages.extensions.subscriptionManagerCompat +import org.fossify.messages.models.Message import org.joda.time.DateTime class MessageDetailsDialog(val activity: BaseSimpleActivity, val message: Message) : BasePropertiesDialog(activity) { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/RenameConversationDialog.kt b/app/src/main/kotlin/org/fossify/messages/dialogs/RenameConversationDialog.kt similarity index 90% rename from app/src/main/kotlin/org/fossify/smsmessenger/dialogs/RenameConversationDialog.kt rename to app/src/main/kotlin/org/fossify/messages/dialogs/RenameConversationDialog.kt index dc922c57..e2bf3f35 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/RenameConversationDialog.kt +++ b/app/src/main/kotlin/org/fossify/messages/dialogs/RenameConversationDialog.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.dialogs +package org.fossify.messages.dialogs import android.app.Activity import android.content.DialogInterface.BUTTON_POSITIVE @@ -7,9 +7,9 @@ import org.fossify.commons.extensions.getAlertDialogBuilder import org.fossify.commons.extensions.setupDialogStuff import org.fossify.commons.extensions.showKeyboard import org.fossify.commons.extensions.toast -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.databinding.DialogRenameConversationBinding -import org.fossify.smsmessenger.models.Conversation +import org.fossify.messages.R +import org.fossify.messages.databinding.DialogRenameConversationBinding +import org.fossify.messages.models.Conversation class RenameConversationDialog( private val activity: Activity, diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ScheduleMessageDialog.kt b/app/src/main/kotlin/org/fossify/messages/dialogs/ScheduleMessageDialog.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ScheduleMessageDialog.kt rename to app/src/main/kotlin/org/fossify/messages/dialogs/ScheduleMessageDialog.kt index 4fa4af4e..d7c3e327 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/ScheduleMessageDialog.kt +++ b/app/src/main/kotlin/org/fossify/messages/dialogs/ScheduleMessageDialog.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.dialogs +package org.fossify.messages.dialogs import android.app.DatePickerDialog import android.app.DatePickerDialog.OnDateSetListener @@ -10,10 +10,10 @@ import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.TimeFormat import org.fossify.commons.activities.BaseSimpleActivity import org.fossify.commons.extensions.* -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.databinding.ScheduleMessageDialogBinding -import org.fossify.smsmessenger.extensions.config -import org.fossify.smsmessenger.extensions.roundToClosestMultipleOf +import org.fossify.messages.R +import org.fossify.messages.databinding.ScheduleMessageDialogBinding +import org.fossify.messages.extensions.config +import org.fossify.messages.extensions.roundToClosestMultipleOf import org.joda.time.DateTime import java.util.Calendar diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/SelectTextDialog.kt b/app/src/main/kotlin/org/fossify/messages/dialogs/SelectTextDialog.kt similarity index 86% rename from app/src/main/kotlin/org/fossify/smsmessenger/dialogs/SelectTextDialog.kt rename to app/src/main/kotlin/org/fossify/messages/dialogs/SelectTextDialog.kt index 4c82b2e0..6b512434 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/dialogs/SelectTextDialog.kt +++ b/app/src/main/kotlin/org/fossify/messages/dialogs/SelectTextDialog.kt @@ -1,9 +1,9 @@ -package org.fossify.smsmessenger.dialogs +package org.fossify.messages.dialogs import org.fossify.commons.activities.BaseSimpleActivity import org.fossify.commons.extensions.getAlertDialogBuilder import org.fossify.commons.extensions.setupDialogStuff -import org.fossify.smsmessenger.databinding.DialogSelectTextBinding +import org.fossify.messages.databinding.DialogSelectTextBinding // helper dialog for selecting just a part of a message, not copying the whole into clipboard class SelectTextDialog(val activity: BaseSimpleActivity, val text: String) { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Activity.kt b/app/src/main/kotlin/org/fossify/messages/extensions/Activity.kt similarity index 98% rename from app/src/main/kotlin/org/fossify/smsmessenger/extensions/Activity.kt rename to app/src/main/kotlin/org/fossify/messages/extensions/Activity.kt index 95b30572..b4dc7ef6 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Activity.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/Activity.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.extensions +package org.fossify.messages.extensions import android.app.Activity import android.content.ActivityNotFoundException diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Bitmap.kt b/app/src/main/kotlin/org/fossify/messages/extensions/Bitmap.kt similarity index 80% rename from app/src/main/kotlin/org/fossify/smsmessenger/extensions/Bitmap.kt rename to app/src/main/kotlin/org/fossify/messages/extensions/Bitmap.kt index 26a2105a..f1fe935f 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Bitmap.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/Bitmap.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.extensions +package org.fossify.messages.extensions import android.graphics.Bitmap diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Collections.kt b/app/src/main/kotlin/org/fossify/messages/extensions/Collections.kt similarity index 95% rename from app/src/main/kotlin/org/fossify/smsmessenger/extensions/Collections.kt rename to app/src/main/kotlin/org/fossify/messages/extensions/Collections.kt index 0549ac58..117e70d8 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Collections.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/Collections.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.extensions +package org.fossify.messages.extensions import android.content.ContentValues diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/org/fossify/messages/extensions/Context.kt similarity index 98% rename from app/src/main/kotlin/org/fossify/smsmessenger/extensions/Context.kt rename to app/src/main/kotlin/org/fossify/messages/extensions/Context.kt index 23b47609..8e18d8d2 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Context.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/Context.kt @@ -1,8 +1,7 @@ -package org.fossify.smsmessenger.extensions +package org.fossify.messages.extensions import android.annotation.SuppressLint import android.app.Application -import android.app.NotificationManager import android.content.ContentResolver import android.content.ContentValues import android.content.Context @@ -26,18 +25,18 @@ import org.fossify.commons.extensions.* import org.fossify.commons.helpers.* import org.fossify.commons.models.PhoneNumber import org.fossify.commons.models.SimpleContact -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.databases.MessagesDatabase -import org.fossify.smsmessenger.helpers.* -import org.fossify.smsmessenger.helpers.AttachmentUtils.parseAttachmentNames -import org.fossify.smsmessenger.interfaces.AttachmentsDao -import org.fossify.smsmessenger.interfaces.ConversationsDao -import org.fossify.smsmessenger.interfaces.MessageAttachmentsDao -import org.fossify.smsmessenger.interfaces.MessagesDao -import org.fossify.smsmessenger.messaging.MessagingUtils -import org.fossify.smsmessenger.messaging.MessagingUtils.Companion.ADDRESS_SEPARATOR -import org.fossify.smsmessenger.messaging.SmsSender -import org.fossify.smsmessenger.models.* +import org.fossify.messages.R +import org.fossify.messages.databases.MessagesDatabase +import org.fossify.messages.helpers.* +import org.fossify.messages.helpers.AttachmentUtils.parseAttachmentNames +import org.fossify.messages.interfaces.AttachmentsDao +import org.fossify.messages.interfaces.ConversationsDao +import org.fossify.messages.interfaces.MessageAttachmentsDao +import org.fossify.messages.interfaces.MessagesDao +import org.fossify.messages.messaging.MessagingUtils +import org.fossify.messages.messaging.MessagingUtils.Companion.ADDRESS_SEPARATOR +import org.fossify.messages.messaging.SmsSender +import org.fossify.messages.models.* import java.io.FileNotFoundException val Context.config: Config get() = Config.newInstance(applicationContext) diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Cursor.kt b/app/src/main/kotlin/org/fossify/messages/extensions/Cursor.kt similarity index 93% rename from app/src/main/kotlin/org/fossify/smsmessenger/extensions/Cursor.kt rename to app/src/main/kotlin/org/fossify/messages/extensions/Cursor.kt index e551f994..24c6792f 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Cursor.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/Cursor.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.extensions +package org.fossify.messages.extensions import android.database.Cursor import com.google.gson.JsonNull diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Date.kt b/app/src/main/kotlin/org/fossify/messages/extensions/Date.kt similarity index 78% rename from app/src/main/kotlin/org/fossify/smsmessenger/extensions/Date.kt rename to app/src/main/kotlin/org/fossify/messages/extensions/Date.kt index 8347b533..2fbce59a 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Date.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/Date.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.extensions +package org.fossify.messages.extensions import android.text.format.DateFormat import java.util.Date diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Math.kt b/app/src/main/kotlin/org/fossify/messages/extensions/Math.kt similarity index 82% rename from app/src/main/kotlin/org/fossify/smsmessenger/extensions/Math.kt rename to app/src/main/kotlin/org/fossify/messages/extensions/Math.kt index f98ebdbd..28c80288 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/Math.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/Math.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.extensions +package org.fossify.messages.extensions import kotlin.math.roundToInt diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/SimpleContact.kt b/app/src/main/kotlin/org/fossify/messages/extensions/SimpleContact.kt similarity index 87% rename from app/src/main/kotlin/org/fossify/smsmessenger/extensions/SimpleContact.kt rename to app/src/main/kotlin/org/fossify/messages/extensions/SimpleContact.kt index b9c588d1..8a06a4c6 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/SimpleContact.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/SimpleContact.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.extensions +package org.fossify.messages.extensions import android.text.TextUtils import org.fossify.commons.models.SimpleContact diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/String.kt b/app/src/main/kotlin/org/fossify/messages/extensions/String.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/extensions/String.kt rename to app/src/main/kotlin/org/fossify/messages/extensions/String.kt index c2bc3c24..bb32dadd 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/String.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/String.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.extensions +package org.fossify.messages.extensions fun String.getExtensionFromMimeType(): String { return when (lowercase()) { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/View.kt b/app/src/main/kotlin/org/fossify/messages/extensions/View.kt similarity index 90% rename from app/src/main/kotlin/org/fossify/smsmessenger/extensions/View.kt rename to app/src/main/kotlin/org/fossify/messages/extensions/View.kt index 1f3b6763..41c0d7ad 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/View.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/View.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.extensions +package org.fossify.messages.extensions import android.animation.ObjectAnimator import android.view.View diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/Gson.kt b/app/src/main/kotlin/org/fossify/messages/extensions/gson/Gson.kt similarity index 85% rename from app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/Gson.kt rename to app/src/main/kotlin/org/fossify/messages/extensions/gson/Gson.kt index 0ac2d30d..f1083f3e 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/Gson.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/gson/Gson.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.extensions.gson +package org.fossify.messages.extensions.gson import com.google.gson.Gson import com.google.gson.GsonBuilder diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/JsonElement.kt b/app/src/main/kotlin/org/fossify/messages/extensions/gson/JsonElement.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/JsonElement.kt rename to app/src/main/kotlin/org/fossify/messages/extensions/gson/JsonElement.kt index f68d4c11..826f5162 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/JsonElement.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/gson/JsonElement.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.extensions.gson +package org.fossify.messages.extensions.gson import com.google.gson.* import java.math.BigDecimal diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/JsonObject.kt b/app/src/main/kotlin/org/fossify/messages/extensions/gson/JsonObject.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/JsonObject.kt rename to app/src/main/kotlin/org/fossify/messages/extensions/gson/JsonObject.kt index a38aeb1a..5ccd3977 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/JsonObject.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/gson/JsonObject.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.extensions.gson +package org.fossify.messages.extensions.gson import com.google.gson.JsonArray import com.google.gson.JsonElement diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/MapDeserializerDoubleAsIntFix.kt b/app/src/main/kotlin/org/fossify/messages/extensions/gson/MapDeserializerDoubleAsIntFix.kt similarity index 97% rename from app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/MapDeserializerDoubleAsIntFix.kt rename to app/src/main/kotlin/org/fossify/messages/extensions/gson/MapDeserializerDoubleAsIntFix.kt index 029c4f50..caefa7ff 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/extensions/gson/MapDeserializerDoubleAsIntFix.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/gson/MapDeserializerDoubleAsIntFix.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.extensions.gson +package org.fossify.messages.extensions.gson import com.google.gson.JsonDeserializationContext import com.google.gson.JsonDeserializer diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/AttachmentPreviews.kt b/app/src/main/kotlin/org/fossify/messages/helpers/AttachmentPreviews.kt similarity index 92% rename from app/src/main/kotlin/org/fossify/smsmessenger/helpers/AttachmentPreviews.kt rename to app/src/main/kotlin/org/fossify/messages/helpers/AttachmentPreviews.kt index ec2bfd51..a2267fee 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/AttachmentPreviews.kt +++ b/app/src/main/kotlin/org/fossify/messages/helpers/AttachmentPreviews.kt @@ -1,16 +1,16 @@ -package org.fossify.smsmessenger.helpers +package org.fossify.messages.helpers import android.app.Activity import android.net.Uri import org.fossify.commons.extensions.* import org.fossify.commons.helpers.SimpleContactsHelper import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.databinding.ItemAttachmentDocumentBinding -import org.fossify.smsmessenger.databinding.ItemAttachmentDocumentPreviewBinding -import org.fossify.smsmessenger.databinding.ItemAttachmentVcardBinding -import org.fossify.smsmessenger.databinding.ItemAttachmentVcardPreviewBinding -import org.fossify.smsmessenger.extensions.* +import org.fossify.messages.R +import org.fossify.messages.databinding.ItemAttachmentDocumentBinding +import org.fossify.messages.databinding.ItemAttachmentDocumentPreviewBinding +import org.fossify.messages.databinding.ItemAttachmentVcardBinding +import org.fossify.messages.databinding.ItemAttachmentVcardPreviewBinding +import org.fossify.messages.extensions.* fun ItemAttachmentDocumentPreviewBinding.setupDocumentPreview( uri: Uri, diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/AttachmentUtils.kt b/app/src/main/kotlin/org/fossify/messages/helpers/AttachmentUtils.kt similarity index 98% rename from app/src/main/kotlin/org/fossify/smsmessenger/helpers/AttachmentUtils.kt rename to app/src/main/kotlin/org/fossify/messages/helpers/AttachmentUtils.kt index e03a00ab..351790a1 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/AttachmentUtils.kt +++ b/app/src/main/kotlin/org/fossify/messages/helpers/AttachmentUtils.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.helpers +package org.fossify.messages.helpers import android.util.Xml import org.xmlpull.v1.XmlPullParser diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/Config.kt b/app/src/main/kotlin/org/fossify/messages/helpers/Config.kt similarity index 97% rename from app/src/main/kotlin/org/fossify/smsmessenger/helpers/Config.kt rename to app/src/main/kotlin/org/fossify/messages/helpers/Config.kt index 3f95471a..8f2dcb48 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/Config.kt +++ b/app/src/main/kotlin/org/fossify/messages/helpers/Config.kt @@ -1,9 +1,9 @@ -package org.fossify.smsmessenger.helpers +package org.fossify.messages.helpers import android.content.Context import org.fossify.commons.helpers.BaseConfig -import org.fossify.smsmessenger.extensions.getDefaultKeyboardHeight -import org.fossify.smsmessenger.models.Conversation +import org.fossify.messages.extensions.getDefaultKeyboardHeight +import org.fossify.messages.models.Conversation class Config(context: Context) : BaseConfig(context) { companion object { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/Constants.kt b/app/src/main/kotlin/org/fossify/messages/helpers/Constants.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/helpers/Constants.kt rename to app/src/main/kotlin/org/fossify/messages/helpers/Constants.kt index fe7e1cdd..b198e5af 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/Constants.kt +++ b/app/src/main/kotlin/org/fossify/messages/helpers/Constants.kt @@ -1,6 +1,6 @@ -package org.fossify.smsmessenger.helpers +package org.fossify.messages.helpers -import org.fossify.smsmessenger.models.Events +import org.fossify.messages.models.Events import org.greenrobot.eventbus.EventBus import org.joda.time.DateTime import org.joda.time.DateTimeZone @@ -46,7 +46,7 @@ const val IS_RECYCLE_BIN = "is_recycle_bin" const val IS_ARCHIVE_AVAILABLE = "is_archive_available" const val CUSTOM_NOTIFICATIONS = "custom_notifications" -private const val PATH = "org.fossify.smsmessenger.action." +private const val PATH = "org.fossify.org.fossify.messages.action." const val MARK_AS_READ = PATH + "mark_as_read" const val REPLY = PATH + "reply" diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/Converters.kt b/app/src/main/kotlin/org/fossify/messages/helpers/Converters.kt similarity index 88% rename from app/src/main/kotlin/org/fossify/smsmessenger/helpers/Converters.kt rename to app/src/main/kotlin/org/fossify/messages/helpers/Converters.kt index b28c191d..fd729a07 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/Converters.kt +++ b/app/src/main/kotlin/org/fossify/messages/helpers/Converters.kt @@ -1,11 +1,11 @@ -package org.fossify.smsmessenger.helpers +package org.fossify.messages.helpers import androidx.room.TypeConverter import com.google.gson.Gson import com.google.gson.reflect.TypeToken import org.fossify.commons.models.SimpleContact -import org.fossify.smsmessenger.models.Attachment -import org.fossify.smsmessenger.models.MessageAttachment +import org.fossify.messages.models.Attachment +import org.fossify.messages.models.MessageAttachment class Converters { private val gson = Gson() diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/ImageCompressor.kt b/app/src/main/kotlin/org/fossify/messages/helpers/ImageCompressor.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/helpers/ImageCompressor.kt rename to app/src/main/kotlin/org/fossify/messages/helpers/ImageCompressor.kt index 18ee26db..5de0d56b 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/ImageCompressor.kt +++ b/app/src/main/kotlin/org/fossify/messages/helpers/ImageCompressor.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.helpers +package org.fossify.messages.helpers import android.content.Context import android.graphics.Bitmap @@ -9,10 +9,10 @@ import android.net.Uri import org.fossify.commons.extensions.getCompressionFormat import org.fossify.commons.extensions.getMyFileUri import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.smsmessenger.extensions.extension -import org.fossify.smsmessenger.extensions.getExtensionFromMimeType -import org.fossify.smsmessenger.extensions.getFileSizeFromUri -import org.fossify.smsmessenger.extensions.isImageMimeType +import org.fossify.messages.extensions.extension +import org.fossify.messages.extensions.getExtensionFromMimeType +import org.fossify.messages.extensions.getFileSizeFromUri +import org.fossify.messages.extensions.isImageMimeType import java.io.File import java.io.FileOutputStream import kotlin.math.roundToInt diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesImporter.kt b/app/src/main/kotlin/org/fossify/messages/helpers/MessagesImporter.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesImporter.kt rename to app/src/main/kotlin/org/fossify/messages/helpers/MessagesImporter.kt index 22886e43..9faa06a6 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesImporter.kt +++ b/app/src/main/kotlin/org/fossify/messages/helpers/MessagesImporter.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.helpers +package org.fossify.messages.helpers import android.net.Uri import android.util.Xml @@ -7,10 +7,10 @@ import kotlinx.serialization.json.Json import org.fossify.commons.extensions.showErrorToast import org.fossify.commons.extensions.toast import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.smsmessenger.activities.SimpleActivity -import org.fossify.smsmessenger.dialogs.ImportMessagesDialog -import org.fossify.smsmessenger.extensions.config -import org.fossify.smsmessenger.models.* +import org.fossify.messages.activities.SimpleActivity +import org.fossify.messages.dialogs.ImportMessagesDialog +import org.fossify.messages.extensions.config +import org.fossify.messages.models.* import org.xmlpull.v1.XmlPullParser import java.io.InputStream diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesReader.kt b/app/src/main/kotlin/org/fossify/messages/helpers/MessagesReader.kt similarity index 98% rename from app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesReader.kt rename to app/src/main/kotlin/org/fossify/messages/helpers/MessagesReader.kt index c1afcf86..90b7de12 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesReader.kt +++ b/app/src/main/kotlin/org/fossify/messages/helpers/MessagesReader.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.helpers +package org.fossify.messages.helpers import android.annotation.SuppressLint import android.content.Context @@ -9,8 +9,8 @@ import android.util.Base64 import org.fossify.commons.extensions.* import org.fossify.commons.helpers.isQPlus import org.fossify.commons.helpers.isRPlus -import org.fossify.smsmessenger.extensions.getConversationIds -import org.fossify.smsmessenger.models.* +import org.fossify.messages.extensions.getConversationIds +import org.fossify.messages.models.* import java.io.IOException import java.io.InputStream diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesWriter.kt b/app/src/main/kotlin/org/fossify/messages/helpers/MessagesWriter.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesWriter.kt rename to app/src/main/kotlin/org/fossify/messages/helpers/MessagesWriter.kt index d0b45b58..52f474fc 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/MessagesWriter.kt +++ b/app/src/main/kotlin/org/fossify/messages/helpers/MessagesWriter.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.helpers +package org.fossify.messages.helpers import android.annotation.SuppressLint import android.content.Context @@ -11,10 +11,10 @@ import com.klinker.android.send_message.Utils import org.fossify.commons.extensions.getLongValue import org.fossify.commons.extensions.queryCursor import org.fossify.commons.helpers.isRPlus -import org.fossify.smsmessenger.models.MmsAddress -import org.fossify.smsmessenger.models.MmsBackup -import org.fossify.smsmessenger.models.MmsPart -import org.fossify.smsmessenger.models.SmsBackup +import org.fossify.messages.models.MmsAddress +import org.fossify.messages.models.MmsBackup +import org.fossify.messages.models.MmsPart +import org.fossify.messages.models.SmsBackup class MessagesWriter(private val context: Context) { private val INVALID_ID = -1L diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/NotificationHelper.kt b/app/src/main/kotlin/org/fossify/messages/helpers/NotificationHelper.kt similarity index 95% rename from app/src/main/kotlin/org/fossify/smsmessenger/helpers/NotificationHelper.kt rename to app/src/main/kotlin/org/fossify/messages/helpers/NotificationHelper.kt index 32a89083..5f490889 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/NotificationHelper.kt +++ b/app/src/main/kotlin/org/fossify/messages/helpers/NotificationHelper.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.helpers +package org.fossify.messages.helpers import android.annotation.SuppressLint import android.app.Notification @@ -19,13 +19,13 @@ import org.fossify.commons.extensions.notificationManager import org.fossify.commons.helpers.SimpleContactsHelper import org.fossify.commons.helpers.isNougatPlus import org.fossify.commons.helpers.isOreoPlus -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.activities.ThreadActivity -import org.fossify.smsmessenger.extensions.config -import org.fossify.smsmessenger.messaging.isShortCodeWithLetters -import org.fossify.smsmessenger.receivers.DeleteSmsReceiver -import org.fossify.smsmessenger.receivers.DirectReplyReceiver -import org.fossify.smsmessenger.receivers.MarkAsReadReceiver +import org.fossify.messages.R +import org.fossify.messages.activities.ThreadActivity +import org.fossify.messages.extensions.config +import org.fossify.messages.messaging.isShortCodeWithLetters +import org.fossify.messages.receivers.DeleteSmsReceiver +import org.fossify.messages.receivers.DirectReplyReceiver +import org.fossify.messages.receivers.MarkAsReadReceiver class NotificationHelper(private val context: Context) { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/VCardParser.kt b/app/src/main/kotlin/org/fossify/messages/helpers/VCardParser.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/helpers/VCardParser.kt rename to app/src/main/kotlin/org/fossify/messages/helpers/VCardParser.kt index 62092171..11bddbde 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/helpers/VCardParser.kt +++ b/app/src/main/kotlin/org/fossify/messages/helpers/VCardParser.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.helpers +package org.fossify.messages.helpers import android.content.Context import android.net.Uri diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/AttachmentsDao.kt b/app/src/main/kotlin/org/fossify/messages/interfaces/AttachmentsDao.kt similarity index 63% rename from app/src/main/kotlin/org/fossify/smsmessenger/interfaces/AttachmentsDao.kt rename to app/src/main/kotlin/org/fossify/messages/interfaces/AttachmentsDao.kt index d98c39d9..4bd4315b 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/AttachmentsDao.kt +++ b/app/src/main/kotlin/org/fossify/messages/interfaces/AttachmentsDao.kt @@ -1,8 +1,8 @@ -package org.fossify.smsmessenger.interfaces +package org.fossify.messages.interfaces import androidx.room.Dao import androidx.room.Query -import org.fossify.smsmessenger.models.Attachment +import org.fossify.messages.models.Attachment @Dao interface AttachmentsDao { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/ConversationsDao.kt b/app/src/main/kotlin/org/fossify/messages/interfaces/ConversationsDao.kt similarity index 94% rename from app/src/main/kotlin/org/fossify/smsmessenger/interfaces/ConversationsDao.kt rename to app/src/main/kotlin/org/fossify/messages/interfaces/ConversationsDao.kt index d747dd30..271bdcfb 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/ConversationsDao.kt +++ b/app/src/main/kotlin/org/fossify/messages/interfaces/ConversationsDao.kt @@ -1,11 +1,11 @@ -package org.fossify.smsmessenger.interfaces +package org.fossify.messages.interfaces import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import org.fossify.smsmessenger.models.Conversation -import org.fossify.smsmessenger.models.ConversationWithSnippetOverride +import org.fossify.messages.models.Conversation +import org.fossify.messages.models.ConversationWithSnippetOverride @Dao interface ConversationsDao { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/MessageAttachmentsDao.kt b/app/src/main/kotlin/org/fossify/messages/interfaces/MessageAttachmentsDao.kt similarity index 64% rename from app/src/main/kotlin/org/fossify/smsmessenger/interfaces/MessageAttachmentsDao.kt rename to app/src/main/kotlin/org/fossify/messages/interfaces/MessageAttachmentsDao.kt index 1463fa5b..f1d44284 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/MessageAttachmentsDao.kt +++ b/app/src/main/kotlin/org/fossify/messages/interfaces/MessageAttachmentsDao.kt @@ -1,8 +1,8 @@ -package org.fossify.smsmessenger.interfaces +package org.fossify.messages.interfaces import androidx.room.Dao import androidx.room.Query -import org.fossify.smsmessenger.models.MessageAttachment +import org.fossify.messages.models.MessageAttachment @Dao interface MessageAttachmentsDao { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/MessagesDao.kt b/app/src/main/kotlin/org/fossify/messages/interfaces/MessagesDao.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/interfaces/MessagesDao.kt rename to app/src/main/kotlin/org/fossify/messages/interfaces/MessagesDao.kt index 09c974d2..f97efe3e 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/interfaces/MessagesDao.kt +++ b/app/src/main/kotlin/org/fossify/messages/interfaces/MessagesDao.kt @@ -1,8 +1,8 @@ -package org.fossify.smsmessenger.interfaces +package org.fossify.messages.interfaces import androidx.room.* -import org.fossify.smsmessenger.models.Message -import org.fossify.smsmessenger.models.RecycleBinMessage +import org.fossify.messages.models.Message +import org.fossify.messages.models.RecycleBinMessage @Dao interface MessagesDao { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/messaging/Messaging.kt b/app/src/main/kotlin/org/fossify/messages/messaging/Messaging.kt similarity index 87% rename from app/src/main/kotlin/org/fossify/smsmessenger/messaging/Messaging.kt rename to app/src/main/kotlin/org/fossify/messages/messaging/Messaging.kt index a6a7768a..219d5972 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/messaging/Messaging.kt +++ b/app/src/main/kotlin/org/fossify/messages/messaging/Messaging.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.messaging +package org.fossify.messages.messaging import android.content.Context import android.telephony.SmsMessage @@ -6,13 +6,13 @@ import android.widget.Toast.LENGTH_LONG import com.klinker.android.send_message.Settings import org.fossify.commons.extensions.showErrorToast import org.fossify.commons.extensions.toast -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.extensions.config -import org.fossify.smsmessenger.extensions.messagingUtils -import org.fossify.smsmessenger.messaging.SmsException.Companion.EMPTY_DESTINATION_ADDRESS -import org.fossify.smsmessenger.messaging.SmsException.Companion.ERROR_PERSISTING_MESSAGE -import org.fossify.smsmessenger.messaging.SmsException.Companion.ERROR_SENDING_MESSAGE -import org.fossify.smsmessenger.models.Attachment +import org.fossify.messages.R +import org.fossify.messages.extensions.config +import org.fossify.messages.extensions.messagingUtils +import org.fossify.messages.messaging.SmsException.Companion.EMPTY_DESTINATION_ADDRESS +import org.fossify.messages.messaging.SmsException.Companion.ERROR_PERSISTING_MESSAGE +import org.fossify.messages.messaging.SmsException.Companion.ERROR_SENDING_MESSAGE +import org.fossify.messages.models.Attachment @Deprecated("TODO: Move/rewrite messaging config code into the app.") fun Context.getSendMessageSettings(): Settings { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/messaging/MessagingUtils.kt b/app/src/main/kotlin/org/fossify/messages/messaging/MessagingUtils.kt similarity index 94% rename from app/src/main/kotlin/org/fossify/smsmessenger/messaging/MessagingUtils.kt rename to app/src/main/kotlin/org/fossify/messages/messaging/MessagingUtils.kt index f6402d3a..0b0eea15 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/messaging/MessagingUtils.kt +++ b/app/src/main/kotlin/org/fossify/messages/messaging/MessagingUtils.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.messaging +package org.fossify.messages.messaging import android.annotation.SuppressLint import android.app.Activity @@ -15,14 +15,14 @@ import com.klinker.android.send_message.Settings import com.klinker.android.send_message.Transaction import org.fossify.commons.extensions.showErrorToast import org.fossify.commons.extensions.toast -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.extensions.getThreadId -import org.fossify.smsmessenger.extensions.isPlainTextMimeType -import org.fossify.smsmessenger.extensions.smsSender -import org.fossify.smsmessenger.messaging.SmsException.Companion.ERROR_PERSISTING_MESSAGE -import org.fossify.smsmessenger.models.Attachment -import org.fossify.smsmessenger.receivers.MmsSentReceiver -import org.fossify.smsmessenger.receivers.SendStatusReceiver +import org.fossify.messages.R +import org.fossify.messages.extensions.getThreadId +import org.fossify.messages.extensions.isPlainTextMimeType +import org.fossify.messages.extensions.smsSender +import org.fossify.messages.messaging.SmsException.Companion.ERROR_PERSISTING_MESSAGE +import org.fossify.messages.models.Attachment +import org.fossify.messages.receivers.MmsSentReceiver +import org.fossify.messages.receivers.SendStatusReceiver class MessagingUtils(val context: Context) { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/messaging/ScheduledMessage.kt b/app/src/main/kotlin/org/fossify/messages/messaging/ScheduledMessage.kt similarity index 82% rename from app/src/main/kotlin/org/fossify/smsmessenger/messaging/ScheduledMessage.kt rename to app/src/main/kotlin/org/fossify/messages/messaging/ScheduledMessage.kt index 852cb6e7..08b89549 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/messaging/ScheduledMessage.kt +++ b/app/src/main/kotlin/org/fossify/messages/messaging/ScheduledMessage.kt @@ -1,14 +1,14 @@ -package org.fossify.smsmessenger.messaging +package org.fossify.messages.messaging import android.app.AlarmManager import android.app.PendingIntent import android.content.Context import android.content.Intent import androidx.core.app.AlarmManagerCompat -import org.fossify.smsmessenger.helpers.SCHEDULED_MESSAGE_ID -import org.fossify.smsmessenger.helpers.THREAD_ID -import org.fossify.smsmessenger.models.Message -import org.fossify.smsmessenger.receivers.ScheduledMessageReceiver +import org.fossify.messages.helpers.SCHEDULED_MESSAGE_ID +import org.fossify.messages.helpers.THREAD_ID +import org.fossify.messages.models.Message +import org.fossify.messages.receivers.ScheduledMessageReceiver /** * All things related to scheduled messages are here. diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsException.kt b/app/src/main/kotlin/org/fossify/messages/messaging/SmsException.kt similarity index 85% rename from app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsException.kt rename to app/src/main/kotlin/org/fossify/messages/messaging/SmsException.kt index 8599a873..78312ac7 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsException.kt +++ b/app/src/main/kotlin/org/fossify/messages/messaging/SmsException.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.messaging +package org.fossify.messages.messaging class SmsException(val errorCode: Int, val exception: Exception? = null) : Exception() { companion object { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsManager.kt b/app/src/main/kotlin/org/fossify/messages/messaging/SmsManager.kt similarity index 94% rename from app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsManager.kt rename to app/src/main/kotlin/org/fossify/messages/messaging/SmsManager.kt index 2f235eb0..79ce188a 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsManager.kt +++ b/app/src/main/kotlin/org/fossify/messages/messaging/SmsManager.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.messaging +package org.fossify.messages.messaging import android.telephony.SmsManager import com.klinker.android.send_message.Settings diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsSender.kt b/app/src/main/kotlin/org/fossify/messages/messaging/SmsSender.kt similarity index 91% rename from app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsSender.kt rename to app/src/main/kotlin/org/fossify/messages/messaging/SmsSender.kt index 12ed0576..26ef939d 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/messaging/SmsSender.kt +++ b/app/src/main/kotlin/org/fossify/messages/messaging/SmsSender.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.messaging +package org.fossify.messages.messaging import android.app.Application import android.app.PendingIntent @@ -6,11 +6,11 @@ import android.content.Intent import android.net.Uri import android.telephony.PhoneNumberUtils import org.fossify.commons.helpers.isSPlus -import org.fossify.smsmessenger.messaging.SmsException.Companion.EMPTY_DESTINATION_ADDRESS -import org.fossify.smsmessenger.messaging.SmsException.Companion.ERROR_SENDING_MESSAGE -import org.fossify.smsmessenger.receivers.SendStatusReceiver -import org.fossify.smsmessenger.receivers.SmsStatusDeliveredReceiver -import org.fossify.smsmessenger.receivers.SmsStatusSentReceiver +import org.fossify.messages.messaging.SmsException.Companion.EMPTY_DESTINATION_ADDRESS +import org.fossify.messages.messaging.SmsException.Companion.ERROR_SENDING_MESSAGE +import org.fossify.messages.receivers.SendStatusReceiver +import org.fossify.messages.receivers.SmsStatusDeliveredReceiver +import org.fossify.messages.receivers.SmsStatusSentReceiver /** Class that sends chat message via SMS. */ class SmsSender(val app: Application) { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/ArchivedConversation.kt b/app/src/main/kotlin/org/fossify/messages/models/ArchivedConversation.kt similarity index 90% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/ArchivedConversation.kt rename to app/src/main/kotlin/org/fossify/messages/models/ArchivedConversation.kt index 64a0833e..fa5455ef 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/ArchivedConversation.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/ArchivedConversation.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/Attachment.kt b/app/src/main/kotlin/org/fossify/messages/models/Attachment.kt similarity index 94% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/Attachment.kt rename to app/src/main/kotlin/org/fossify/messages/models/Attachment.kt index c19bb5eb..242184d8 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/Attachment.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/Attachment.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import android.net.Uri import androidx.room.ColumnInfo diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/AttachmentSelection.kt b/app/src/main/kotlin/org/fossify/messages/models/AttachmentSelection.kt similarity index 70% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/AttachmentSelection.kt rename to app/src/main/kotlin/org/fossify/messages/models/AttachmentSelection.kt index 84c7c35c..2bb2d731 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/AttachmentSelection.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/AttachmentSelection.kt @@ -1,12 +1,12 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import android.net.Uri -import org.fossify.smsmessenger.extensions.isImageMimeType -import org.fossify.smsmessenger.extensions.isVCardMimeType -import org.fossify.smsmessenger.extensions.isVideoMimeType -import org.fossify.smsmessenger.helpers.ATTACHMENT_DOCUMENT -import org.fossify.smsmessenger.helpers.ATTACHMENT_MEDIA -import org.fossify.smsmessenger.helpers.ATTACHMENT_VCARD +import org.fossify.messages.extensions.isImageMimeType +import org.fossify.messages.extensions.isVCardMimeType +import org.fossify.messages.extensions.isVideoMimeType +import org.fossify.messages.helpers.ATTACHMENT_DOCUMENT +import org.fossify.messages.helpers.ATTACHMENT_MEDIA +import org.fossify.messages.helpers.ATTACHMENT_VCARD data class AttachmentSelection( val id: String, diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/BackupType.kt b/app/src/main/kotlin/org/fossify/messages/models/BackupType.kt similarity index 82% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/BackupType.kt rename to app/src/main/kotlin/org/fossify/messages/models/BackupType.kt index b9682150..6acee017 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/BackupType.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/BackupType.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/Conversation.kt b/app/src/main/kotlin/org/fossify/messages/models/Conversation.kt similarity index 97% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/Conversation.kt rename to app/src/main/kotlin/org/fossify/messages/models/Conversation.kt index c1650d43..558b5919 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/Conversation.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/Conversation.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/ConversationWithSnippetOverride.kt b/app/src/main/kotlin/org/fossify/messages/models/ConversationWithSnippetOverride.kt similarity index 90% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/ConversationWithSnippetOverride.kt rename to app/src/main/kotlin/org/fossify/messages/models/ConversationWithSnippetOverride.kt index 304af09a..64191310 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/ConversationWithSnippetOverride.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/ConversationWithSnippetOverride.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import androidx.room.ColumnInfo import androidx.room.Embedded diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/Events.kt b/app/src/main/kotlin/org/fossify/messages/models/Events.kt similarity index 52% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/Events.kt rename to app/src/main/kotlin/org/fossify/messages/models/Events.kt index a3fa2521..e236f1c4 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/Events.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/Events.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models class Events { class RefreshMessages diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/ExportedMessage.kt b/app/src/main/kotlin/org/fossify/messages/models/ExportedMessage.kt similarity index 83% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/ExportedMessage.kt rename to app/src/main/kotlin/org/fossify/messages/models/ExportedMessage.kt index 83f4a314..a306edf1 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/ExportedMessage.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/ExportedMessage.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import com.google.gson.annotations.SerializedName diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/ImportResult.kt b/app/src/main/kotlin/org/fossify/messages/models/ImportResult.kt similarity index 69% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/ImportResult.kt rename to app/src/main/kotlin/org/fossify/messages/models/ImportResult.kt index 646ac94c..d4aef19f 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/ImportResult.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/ImportResult.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models enum class ImportResult { IMPORT_FAIL, IMPORT_OK, IMPORT_PARTIAL, IMPORT_NOTHING_NEW diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/Message.kt b/app/src/main/kotlin/org/fossify/messages/models/Message.kt similarity index 98% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/Message.kt rename to app/src/main/kotlin/org/fossify/messages/models/Message.kt index 4c671365..8a00e53f 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/Message.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/Message.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import android.provider.Telephony import androidx.room.ColumnInfo diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/MessageAttachment.kt b/app/src/main/kotlin/org/fossify/messages/models/MessageAttachment.kt similarity index 89% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/MessageAttachment.kt rename to app/src/main/kotlin/org/fossify/messages/models/MessageAttachment.kt index 196f3a93..c5967f30 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/MessageAttachment.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/MessageAttachment.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/MessagesBackup.kt b/app/src/main/kotlin/org/fossify/messages/models/MessagesBackup.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/MessagesBackup.kt rename to app/src/main/kotlin/org/fossify/messages/models/MessagesBackup.kt index 133bf109..b7c68c8a 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/MessagesBackup.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/MessagesBackup.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.SerialName diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/MmsAddress.kt b/app/src/main/kotlin/org/fossify/messages/models/MmsAddress.kt similarity index 94% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/MmsAddress.kt rename to app/src/main/kotlin/org/fossify/messages/models/MmsAddress.kt index dde36095..8718d85d 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/MmsAddress.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/MmsAddress.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import android.content.ContentValues import android.provider.Telephony diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/MmsBackup.kt b/app/src/main/kotlin/org/fossify/messages/models/MmsBackup.kt similarity index 98% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/MmsBackup.kt rename to app/src/main/kotlin/org/fossify/messages/models/MmsBackup.kt index 5f77e824..9b59681d 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/MmsBackup.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/MmsBackup.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import android.content.ContentValues import android.provider.Telephony diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/MmsPart.kt b/app/src/main/kotlin/org/fossify/messages/models/MmsPart.kt similarity index 97% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/MmsPart.kt rename to app/src/main/kotlin/org/fossify/messages/models/MmsPart.kt index 5a66741b..55d1df8b 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/MmsPart.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/MmsPart.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import android.content.ContentValues import android.provider.Telephony diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/NamePhoto.kt b/app/src/main/kotlin/org/fossify/messages/models/NamePhoto.kt similarity index 61% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/NamePhoto.kt rename to app/src/main/kotlin/org/fossify/messages/models/NamePhoto.kt index 5cfdede5..969aa3ec 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/NamePhoto.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/NamePhoto.kt @@ -1,3 +1,3 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models data class NamePhoto(val name: String, val photoUri: String?) diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/RecycleBinMessage.kt b/app/src/main/kotlin/org/fossify/messages/models/RecycleBinMessage.kt similarity index 89% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/RecycleBinMessage.kt rename to app/src/main/kotlin/org/fossify/messages/models/RecycleBinMessage.kt index 12a332ae..ea9193e0 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/RecycleBinMessage.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/RecycleBinMessage.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/SIMCard.kt b/app/src/main/kotlin/org/fossify/messages/models/SIMCard.kt similarity index 65% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/SIMCard.kt rename to app/src/main/kotlin/org/fossify/messages/models/SIMCard.kt index acdadf10..61635b78 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/SIMCard.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/SIMCard.kt @@ -1,3 +1,3 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models data class SIMCard(val id: Int, val subscriptionId: Int, val label: String) diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/SearchResult.kt b/app/src/main/kotlin/org/fossify/messages/models/SearchResult.kt similarity index 78% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/SearchResult.kt rename to app/src/main/kotlin/org/fossify/messages/models/SearchResult.kt index ca223373..ce80737e 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/SearchResult.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/SearchResult.kt @@ -1,3 +1,3 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models data class SearchResult(val messageId: Long, val title: String, val snippet: String, val date: String, val threadId: Long, var photoUri: String) diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/SmsBackup.kt b/app/src/main/kotlin/org/fossify/messages/models/SmsBackup.kt similarity index 97% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/SmsBackup.kt rename to app/src/main/kotlin/org/fossify/messages/models/SmsBackup.kt index d530b893..db2c8ba4 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/SmsBackup.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/SmsBackup.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import android.content.ContentValues diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/ThreadItems.kt b/app/src/main/kotlin/org/fossify/messages/models/ThreadItems.kt similarity index 92% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/ThreadItems.kt rename to app/src/main/kotlin/org/fossify/messages/models/ThreadItems.kt index 9beeb032..48cbd103 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/ThreadItems.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/ThreadItems.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models /** * Thread item representations for the main thread recyclerview. [Message] is also a [ThreadItem] diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/models/VCard.kt b/app/src/main/kotlin/org/fossify/messages/models/VCard.kt similarity index 93% rename from app/src/main/kotlin/org/fossify/smsmessenger/models/VCard.kt rename to app/src/main/kotlin/org/fossify/messages/models/VCard.kt index 8835f23d..014b4c04 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/models/VCard.kt +++ b/app/src/main/kotlin/org/fossify/messages/models/VCard.kt @@ -1,12 +1,12 @@ -package org.fossify.smsmessenger.models +package org.fossify.messages.models import android.content.Context import ezvcard.VCard import ezvcard.property.* import org.fossify.commons.extensions.normalizePhoneNumber -import org.fossify.smsmessenger.extensions.config -import org.fossify.smsmessenger.extensions.format -import org.fossify.smsmessenger.helpers.parseNameFromVCard +import org.fossify.messages.extensions.config +import org.fossify.messages.extensions.format +import org.fossify.messages.helpers.parseNameFromVCard private val displayedPropertyClasses = arrayOf( Telephone::class.java, Email::class.java, Organization::class.java, Birthday::class.java, Anniversary::class.java, Note::class.java diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/DeleteSmsReceiver.kt b/app/src/main/kotlin/org/fossify/messages/receivers/DeleteSmsReceiver.kt similarity index 63% rename from app/src/main/kotlin/org/fossify/smsmessenger/receivers/DeleteSmsReceiver.kt rename to app/src/main/kotlin/org/fossify/messages/receivers/DeleteSmsReceiver.kt index bbfaa695..dc5e499f 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/DeleteSmsReceiver.kt +++ b/app/src/main/kotlin/org/fossify/messages/receivers/DeleteSmsReceiver.kt @@ -1,18 +1,18 @@ -package org.fossify.smsmessenger.receivers +package org.fossify.messages.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import org.fossify.commons.extensions.notificationManager import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.smsmessenger.extensions.conversationsDB -import org.fossify.smsmessenger.extensions.deleteMessage -import org.fossify.smsmessenger.extensions.updateLastConversationMessage -import org.fossify.smsmessenger.extensions.updateUnreadCountBadge -import org.fossify.smsmessenger.helpers.IS_MMS -import org.fossify.smsmessenger.helpers.MESSAGE_ID -import org.fossify.smsmessenger.helpers.THREAD_ID -import org.fossify.smsmessenger.helpers.refreshMessages +import org.fossify.messages.extensions.conversationsDB +import org.fossify.messages.extensions.deleteMessage +import org.fossify.messages.extensions.updateLastConversationMessage +import org.fossify.messages.extensions.updateUnreadCountBadge +import org.fossify.messages.helpers.IS_MMS +import org.fossify.messages.helpers.MESSAGE_ID +import org.fossify.messages.helpers.THREAD_ID +import org.fossify.messages.helpers.refreshMessages class DeleteSmsReceiver : BroadcastReceiver() { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/DirectReplyReceiver.kt b/app/src/main/kotlin/org/fossify/messages/receivers/DirectReplyReceiver.kt similarity index 89% rename from app/src/main/kotlin/org/fossify/smsmessenger/receivers/DirectReplyReceiver.kt rename to app/src/main/kotlin/org/fossify/messages/receivers/DirectReplyReceiver.kt index 894dcb86..292c4d1e 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/DirectReplyReceiver.kt +++ b/app/src/main/kotlin/org/fossify/messages/receivers/DirectReplyReceiver.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.receivers +package org.fossify.messages.receivers import android.annotation.SuppressLint import android.content.BroadcastReceiver @@ -10,11 +10,11 @@ import androidx.core.app.RemoteInput import org.fossify.commons.extensions.showErrorToast import org.fossify.commons.helpers.SimpleContactsHelper import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.smsmessenger.extensions.* -import org.fossify.smsmessenger.helpers.REPLY -import org.fossify.smsmessenger.helpers.THREAD_ID -import org.fossify.smsmessenger.helpers.THREAD_NUMBER -import org.fossify.smsmessenger.messaging.sendMessageCompat +import org.fossify.messages.extensions.* +import org.fossify.messages.helpers.REPLY +import org.fossify.messages.helpers.THREAD_ID +import org.fossify.messages.helpers.THREAD_NUMBER +import org.fossify.messages.messaging.sendMessageCompat class DirectReplyReceiver : BroadcastReceiver() { @SuppressLint("MissingPermission") diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/MarkAsReadReceiver.kt b/app/src/main/kotlin/org/fossify/messages/receivers/MarkAsReadReceiver.kt similarity index 69% rename from app/src/main/kotlin/org/fossify/smsmessenger/receivers/MarkAsReadReceiver.kt rename to app/src/main/kotlin/org/fossify/messages/receivers/MarkAsReadReceiver.kt index 3bed6824..74302854 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/MarkAsReadReceiver.kt +++ b/app/src/main/kotlin/org/fossify/messages/receivers/MarkAsReadReceiver.kt @@ -1,16 +1,16 @@ -package org.fossify.smsmessenger.receivers +package org.fossify.messages.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import org.fossify.commons.extensions.notificationManager import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.smsmessenger.extensions.conversationsDB -import org.fossify.smsmessenger.extensions.markThreadMessagesRead -import org.fossify.smsmessenger.extensions.updateUnreadCountBadge -import org.fossify.smsmessenger.helpers.MARK_AS_READ -import org.fossify.smsmessenger.helpers.THREAD_ID -import org.fossify.smsmessenger.helpers.refreshMessages +import org.fossify.messages.extensions.conversationsDB +import org.fossify.messages.extensions.markThreadMessagesRead +import org.fossify.messages.extensions.updateUnreadCountBadge +import org.fossify.messages.helpers.MARK_AS_READ +import org.fossify.messages.helpers.THREAD_ID +import org.fossify.messages.helpers.refreshMessages class MarkAsReadReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/MmsReceiver.kt b/app/src/main/kotlin/org/fossify/messages/receivers/MmsReceiver.kt similarity index 92% rename from app/src/main/kotlin/org/fossify/smsmessenger/receivers/MmsReceiver.kt rename to app/src/main/kotlin/org/fossify/messages/receivers/MmsReceiver.kt index d1974153..b34c9545 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/MmsReceiver.kt +++ b/app/src/main/kotlin/org/fossify/messages/receivers/MmsReceiver.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.receivers +package org.fossify.messages.receivers import android.content.Context import android.net.Uri @@ -10,9 +10,9 @@ import org.fossify.commons.extensions.isNumberBlocked import org.fossify.commons.extensions.normalizePhoneNumber import org.fossify.commons.extensions.showErrorToast import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.extensions.* -import org.fossify.smsmessenger.helpers.refreshMessages +import org.fossify.messages.R +import org.fossify.messages.extensions.* +import org.fossify.messages.helpers.refreshMessages // more info at https://github.com/klinker41/android-smsmms class MmsReceiver : MmsReceivedReceiver() { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/MmsSentReceiver.kt b/app/src/main/kotlin/org/fossify/messages/receivers/MmsSentReceiver.kt similarity index 91% rename from app/src/main/kotlin/org/fossify/smsmessenger/receivers/MmsSentReceiver.kt rename to app/src/main/kotlin/org/fossify/messages/receivers/MmsSentReceiver.kt index 997afa5a..7732b367 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/MmsSentReceiver.kt +++ b/app/src/main/kotlin/org/fossify/messages/receivers/MmsSentReceiver.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.receivers +package org.fossify.messages.receivers import android.app.Activity import android.content.ContentValues @@ -10,9 +10,9 @@ import android.provider.Telephony import android.widget.Toast import org.fossify.commons.extensions.showErrorToast import org.fossify.commons.extensions.toast -import org.fossify.smsmessenger.R -import org.fossify.smsmessenger.extensions.deleteMessage -import org.fossify.smsmessenger.helpers.refreshMessages +import org.fossify.messages.R +import org.fossify.messages.extensions.deleteMessage +import org.fossify.messages.helpers.refreshMessages import java.io.File /** Handles updating databases and states when a MMS message is sent. */ diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/ScheduledMessageReceiver.kt b/app/src/main/kotlin/org/fossify/messages/receivers/ScheduledMessageReceiver.kt similarity index 79% rename from app/src/main/kotlin/org/fossify/smsmessenger/receivers/ScheduledMessageReceiver.kt rename to app/src/main/kotlin/org/fossify/messages/receivers/ScheduledMessageReceiver.kt index 269e8494..e3ab0ba8 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/ScheduledMessageReceiver.kt +++ b/app/src/main/kotlin/org/fossify/messages/receivers/ScheduledMessageReceiver.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.receivers +package org.fossify.messages.receivers import android.content.BroadcastReceiver import android.content.Context @@ -8,14 +8,14 @@ import android.os.Looper import android.os.PowerManager import org.fossify.commons.extensions.showErrorToast import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.smsmessenger.extensions.conversationsDB -import org.fossify.smsmessenger.extensions.deleteScheduledMessage -import org.fossify.smsmessenger.extensions.getAddresses -import org.fossify.smsmessenger.extensions.messagesDB -import org.fossify.smsmessenger.helpers.SCHEDULED_MESSAGE_ID -import org.fossify.smsmessenger.helpers.THREAD_ID -import org.fossify.smsmessenger.helpers.refreshMessages -import org.fossify.smsmessenger.messaging.sendMessageCompat +import org.fossify.messages.extensions.conversationsDB +import org.fossify.messages.extensions.deleteScheduledMessage +import org.fossify.messages.extensions.getAddresses +import org.fossify.messages.extensions.messagesDB +import org.fossify.messages.helpers.SCHEDULED_MESSAGE_ID +import org.fossify.messages.helpers.THREAD_ID +import org.fossify.messages.helpers.refreshMessages +import org.fossify.messages.messaging.sendMessageCompat class ScheduledMessageReceiver : BroadcastReceiver() { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SendStatusReceiver.kt b/app/src/main/kotlin/org/fossify/messages/receivers/SendStatusReceiver.kt similarity index 82% rename from app/src/main/kotlin/org/fossify/smsmessenger/receivers/SendStatusReceiver.kt rename to app/src/main/kotlin/org/fossify/messages/receivers/SendStatusReceiver.kt index 5ee0506a..0e780390 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SendStatusReceiver.kt +++ b/app/src/main/kotlin/org/fossify/messages/receivers/SendStatusReceiver.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.receivers +package org.fossify.messages.receivers import android.content.BroadcastReceiver import android.content.Context @@ -21,8 +21,8 @@ abstract class SendStatusReceiver : BroadcastReceiver() { } companion object { - const val SMS_SENT_ACTION = "org.fossify.smsmessenger.receiver.SMS_SENT" - const val SMS_DELIVERED_ACTION = "org.fossify.smsmessenger.receiver.SMS_DELIVERED" + const val SMS_SENT_ACTION = "org.fossify.org.fossify.messages.receiver.SMS_SENT" + const val SMS_DELIVERED_ACTION = "org.fossify.org.fossify.messages.receiver.SMS_DELIVERED" // Defined by platform, but no constant provided. See docs for SmsManager.sendTextMessage. const val EXTRA_ERROR_CODE = "errorCode" diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsReceiver.kt b/app/src/main/kotlin/org/fossify/messages/receivers/SmsReceiver.kt similarity index 96% rename from app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsReceiver.kt rename to app/src/main/kotlin/org/fossify/messages/receivers/SmsReceiver.kt index 3eab0f1f..326cc03c 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsReceiver.kt +++ b/app/src/main/kotlin/org/fossify/messages/receivers/SmsReceiver.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.receivers +package org.fossify.messages.receivers import android.content.BroadcastReceiver import android.content.Context @@ -13,9 +13,9 @@ import org.fossify.commons.helpers.SimpleContactsHelper import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.models.PhoneNumber import org.fossify.commons.models.SimpleContact -import org.fossify.smsmessenger.extensions.* -import org.fossify.smsmessenger.helpers.refreshMessages -import org.fossify.smsmessenger.models.Message +import org.fossify.messages.extensions.* +import org.fossify.messages.helpers.refreshMessages +import org.fossify.messages.models.Message class SmsReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsStatusDeliveredReceiver.kt b/app/src/main/kotlin/org/fossify/messages/receivers/SmsStatusDeliveredReceiver.kt similarity index 94% rename from app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsStatusDeliveredReceiver.kt rename to app/src/main/kotlin/org/fossify/messages/receivers/SmsStatusDeliveredReceiver.kt index 75701d32..c3c127a1 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsStatusDeliveredReceiver.kt +++ b/app/src/main/kotlin/org/fossify/messages/receivers/SmsStatusDeliveredReceiver.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.receivers +package org.fossify.messages.receivers import android.annotation.SuppressLint import android.content.ContentValues @@ -7,9 +7,9 @@ import android.content.Intent import android.net.Uri import android.provider.Telephony.Sms import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.smsmessenger.extensions.messagesDB -import org.fossify.smsmessenger.extensions.messagingUtils -import org.fossify.smsmessenger.helpers.refreshMessages +import org.fossify.messages.extensions.messagesDB +import org.fossify.messages.extensions.messagingUtils +import org.fossify.messages.helpers.refreshMessages /** Handles updating databases and states when a sent SMS message is delivered. */ class SmsStatusDeliveredReceiver : SendStatusReceiver() { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsStatusSentReceiver.kt b/app/src/main/kotlin/org/fossify/messages/receivers/SmsStatusSentReceiver.kt similarity index 94% rename from app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsStatusSentReceiver.kt rename to app/src/main/kotlin/org/fossify/messages/receivers/SmsStatusSentReceiver.kt index 45813311..584787d0 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/receivers/SmsStatusSentReceiver.kt +++ b/app/src/main/kotlin/org/fossify/messages/receivers/SmsStatusSentReceiver.kt @@ -1,4 +1,4 @@ -package org.fossify.smsmessenger.receivers +package org.fossify.messages.receivers import android.app.Activity import android.content.Context @@ -11,8 +11,8 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.ProcessLifecycleOwner import org.fossify.commons.extensions.getMyContactsCursor import org.fossify.commons.helpers.ensureBackgroundThread -import org.fossify.smsmessenger.extensions.* -import org.fossify.smsmessenger.helpers.refreshMessages +import org.fossify.messages.extensions.* +import org.fossify.messages.helpers.refreshMessages /** Handles updating databases and states when a SMS message is sent. */ class SmsStatusSentReceiver : SendStatusReceiver() { diff --git a/app/src/main/kotlin/org/fossify/smsmessenger/services/HeadlessSmsSendService.kt b/app/src/main/kotlin/org/fossify/messages/services/HeadlessSmsSendService.kt similarity index 90% rename from app/src/main/kotlin/org/fossify/smsmessenger/services/HeadlessSmsSendService.kt rename to app/src/main/kotlin/org/fossify/messages/services/HeadlessSmsSendService.kt index 42421100..132f7b77 100644 --- a/app/src/main/kotlin/org/fossify/smsmessenger/services/HeadlessSmsSendService.kt +++ b/app/src/main/kotlin/org/fossify/messages/services/HeadlessSmsSendService.kt @@ -1,10 +1,10 @@ -package org.fossify.smsmessenger.services +package org.fossify.messages.services import android.app.Service import android.content.Intent import android.net.Uri import com.klinker.android.send_message.Settings -import org.fossify.smsmessenger.messaging.sendMessageCompat +import org.fossify.messages.messaging.sendMessageCompat class HeadlessSmsSendService : Service() { override fun onBind(intent: Intent?) = null diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 21c3ae30..cb69be83 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -1,5 +1,5 @@ - org.fossify.smsmessenger + org.fossify.messages Fossify SMS Messenger 100KB diff --git a/fastlane/Appfile b/fastlane/Appfile index 39882d09..644f55ad 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -1,2 +1,2 @@ json_key_file("fastlane/fastlane.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one -package_name("org.fossify.smsmessenger") # e.g. com.krausefx.app +package_name("org.fossify.messages") # e.g. com.krausefx.app diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 77cccd81..c4768d6b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ eventbus = "3.3.1" #Room room = "2.6.1" #Fossify -commons = "cbf79568d3" +commons = "1437ab513f" android-smsmms = "c3e678befd" indicator-fast-scroll = "4524cd0b61" #Gradle @@ -28,7 +28,7 @@ app-build-kotlinJVMTarget = "17" ez-vcard = "0.11.3" shortcut-badger = "1.1.22" #versioning -app-version-appId = "org.fossify.smsmessenger" +app-version-appId = "org.fossify.messages" app-version-versionCode = "1" app-version-versionName = "1.0.0" [libraries]