Move packages to com.moez.QKSMS

data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package compat
+package com.moez.QKSMS.compat
 
 import android.annotation.TargetApi
 import android.os.Build

data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt

@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package compat
+package com.moez.QKSMS.compat
 
 import android.content.Context
 import android.os.Build
 import android.telephony.SubscriptionManager
-import manager.PermissionManager
+import com.moez.QKSMS.manager.PermissionManager
 import javax.inject.Inject
 
 class SubscriptionManagerCompat @Inject constructor(context: Context, private val permissions: PermissionManager) {

data/src/main/java/com/moez/QKSMS/compat/TelephonyCompat.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package compat
+package com.moez.QKSMS.compat
 
 import android.content.Context
 import android.database.sqlite.SqliteWrapper

data/src/main/java/com/moez/QKSMS/extensions/CursorExtensions.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package util.extensions
+package com.moez.QKSMS.extensions
 
 import android.database.Cursor
 import io.reactivex.Flowable

data/src/main/java/com/moez/QKSMS/extensions/MmsPartExtensions.kt

@@ -16,10 +16,10 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package util.extensions
+package com.moez.QKSMS.extensions
 
 import com.google.android.mms.ContentType
-import model.MmsPart
+import com.moez.QKSMS.model.MmsPart
 
 fun MmsPart.isSmil() = ContentType.APP_SMIL == type
 

data/src/main/java/com/moez/QKSMS/extensions/RealmExtensions.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package util.extensions
+package com.moez.QKSMS.extensions
 
 import io.reactivex.Observable
 import io.realm.Realm

data/src/main/java/com/moez/QKSMS/extensions/StringExtensions.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package util.extensions
+package com.moez.QKSMS.extensions
 
 import java.text.Normalizer
 

data/src/main/java/com/moez/QKSMS/filter/ContactFilter.kt

@@ -16,10 +16,10 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package filter
+package com.moez.QKSMS.filter
 
-import model.Contact
-import util.extensions.removeAccents
+import com.moez.QKSMS.extensions.removeAccents
+import com.moez.QKSMS.model.Contact
 import javax.inject.Inject
 
 class ContactFilter @Inject constructor(private val phoneNumberFilter: PhoneNumberFilter) : Filter<Contact>() {

data/src/main/java/com/moez/QKSMS/filter/ConversationFilter.kt

@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package filter
+package com.moez.QKSMS.filter
 
-import model.Conversation
+import com.moez.QKSMS.model.Conversation
 import javax.inject.Inject
 
 class ConversationFilter @Inject constructor(private val recipientFilter: RecipientFilter) : Filter<Conversation>() {

data/src/main/java/com/moez/QKSMS/filter/Filter.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package filter
+package com.moez.QKSMS.filter
 
 abstract class Filter<in T> {
 

data/src/main/java/com/moez/QKSMS/filter/PhoneNumberFilter.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package filter
+package com.moez.QKSMS.filter
 
 import android.telephony.PhoneNumberUtils
 import javax.inject.Inject

data/src/main/java/com/moez/QKSMS/filter/RecipientFilter.kt

@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package filter
+package com.moez.QKSMS.filter
 
-import model.Recipient
+import com.moez.QKSMS.model.Recipient
 import javax.inject.Inject
 
 class RecipientFilter @Inject constructor(

data/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManagerImpl.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package manager
+package com.moez.QKSMS.manager
 
 import android.content.ComponentName
 import android.content.Context
@@ -27,11 +27,11 @@ import android.os.IBinder
 import android.os.Message
 import android.os.Messenger
 import androidx.os.bundleOf
+import com.moez.QKSMS.util.Preferences
+import com.moez.QKSMS.util.tryOrNull
 import io.reactivex.Single
 import io.reactivex.subjects.SingleSubject
 import timber.log.Timber
-import util.Preferences
-import util.tryOrNull
 import javax.inject.Inject
 
 class ExternalBlockingManagerImpl @Inject constructor(

data/src/main/java/com/moez/QKSMS/manager/KeyManagerImpl.kt

@@ -16,10 +16,10 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package manager
+package com.moez.QKSMS.manager
 
+import com.moez.QKSMS.model.Message
 import io.realm.Realm
-import model.Message
 import javax.inject.Inject
 import javax.inject.Singleton
 

data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package manager
+package com.moez.QKSMS.manager
 
 import android.Manifest
 import android.content.Context

data/src/main/java/com/moez/QKSMS/manager/WidgetManagerImpl.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package manager
+package com.moez.QKSMS.manager
 
 import android.content.Context
 import android.content.Intent

data/src/main/java/com/moez/QKSMS/mapper/CursorToContactImpl.kt

@@ -16,14 +16,14 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package mapper
+package com.moez.QKSMS.mapper
 
 import android.content.Context
 import android.database.Cursor
 import android.provider.ContactsContract.CommonDataKinds.Phone.*
-import manager.PermissionManager
-import model.Contact
-import model.PhoneNumber
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.PhoneNumber
 import javax.inject.Inject
 
 class CursorToContactImpl @Inject constructor(

data/src/main/java/com/moez/QKSMS/mapper/CursorToConversationImpl.kt

@@ -16,15 +16,15 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package mapper
+package com.moez.QKSMS.mapper
 
 import android.content.Context
 import android.database.Cursor
 import android.net.Uri
 import android.provider.Telephony.Threads
-import manager.PermissionManager
-import model.Conversation
-import model.Recipient
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Recipient
 import javax.inject.Inject
 
 class CursorToConversationImpl @Inject constructor(

data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt

@@ -16,17 +16,17 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package mapper
+package com.moez.QKSMS.mapper
 
 import android.content.Context
 import android.database.Cursor
 import android.net.Uri
 import android.provider.Telephony.*
 import com.google.android.mms.pdu_alt.PduHeaders
-import manager.KeyManager
-import manager.PermissionManager
-import model.Message
-import util.extensions.map
+import com.moez.QKSMS.extensions.map
+import com.moez.QKSMS.manager.KeyManager
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.model.Message
 import javax.inject.Inject
 
 class CursorToMessageImpl @Inject constructor(

data/src/main/java/com/moez/QKSMS/mapper/CursorToPartImpl.kt

@@ -16,19 +16,19 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package mapper
+package com.moez.QKSMS.mapper
 
 import android.content.ContentUris
 import android.content.Context
 import android.database.Cursor
 import android.net.Uri
 import android.provider.Telephony
-import model.MmsPart
+import com.moez.QKSMS.extensions.isImage
+import com.moez.QKSMS.extensions.isSmil
+import com.moez.QKSMS.extensions.isText
+import com.moez.QKSMS.extensions.isVideo
+import com.moez.QKSMS.model.MmsPart
 import timber.log.Timber
-import util.extensions.isImage
-import util.extensions.isSmil
-import util.extensions.isText
-import util.extensions.isVideo
 import java.io.BufferedReader
 import java.io.InputStreamReader
 import javax.inject.Inject

data/src/main/java/com/moez/QKSMS/mapper/CursorToRecipientImpl.kt

@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package mapper
+package com.moez.QKSMS.mapper
 
 import android.content.Context
 import android.database.Cursor
 import android.net.Uri
-import manager.PermissionManager
-import model.Recipient
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.model.Recipient
 import javax.inject.Inject
 
 class CursorToRecipientImpl @Inject constructor(

data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt

@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package mapper
+package com.moez.QKSMS.mapper
 
 import com.f2prateek.rx.preferences2.RxSharedPreferences
+import com.moez.QKSMS.manager.AnalyticsManager
+import com.moez.QKSMS.manager.RatingManager
 import io.reactivex.rxkotlin.Observables
-import manager.AnalyticsManager
-import manager.RatingManager
 import javax.inject.Inject
 
 class RatingManagerImpl @Inject constructor(

data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package migration
+package com.moez.QKSMS.migration
 
 import io.realm.DynamicRealm
 import io.realm.FieldAttribute

data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package receiver
+package com.moez.QKSMS.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -24,9 +24,9 @@ import android.content.Intent
 import android.os.Build
 import android.provider.Telephony
 import android.support.annotation.RequiresApi
+import com.moez.QKSMS.interactor.SyncMessages
+import com.moez.QKSMS.util.Preferences
 import dagger.android.AndroidInjection
-import interactor.SyncMessages
-import util.Preferences
 import javax.inject.Inject
 
 class DefaultSmsChangedReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt

@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package receiver
+package com.moez.QKSMS.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import com.moez.QKSMS.interactor.MarkRead
 import dagger.android.AndroidInjection
-import interactor.MarkRead
 import javax.inject.Inject
 
 class MarkReadReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt

@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package receiver
+package com.moez.QKSMS.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import com.moez.QKSMS.interactor.MarkSeen
 import dagger.android.AndroidInjection
-import interactor.MarkSeen
 import javax.inject.Inject
 
 class MarkSeenReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt

@@ -16,14 +16,14 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package receiver
+package com.moez.QKSMS.receiver
 
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import com.klinker.android.send_message.MmsReceivedReceiver
+import com.moez.QKSMS.interactor.ReceiveMms
 import dagger.android.AndroidInjection
-import interactor.ReceiveMms
 import javax.inject.Inject
 
 class MmsReceivedReceiver : MmsReceivedReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package receiver
+package com.moez.QKSMS.receiver
 
 import com.android.mms.transaction.PushReceiver
 

data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package receiver
+package com.moez.QKSMS.receiver
 
 import android.app.Activity
 import android.content.BroadcastReceiver
@@ -29,8 +29,8 @@ import android.provider.Telephony
 import com.google.android.mms.MmsException
 import com.google.android.mms.util_alt.SqliteWrapper
 import com.klinker.android.send_message.Transaction
+import com.moez.QKSMS.interactor.SyncMessage
 import dagger.android.AndroidInjection
-import interactor.SyncMessage
 import timber.log.Timber
 import java.io.File
 import javax.inject.Inject

data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt

@@ -16,14 +16,14 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package receiver
+package com.moez.QKSMS.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import com.moez.QKSMS.interactor.SyncMessage
 import dagger.android.AndroidInjection
-import interactor.SyncMessage
 import javax.inject.Inject
 
 class MmsUpdatedReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt

@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package receiver
+package com.moez.QKSMS.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import com.moez.QKSMS.util.NightModeManager
 import dagger.android.AndroidInjection
-import util.NightModeManager
 import javax.inject.Inject
 
 class NightModeReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt

@@ -16,18 +16,18 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package receiver
+package com.moez.QKSMS.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.support.v4.app.RemoteInput
-import compat.SubscriptionManagerCompat
+import com.moez.QKSMS.compat.SubscriptionManagerCompat
+import com.moez.QKSMS.interactor.MarkRead
+import com.moez.QKSMS.interactor.SendMessage
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
 import dagger.android.AndroidInjection
-import interactor.MarkRead
-import interactor.SendMessage
-import repository.ConversationRepository
-import repository.MessageRepository
 import javax.inject.Inject
 
 class RemoteMessagingReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt

@@ -16,14 +16,14 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package receiver
+package com.moez.QKSMS.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import com.moez.QKSMS.interactor.RetrySending
+import com.moez.QKSMS.repository.MessageRepository
 import dagger.android.AndroidInjection
-import interactor.RetrySending
-import repository.MessageRepository
 import javax.inject.Inject
 
 class SendSmsReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt

@@ -16,15 +16,15 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package receiver
+package com.moez.QKSMS.receiver
 
 import android.app.Activity
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import com.moez.QKSMS.interactor.MarkDelivered
+import com.moez.QKSMS.interactor.MarkDeliveryFailed
 import dagger.android.AndroidInjection
-import interactor.MarkDelivered
-import interactor.MarkDeliveryFailed
 import javax.inject.Inject
 
 class SmsDeliveredReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt

@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package receiver
+package com.moez.QKSMS.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import com.moez.QKSMS.interactor.SyncMessage
 import dagger.android.AndroidInjection
-import interactor.SyncMessage
 import javax.inject.Inject
 
 /**

data/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt

@@ -16,14 +16,14 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package receiver
+package com.moez.QKSMS.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.provider.Telephony.Sms
+import com.moez.QKSMS.interactor.ReceiveSms
 import dagger.android.AndroidInjection
-import interactor.ReceiveSms
 import javax.inject.Inject
 
 class SmsReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt

@@ -16,16 +16,16 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package receiver
+package com.moez.QKSMS.receiver
 
 import android.app.Activity
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.telephony.SmsManager
+import com.moez.QKSMS.interactor.MarkFailed
+import com.moez.QKSMS.interactor.MarkSent
 import dagger.android.AndroidInjection
-import interactor.MarkFailed
-import interactor.MarkSent
 import javax.inject.Inject
 
 class SmsSentReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt

@@ -16,20 +16,20 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package repository
+package com.moez.QKSMS.repository
 
 import android.content.Context
 import android.net.Uri
 import android.provider.BaseColumns
 import android.provider.ContactsContract
+import com.moez.QKSMS.extensions.asFlowable
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.model.Contact
 import io.reactivex.Flowable
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import io.realm.Realm
-import model.Contact
-import util.extensions.asFlowable
-import util.extensions.mapNotNull
 import javax.inject.Inject
 import javax.inject.Singleton
 

data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt

@@ -1,24 +1,24 @@
-package repository
+package com.moez.QKSMS.repository
 
 import android.content.ContentUris
 import android.content.Context
 import android.provider.Telephony
 import android.telephony.PhoneNumberUtils
-import compat.TelephonyCompat
-import filter.ConversationFilter
+import com.moez.QKSMS.compat.TelephonyCompat
+import com.moez.QKSMS.extensions.anyOf
+import com.moez.QKSMS.extensions.map
+import com.moez.QKSMS.filter.ConversationFilter
+import com.moez.QKSMS.mapper.CursorToConversation
+import com.moez.QKSMS.mapper.CursorToRecipient
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.SearchResult
+import com.moez.QKSMS.util.tryOrNull
 import io.realm.Case
 import io.realm.Realm
 import io.realm.RealmResults
 import io.realm.Sort
-import mapper.CursorToConversation
-import mapper.CursorToRecipient
-import model.Contact
-import model.Conversation
-import model.Message
-import model.SearchResult
-import util.extensions.anyOf
-import util.extensions.map
-import util.tryOrNull
 import javax.inject.Inject
 
 class ConversationRepositoryImpl @Inject constructor(

data/src/main/java/com/moez/QKSMS/repository/ImageRepostoryImpl.kt

@@ -1,4 +1,4 @@
-package repository
+package com.moez.QKSMS.repository
 
 import android.content.ContentResolver
 import android.content.ContentUris
@@ -11,7 +11,7 @@ import android.net.Uri
 import android.provider.MediaStore
 import android.provider.MediaStore.Images
 import android.support.media.ExifInterface
-import util.tryOrNull
+import com.moez.QKSMS.util.tryOrNull
 import javax.inject.Inject
 
 class ImageRepostoryImpl @Inject constructor(private val context: Context) : ImageRepository {

data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package repository
+package com.moez.QKSMS.repository
 
 import android.app.AlarmManager
 import android.app.PendingIntent
@@ -27,37 +27,25 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.os.Build
 import android.provider.Telephony
-import android.telephony.PhoneNumberUtils
 import android.telephony.SmsManager
 import com.google.android.mms.ContentType
 import com.klinker.android.send_message.BroadcastUtils
 import com.klinker.android.send_message.Settings
 import com.klinker.android.send_message.StripAccents
 import com.klinker.android.send_message.Transaction
-import compat.TelephonyCompat
-import filter.ConversationFilter
+import com.moez.QKSMS.extensions.anyOf
+import com.moez.QKSMS.extensions.insertOrUpdate
+import com.moez.QKSMS.manager.KeyManager
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
+import com.moez.QKSMS.util.Preferences
 import io.realm.Case
 import io.realm.Realm
-import io.realm.RealmList
 import io.realm.RealmResults
 import io.realm.Sort
-import manager.KeyManager
-import mapper.CursorToConversation
-import mapper.CursorToRecipient
-import model.Attachment
-import model.Contact
-import model.Conversation
-import model.Message
-import model.MmsPart
-import model.Recipient
-import model.SearchResult
 import timber.log.Timber
-import util.Preferences
-import util.extensions.anyOf
-import util.extensions.forEach
-import util.extensions.insertOrUpdate
-import util.extensions.map
-import util.tryOrNull
 import java.io.ByteArrayOutputStream
 import javax.inject.Inject
 import javax.inject.Singleton

data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package repository
+package com.moez.QKSMS.repository
 
 import android.content.ContentResolver
 import android.content.ContentUris
@@ -24,23 +24,23 @@ import android.net.Uri
 import android.provider.Telephony
 import android.telephony.PhoneNumberUtils
 import com.f2prateek.rx.preferences2.RxSharedPreferences
+import com.moez.QKSMS.extensions.insertOrUpdate
+import com.moez.QKSMS.extensions.map
+import com.moez.QKSMS.manager.KeyManager
+import com.moez.QKSMS.mapper.CursorToContact
+import com.moez.QKSMS.mapper.CursorToConversation
+import com.moez.QKSMS.mapper.CursorToMessage
+import com.moez.QKSMS.mapper.CursorToRecipient
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
+import com.moez.QKSMS.model.Recipient
+import com.moez.QKSMS.model.SyncLog
+import com.moez.QKSMS.util.tryOrNull
 import io.reactivex.subjects.BehaviorSubject
 import io.reactivex.subjects.Subject
 import io.realm.Realm
-import manager.KeyManager
-import mapper.CursorToContact
-import mapper.CursorToConversation
-import mapper.CursorToMessage
-import mapper.CursorToRecipient
-import model.Contact
-import model.Conversation
-import model.Message
-import model.MmsPart
-import model.Recipient
-import model.SyncLog
-import util.extensions.insertOrUpdate
-import util.extensions.map
-import util.tryOrNull
 import javax.inject.Inject
 import javax.inject.Singleton
 

data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt

@@ -16,15 +16,15 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package service
+package com.moez.QKSMS.service
 
 import android.app.IntentService
 import android.content.Intent
 import android.net.Uri
 import android.telephony.TelephonyManager
+import com.moez.QKSMS.interactor.SendMessage
+import com.moez.QKSMS.repository.ConversationRepository
 import dagger.android.AndroidInjection
-import interactor.SendMessage
-import repository.ConversationRepository
 import javax.inject.Inject
 
 class HeadlessSmsSendService : IntentService("HeadlessSmsSendService") {

data/src/main/java/com/moez/QKSMS/util/ActiveSubscriptionObservable.kt

@@ -1,7 +1,7 @@
-package util
+package com.moez.QKSMS.util
 
-import compat.SubscriptionInfoCompat
-import compat.SubscriptionManagerCompat
+import com.moez.QKSMS.compat.SubscriptionInfoCompat
+import com.moez.QKSMS.compat.SubscriptionManagerCompat
 import io.reactivex.Observable
 import io.reactivex.Observer
 import io.reactivex.disposables.Disposable

data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt

@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package util
+package com.moez.QKSMS.util
 
 import android.app.AlarmManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import receiver.NightModeReceiver
+import com.moez.QKSMS.receiver.NightModeReceiver
 import java.text.SimpleDateFormat
 import java.util.*
 import java.util.concurrent.TimeUnit

data/src/main/java/com/moez/QKSMS/util/Preferences.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package util
+package com.moez.QKSMS.util
 
 import android.os.Build
 import android.provider.Settings

data/src/main/java/com/moez/QKSMS/util/Utils.kt

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package util
+package com.moez.QKSMS.util
 
 fun <T> tryOrNull(body: () -> T?): T? {
     return try {