diff --git a/app/build.gradle b/app/build.gradle index f249bfe..f3af426 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -68,7 +68,7 @@ android { exclude 'META-INF/INDEX.LIST' exclude 'META-INF/io.netty.versions.properties' } - namespace 'me.capcom.smsgateway' + namespace 'pt.whatsms.gateway' } dependencies { diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 031b0a7..89dcc9c 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -4,7 +4,7 @@ "type": "APK", "kind": "Directory" }, - "applicationId": "me.capcom.smsgateway", + "applicationId": "pt.whatsms.gateway", "variantName": "release", "elements": [ { diff --git a/app/src/androidTest/java/me/capcom/smsgateway/ExampleInstrumentedTest.kt b/app/src/androidTest/java/pt/whatsms/gateway/ExampleInstrumentedTest.kt similarity index 85% rename from app/src/androidTest/java/me/capcom/smsgateway/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/pt/whatsms/gateway/ExampleInstrumentedTest.kt index c127a0a..9b202f8 100644 --- a/app/src/androidTest/java/me/capcom/smsgateway/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/pt/whatsms/gateway/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway +package pt.whatsms.gateway import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry @@ -17,6 +17,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("me.capcom.smsgateway", appContext.packageName) + assertEquals("pt.whatsms.gateway", appContext.packageName) } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5a0f868..a192699 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -56,8 +56,8 @@ android:enabled="true" android:exported="true"> - - + + , - @Relation( - parentColumn = "id", - entityColumn = "messageId", - ) - val states: List = emptyList(), - @ColumnInfo(name = "rowid") - val rowId: Long = 0, -) { - val state: me.capcom.smsgateway.domain.ProcessingState - get() = when { - recipients.any { it.state == me.capcom.smsgateway.domain.ProcessingState.Pending } -> me.capcom.smsgateway.domain.ProcessingState.Pending - recipients.any { it.state == me.capcom.smsgateway.domain.ProcessingState.Processed } -> me.capcom.smsgateway.domain.ProcessingState.Processed - - recipients.all { it.state == me.capcom.smsgateway.domain.ProcessingState.Failed } -> me.capcom.smsgateway.domain.ProcessingState.Failed - recipients.all { it.state == me.capcom.smsgateway.domain.ProcessingState.Delivered } -> me.capcom.smsgateway.domain.ProcessingState.Delivered - else -> me.capcom.smsgateway.domain.ProcessingState.Sent - } -} diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/messages/HashedMessage.kt b/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/messages/HashedMessage.kt deleted file mode 100644 index 84fdd1c..0000000 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/messages/HashedMessage.kt +++ /dev/null @@ -1,5 +0,0 @@ -package me.capcom.smsgateway.modules.localserver.domain.messages - -data class HashedMessage( - val hash: String, -) \ No newline at end of file diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/messages/TextMessage.kt b/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/messages/TextMessage.kt deleted file mode 100644 index 3a96b6f..0000000 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/messages/TextMessage.kt +++ /dev/null @@ -1,5 +0,0 @@ -package me.capcom.smsgateway.modules.localserver.domain.messages - -data class TextMessage( - val text: String, -) \ No newline at end of file diff --git a/app/src/main/java/me/capcom/smsgateway/modules/ping/events/PingEvent.kt b/app/src/main/java/me/capcom/smsgateway/modules/ping/events/PingEvent.kt deleted file mode 100644 index 96091e4..0000000 --- a/app/src/main/java/me/capcom/smsgateway/modules/ping/events/PingEvent.kt +++ /dev/null @@ -1,12 +0,0 @@ -package me.capcom.smsgateway.modules.ping.events - -import me.capcom.smsgateway.domain.HealthResponse -import me.capcom.smsgateway.modules.events.AppEvent - -class PingEvent( - val health: HealthResponse, -) : AppEvent(TYPE) { - companion object { - const val TYPE = "PingEvent" - } -} \ No newline at end of file diff --git a/app/src/main/java/me/capcom/smsgateway/ui/styles/Colors.kt b/app/src/main/java/me/capcom/smsgateway/ui/styles/Colors.kt deleted file mode 100644 index a2dc6c9..0000000 --- a/app/src/main/java/me/capcom/smsgateway/ui/styles/Colors.kt +++ /dev/null @@ -1,12 +0,0 @@ -package me.capcom.smsgateway.ui.styles - -import android.graphics.Color - -val me.capcom.smsgateway.domain.ProcessingState.color: Int - get() = when (this) { - me.capcom.smsgateway.domain.ProcessingState.Pending -> Color.parseColor("#FFBB86FC") - me.capcom.smsgateway.domain.ProcessingState.Processed -> Color.parseColor("#FF6200EE") - me.capcom.smsgateway.domain.ProcessingState.Sent -> Color.parseColor("#FF3700B3") - me.capcom.smsgateway.domain.ProcessingState.Delivered -> Color.parseColor("#FF03DAC5") - me.capcom.smsgateway.domain.ProcessingState.Failed -> Color.parseColor("#FF018786") - } \ No newline at end of file diff --git a/app/src/main/java/me/capcom/smsgateway/App.kt b/app/src/main/java/pt/whatsms/gateway/App.kt similarity index 56% rename from app/src/main/java/me/capcom/smsgateway/App.kt rename to app/src/main/java/pt/whatsms/gateway/App.kt index e5dcf00..3c736e1 100644 --- a/app/src/main/java/me/capcom/smsgateway/App.kt +++ b/app/src/main/java/pt/whatsms/gateway/App.kt @@ -1,24 +1,24 @@ -package me.capcom.smsgateway +package pt.whatsms.gateway import android.app.Application import healthModule -import me.capcom.smsgateway.data.dbModule -import me.capcom.smsgateway.modules.connection.connectionModule -import me.capcom.smsgateway.modules.encryption.encryptionModule -import me.capcom.smsgateway.modules.events.eventBusModule -import me.capcom.smsgateway.modules.gateway.GatewayService -import me.capcom.smsgateway.modules.incoming.incomingModule -import me.capcom.smsgateway.modules.localserver.localserverModule -import me.capcom.smsgateway.modules.logs.logsModule -import me.capcom.smsgateway.modules.messages.messagesModule -import me.capcom.smsgateway.modules.notifications.notificationsModule -import me.capcom.smsgateway.modules.orchestrator.OrchestratorService -import me.capcom.smsgateway.modules.orchestrator.orchestratorModule -import me.capcom.smsgateway.modules.ping.pingModule -import me.capcom.smsgateway.modules.receiver.receiverModule -import me.capcom.smsgateway.modules.settings.settingsModule -import me.capcom.smsgateway.modules.webhooks.webhooksModule -import me.capcom.smsgateway.receivers.EventsReceiver +import pt.whatsms.gateway.data.dbModule +import pt.whatsms.gateway.modules.connection.connectionModule +import pt.whatsms.gateway.modules.encryption.encryptionModule +import pt.whatsms.gateway.modules.events.eventBusModule +import pt.whatsms.gateway.modules.gateway.GatewayService +import pt.whatsms.gateway.modules.incoming.incomingModule +import pt.whatsms.gateway.modules.localserver.localserverModule +import pt.whatsms.gateway.modules.logs.logsModule +import pt.whatsms.gateway.modules.messages.messagesModule +import pt.whatsms.gateway.modules.notifications.notificationsModule +import pt.whatsms.gateway.modules.orchestrator.OrchestratorService +import pt.whatsms.gateway.modules.orchestrator.orchestratorModule +import pt.whatsms.gateway.modules.ping.pingModule +import pt.whatsms.gateway.modules.receiver.receiverModule +import pt.whatsms.gateway.modules.settings.settingsModule +import pt.whatsms.gateway.modules.webhooks.webhooksModule +import pt.whatsms.gateway.receivers.EventsReceiver import org.koin.android.ext.android.get import org.koin.android.ext.android.inject import org.koin.android.ext.koin.androidContext @@ -42,7 +42,7 @@ class App: Application() { incomingModule, receiverModule, encryptionModule, - me.capcom.smsgateway.modules.gateway.gatewayModule, + pt.whatsms.gateway.modules.gateway.gatewayModule, healthModule, webhooksModule, localserverModule, diff --git a/app/src/main/java/me/capcom/smsgateway/GlobalExceptionHandler.kt b/app/src/main/java/pt/whatsms/gateway/GlobalExceptionHandler.kt similarity index 88% rename from app/src/main/java/me/capcom/smsgateway/GlobalExceptionHandler.kt rename to app/src/main/java/pt/whatsms/gateway/GlobalExceptionHandler.kt index adcce13..46f4c4d 100644 --- a/app/src/main/java/me/capcom/smsgateway/GlobalExceptionHandler.kt +++ b/app/src/main/java/pt/whatsms/gateway/GlobalExceptionHandler.kt @@ -1,8 +1,8 @@ -package me.capcom.smsgateway +package pt.whatsms.gateway import android.util.Log -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry import org.koin.core.component.KoinComponent import java.lang.Thread.UncaughtExceptionHandler diff --git a/app/src/main/java/me/capcom/smsgateway/MainActivity.kt b/app/src/main/java/pt/whatsms/gateway/MainActivity.kt similarity index 91% rename from app/src/main/java/me/capcom/smsgateway/MainActivity.kt rename to app/src/main/java/pt/whatsms/gateway/MainActivity.kt index 19243f6..aad6e73 100644 --- a/app/src/main/java/me/capcom/smsgateway/MainActivity.kt +++ b/app/src/main/java/pt/whatsms/gateway/MainActivity.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway +package pt.whatsms.gateway import android.content.Context import android.content.Intent @@ -6,10 +6,10 @@ import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import com.google.android.material.tabs.TabLayoutMediator -import me.capcom.smsgateway.databinding.ActivityMainBinding -import me.capcom.smsgateway.ui.HolderFragment -import me.capcom.smsgateway.ui.HomeFragment -import me.capcom.smsgateway.ui.SettingsFragment +import pt.whatsms.gateway.databinding.ActivityMainBinding +import pt.whatsms.gateway.ui.HolderFragment +import pt.whatsms.gateway.ui.HomeFragment +import pt.whatsms.gateway.ui.SettingsFragment class MainActivity : AppCompatActivity() { diff --git a/app/src/main/java/me/capcom/smsgateway/data/AppDatabase.kt b/app/src/main/java/pt/whatsms/gateway/data/AppDatabase.kt similarity index 70% rename from app/src/main/java/me/capcom/smsgateway/data/AppDatabase.kt rename to app/src/main/java/pt/whatsms/gateway/data/AppDatabase.kt index 1acf231..512854f 100644 --- a/app/src/main/java/me/capcom/smsgateway/data/AppDatabase.kt +++ b/app/src/main/java/pt/whatsms/gateway/data/AppDatabase.kt @@ -1,25 +1,25 @@ -package me.capcom.smsgateway.data +package pt.whatsms.gateway.data import androidx.room.AutoMigration import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase import androidx.room.TypeConverters -import me.capcom.smsgateway.data.dao.MessagesDao -import me.capcom.smsgateway.data.dao.TokensDao -import me.capcom.smsgateway.data.entities.Message -import me.capcom.smsgateway.data.entities.MessageRecipient -import me.capcom.smsgateway.data.entities.MessageState -import me.capcom.smsgateway.data.entities.RecipientState -import me.capcom.smsgateway.data.entities.Token -import me.capcom.smsgateway.modules.incoming.db.IncomingMessage -import me.capcom.smsgateway.modules.incoming.db.IncomingMessagesDao -import me.capcom.smsgateway.modules.logs.db.LogEntriesDao -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.webhooks.db.WebHook -import me.capcom.smsgateway.modules.webhooks.db.WebHooksDao -import me.capcom.smsgateway.modules.webhooks.db.WebhookQueueDao -import me.capcom.smsgateway.modules.webhooks.db.WebhookQueueEntity +import pt.whatsms.gateway.data.dao.MessagesDao +import pt.whatsms.gateway.data.dao.TokensDao +import pt.whatsms.gateway.data.entities.Message +import pt.whatsms.gateway.data.entities.MessageRecipient +import pt.whatsms.gateway.data.entities.MessageState +import pt.whatsms.gateway.data.entities.RecipientState +import pt.whatsms.gateway.data.entities.Token +import pt.whatsms.gateway.modules.incoming.db.IncomingMessage +import pt.whatsms.gateway.modules.incoming.db.IncomingMessagesDao +import pt.whatsms.gateway.modules.logs.db.LogEntriesDao +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.webhooks.db.WebHook +import pt.whatsms.gateway.modules.webhooks.db.WebHooksDao +import pt.whatsms.gateway.modules.webhooks.db.WebhookQueueDao +import pt.whatsms.gateway.modules.webhooks.db.WebhookQueueEntity @Database( entities = [ diff --git a/app/src/main/java/me/capcom/smsgateway/data/Converters.kt b/app/src/main/java/pt/whatsms/gateway/data/Converters.kt similarity index 97% rename from app/src/main/java/me/capcom/smsgateway/data/Converters.kt rename to app/src/main/java/pt/whatsms/gateway/data/Converters.kt index f0c17c7..68e0361 100644 --- a/app/src/main/java/me/capcom/smsgateway/data/Converters.kt +++ b/app/src/main/java/pt/whatsms/gateway/data/Converters.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.data +package pt.whatsms.gateway.data import androidx.room.TypeConverter import com.google.gson.GsonBuilder diff --git a/app/src/main/java/me/capcom/smsgateway/data/Migrations.kt b/app/src/main/java/pt/whatsms/gateway/data/Migrations.kt similarity index 98% rename from app/src/main/java/me/capcom/smsgateway/data/Migrations.kt rename to app/src/main/java/pt/whatsms/gateway/data/Migrations.kt index 4571799..2b022d7 100644 --- a/app/src/main/java/me/capcom/smsgateway/data/Migrations.kt +++ b/app/src/main/java/pt/whatsms/gateway/data/Migrations.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.data +package pt.whatsms.gateway.data import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase diff --git a/app/src/main/java/me/capcom/smsgateway/data/Module.kt b/app/src/main/java/pt/whatsms/gateway/data/Module.kt similarity index 92% rename from app/src/main/java/me/capcom/smsgateway/data/Module.kt rename to app/src/main/java/pt/whatsms/gateway/data/Module.kt index 72a2a0c..19c935e 100644 --- a/app/src/main/java/me/capcom/smsgateway/data/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/data/Module.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.data +package pt.whatsms.gateway.data import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/data/dao/MessagesDao.kt b/app/src/main/java/pt/whatsms/gateway/data/dao/MessagesDao.kt similarity index 84% rename from app/src/main/java/me/capcom/smsgateway/data/dao/MessagesDao.kt rename to app/src/main/java/pt/whatsms/gateway/data/dao/MessagesDao.kt index 4f8a8ee..0aabb3a 100644 --- a/app/src/main/java/me/capcom/smsgateway/data/dao/MessagesDao.kt +++ b/app/src/main/java/pt/whatsms/gateway/data/dao/MessagesDao.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.data.dao +package pt.whatsms.gateway.data.dao import androidx.lifecycle.LiveData import androidx.room.Dao @@ -6,15 +6,15 @@ import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Transaction -import me.capcom.smsgateway.data.entities.Message -import me.capcom.smsgateway.data.entities.MessageRecipient -import me.capcom.smsgateway.data.entities.MessageState -import me.capcom.smsgateway.data.entities.MessageWithRecipients -import me.capcom.smsgateway.data.entities.MessagesStats -import me.capcom.smsgateway.data.entities.MessagesTotals -import me.capcom.smsgateway.data.entities.RecipientState -import me.capcom.smsgateway.domain.EntitySource -import me.capcom.smsgateway.domain.ProcessingState +import pt.whatsms.gateway.data.entities.Message +import pt.whatsms.gateway.data.entities.MessageRecipient +import pt.whatsms.gateway.data.entities.MessageState +import pt.whatsms.gateway.data.entities.MessageWithRecipients +import pt.whatsms.gateway.data.entities.MessagesStats +import pt.whatsms.gateway.data.entities.MessagesTotals +import pt.whatsms.gateway.data.entities.RecipientState +import pt.whatsms.gateway.domain.EntitySource +import pt.whatsms.gateway.domain.ProcessingState @Dao interface MessagesDao { @@ -100,7 +100,7 @@ interface MessagesDao { ) fun _insertRecipientStatesByMessage( messageId: String, - state: me.capcom.smsgateway.domain.ProcessingState + state: pt.whatsms.gateway.domain.ProcessingState ) @Transaction @@ -125,9 +125,9 @@ interface MessagesDao { } @Query("UPDATE message SET state = :state WHERE id = :id AND state <> 'Failed'") - fun _updateMessageState(id: String, state: me.capcom.smsgateway.domain.ProcessingState) + fun _updateMessageState(id: String, state: pt.whatsms.gateway.domain.ProcessingState) - fun updateMessageState(id: String, state: me.capcom.smsgateway.domain.ProcessingState) { + fun updateMessageState(id: String, state: pt.whatsms.gateway.domain.ProcessingState) { _updateMessageState(id, state) _insertMessageState( MessageState( @@ -145,7 +145,7 @@ interface MessagesDao { _insertMessageState( MessageState( id, - me.capcom.smsgateway.domain.ProcessingState.Processed, + pt.whatsms.gateway.domain.ProcessingState.Processed, System.currentTimeMillis() ) ) @@ -155,7 +155,7 @@ interface MessagesDao { fun _updateRecipientState( id: String, phoneNumber: String, - state: me.capcom.smsgateway.domain.ProcessingState, + state: pt.whatsms.gateway.domain.ProcessingState, error: String? ) @@ -163,7 +163,7 @@ interface MessagesDao { fun updateRecipientState( id: String, phoneNumber: String, - state: me.capcom.smsgateway.domain.ProcessingState, + state: pt.whatsms.gateway.domain.ProcessingState, error: String? ) { _updateRecipientState(id, phoneNumber, state, error) @@ -177,14 +177,14 @@ interface MessagesDao { @Query("UPDATE messagerecipient SET state = :state, error = :error WHERE messageId = :id AND state <> 'Failed'") fun _updateRecipientsState( id: String, - state: me.capcom.smsgateway.domain.ProcessingState, + state: pt.whatsms.gateway.domain.ProcessingState, error: String? ) @Transaction fun updateRecipientsState( id: String, - state: me.capcom.smsgateway.domain.ProcessingState, + state: pt.whatsms.gateway.domain.ProcessingState, error: String? ) { _updateRecipientsState(id, state, error) diff --git a/app/src/main/java/me/capcom/smsgateway/data/dao/TokensDao.kt b/app/src/main/java/pt/whatsms/gateway/data/dao/TokensDao.kt similarity index 87% rename from app/src/main/java/me/capcom/smsgateway/data/dao/TokensDao.kt rename to app/src/main/java/pt/whatsms/gateway/data/dao/TokensDao.kt index 0ec5baa..9b96080 100644 --- a/app/src/main/java/me/capcom/smsgateway/data/dao/TokensDao.kt +++ b/app/src/main/java/pt/whatsms/gateway/data/dao/TokensDao.kt @@ -1,10 +1,10 @@ -package me.capcom.smsgateway.data.dao +package pt.whatsms.gateway.data.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import me.capcom.smsgateway.data.entities.Token +import pt.whatsms.gateway.data.entities.Token @Dao interface TokensDao { diff --git a/app/src/main/java/me/capcom/smsgateway/data/entities/Message.kt b/app/src/main/java/pt/whatsms/gateway/data/entities/Message.kt similarity index 92% rename from app/src/main/java/me/capcom/smsgateway/data/entities/Message.kt rename to app/src/main/java/pt/whatsms/gateway/data/entities/Message.kt index 751833e..d502285 100644 --- a/app/src/main/java/me/capcom/smsgateway/data/entities/Message.kt +++ b/app/src/main/java/pt/whatsms/gateway/data/entities/Message.kt @@ -1,12 +1,12 @@ -package me.capcom.smsgateway.data.entities +package pt.whatsms.gateway.data.entities import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey import com.google.gson.Gson -import me.capcom.smsgateway.domain.EntitySource -import me.capcom.smsgateway.domain.MessageContent -import me.capcom.smsgateway.domain.ProcessingState +import pt.whatsms.gateway.domain.EntitySource +import pt.whatsms.gateway.domain.MessageContent +import pt.whatsms.gateway.domain.ProcessingState import java.util.Date enum class MessageType { diff --git a/app/src/main/java/me/capcom/smsgateway/data/entities/MessageRecipient.kt b/app/src/main/java/pt/whatsms/gateway/data/entities/MessageRecipient.kt similarity index 71% rename from app/src/main/java/me/capcom/smsgateway/data/entities/MessageRecipient.kt rename to app/src/main/java/pt/whatsms/gateway/data/entities/MessageRecipient.kt index 5aa7797..a7b07dc 100644 --- a/app/src/main/java/me/capcom/smsgateway/data/entities/MessageRecipient.kt +++ b/app/src/main/java/pt/whatsms/gateway/data/entities/MessageRecipient.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.data.entities +package pt.whatsms.gateway.data.entities import androidx.room.Entity import androidx.room.ForeignKey @@ -12,6 +12,6 @@ import androidx.room.ForeignKey data class MessageRecipient( val messageId: String, val phoneNumber: String, - val state: me.capcom.smsgateway.domain.ProcessingState = me.capcom.smsgateway.domain.ProcessingState.Pending, + val state: pt.whatsms.gateway.domain.ProcessingState = pt.whatsms.gateway.domain.ProcessingState.Pending, val error: String? = null ) diff --git a/app/src/main/java/me/capcom/smsgateway/data/entities/MessageState.kt b/app/src/main/java/pt/whatsms/gateway/data/entities/MessageState.kt similarity index 79% rename from app/src/main/java/me/capcom/smsgateway/data/entities/MessageState.kt rename to app/src/main/java/pt/whatsms/gateway/data/entities/MessageState.kt index 6159ecb..d0c206f 100644 --- a/app/src/main/java/me/capcom/smsgateway/data/entities/MessageState.kt +++ b/app/src/main/java/pt/whatsms/gateway/data/entities/MessageState.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.data.entities +package pt.whatsms.gateway.data.entities import androidx.room.Entity import androidx.room.ForeignKey @@ -16,6 +16,6 @@ import androidx.room.ForeignKey ) data class MessageState( val messageId: String, - val state: me.capcom.smsgateway.domain.ProcessingState, + val state: pt.whatsms.gateway.domain.ProcessingState, val updatedAt: Long ) diff --git a/app/src/main/java/pt/whatsms/gateway/data/entities/MessageWithRecipients.kt b/app/src/main/java/pt/whatsms/gateway/data/entities/MessageWithRecipients.kt new file mode 100644 index 0000000..2a0ee55 --- /dev/null +++ b/app/src/main/java/pt/whatsms/gateway/data/entities/MessageWithRecipients.kt @@ -0,0 +1,31 @@ +package pt.whatsms.gateway.data.entities + +import androidx.room.ColumnInfo +import androidx.room.Embedded +import androidx.room.Relation + +data class MessageWithRecipients( + @Embedded val message: Message, + @Relation( + parentColumn = "id", + entityColumn = "messageId", + ) + val recipients: List, + @Relation( + parentColumn = "id", + entityColumn = "messageId", + ) + val states: List = emptyList(), + @ColumnInfo(name = "rowid") + val rowId: Long = 0, +) { + val state: pt.whatsms.gateway.domain.ProcessingState + get() = when { + recipients.any { it.state == pt.whatsms.gateway.domain.ProcessingState.Pending } -> pt.whatsms.gateway.domain.ProcessingState.Pending + recipients.any { it.state == pt.whatsms.gateway.domain.ProcessingState.Processed } -> pt.whatsms.gateway.domain.ProcessingState.Processed + + recipients.all { it.state == pt.whatsms.gateway.domain.ProcessingState.Failed } -> pt.whatsms.gateway.domain.ProcessingState.Failed + recipients.all { it.state == pt.whatsms.gateway.domain.ProcessingState.Delivered } -> pt.whatsms.gateway.domain.ProcessingState.Delivered + else -> pt.whatsms.gateway.domain.ProcessingState.Sent + } +} diff --git a/app/src/main/java/me/capcom/smsgateway/data/entities/MessagesStats.kt b/app/src/main/java/pt/whatsms/gateway/data/entities/MessagesStats.kt similarity index 63% rename from app/src/main/java/me/capcom/smsgateway/data/entities/MessagesStats.kt rename to app/src/main/java/pt/whatsms/gateway/data/entities/MessagesStats.kt index a07aae5..167f5a6 100644 --- a/app/src/main/java/me/capcom/smsgateway/data/entities/MessagesStats.kt +++ b/app/src/main/java/pt/whatsms/gateway/data/entities/MessagesStats.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.data.entities +package pt.whatsms.gateway.data.entities data class MessagesStats( val count: Int, diff --git a/app/src/main/java/me/capcom/smsgateway/data/entities/MessagesTotals.kt b/app/src/main/java/pt/whatsms/gateway/data/entities/MessagesTotals.kt similarity index 76% rename from app/src/main/java/me/capcom/smsgateway/data/entities/MessagesTotals.kt rename to app/src/main/java/pt/whatsms/gateway/data/entities/MessagesTotals.kt index 2c512ec..28531b8 100644 --- a/app/src/main/java/me/capcom/smsgateway/data/entities/MessagesTotals.kt +++ b/app/src/main/java/pt/whatsms/gateway/data/entities/MessagesTotals.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.data.entities +package pt.whatsms.gateway.data.entities data class MessagesTotals( val total: Long, diff --git a/app/src/main/java/me/capcom/smsgateway/data/entities/RecipientState.kt b/app/src/main/java/pt/whatsms/gateway/data/entities/RecipientState.kt similarity index 82% rename from app/src/main/java/me/capcom/smsgateway/data/entities/RecipientState.kt rename to app/src/main/java/pt/whatsms/gateway/data/entities/RecipientState.kt index 5e01f4b..7e7d173 100644 --- a/app/src/main/java/me/capcom/smsgateway/data/entities/RecipientState.kt +++ b/app/src/main/java/pt/whatsms/gateway/data/entities/RecipientState.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.data.entities +package pt.whatsms.gateway.data.entities import androidx.room.Entity import androidx.room.ForeignKey @@ -17,6 +17,6 @@ import androidx.room.ForeignKey data class RecipientState( val messageId: String, val phoneNumber: String, - val state: me.capcom.smsgateway.domain.ProcessingState, + val state: pt.whatsms.gateway.domain.ProcessingState, val updatedAt: Long ) diff --git a/app/src/main/java/me/capcom/smsgateway/data/entities/Token.kt b/app/src/main/java/pt/whatsms/gateway/data/entities/Token.kt similarity index 87% rename from app/src/main/java/me/capcom/smsgateway/data/entities/Token.kt rename to app/src/main/java/pt/whatsms/gateway/data/entities/Token.kt index cad29fd..2cf5f8c 100644 --- a/app/src/main/java/me/capcom/smsgateway/data/entities/Token.kt +++ b/app/src/main/java/pt/whatsms/gateway/data/entities/Token.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.data.entities +package pt.whatsms.gateway.data.entities import androidx.room.Entity import androidx.room.Index diff --git a/app/src/main/java/me/capcom/smsgateway/domain/EntitySource.kt b/app/src/main/java/pt/whatsms/gateway/domain/EntitySource.kt similarity index 73% rename from app/src/main/java/me/capcom/smsgateway/domain/EntitySource.kt rename to app/src/main/java/pt/whatsms/gateway/domain/EntitySource.kt index 329f20c..9a4d2e4 100644 --- a/app/src/main/java/me/capcom/smsgateway/domain/EntitySource.kt +++ b/app/src/main/java/pt/whatsms/gateway/domain/EntitySource.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.domain +package pt.whatsms.gateway.domain enum class EntitySource { Local, diff --git a/app/src/main/java/me/capcom/smsgateway/domain/HealthResponse.kt b/app/src/main/java/pt/whatsms/gateway/domain/HealthResponse.kt similarity index 51% rename from app/src/main/java/me/capcom/smsgateway/domain/HealthResponse.kt rename to app/src/main/java/pt/whatsms/gateway/domain/HealthResponse.kt index 240d104..b0443a1 100644 --- a/app/src/main/java/me/capcom/smsgateway/domain/HealthResponse.kt +++ b/app/src/main/java/pt/whatsms/gateway/domain/HealthResponse.kt @@ -1,9 +1,9 @@ -package me.capcom.smsgateway.domain +package pt.whatsms.gateway.domain -import me.capcom.smsgateway.BuildConfig -import me.capcom.smsgateway.modules.health.domain.CheckResult -import me.capcom.smsgateway.modules.health.domain.HealthResult -import me.capcom.smsgateway.modules.health.domain.Status +import pt.whatsms.gateway.BuildConfig +import pt.whatsms.gateway.modules.health.domain.CheckResult +import pt.whatsms.gateway.modules.health.domain.HealthResult +import pt.whatsms.gateway.modules.health.domain.Status class HealthResponse( healthResult: HealthResult, diff --git a/app/src/main/java/me/capcom/smsgateway/domain/MessageContent.kt b/app/src/main/java/pt/whatsms/gateway/domain/MessageContent.kt similarity index 90% rename from app/src/main/java/me/capcom/smsgateway/domain/MessageContent.kt rename to app/src/main/java/pt/whatsms/gateway/domain/MessageContent.kt index 42aefc1..63e2a82 100644 --- a/app/src/main/java/me/capcom/smsgateway/domain/MessageContent.kt +++ b/app/src/main/java/pt/whatsms/gateway/domain/MessageContent.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.domain +package pt.whatsms.gateway.domain sealed class MessageContent { data class Text(val text: String) : MessageContent() { diff --git a/app/src/main/java/me/capcom/smsgateway/domain/ProcessingState.kt b/app/src/main/java/pt/whatsms/gateway/domain/ProcessingState.kt similarity index 72% rename from app/src/main/java/me/capcom/smsgateway/domain/ProcessingState.kt rename to app/src/main/java/pt/whatsms/gateway/domain/ProcessingState.kt index fb0596e..5cf6536 100644 --- a/app/src/main/java/me/capcom/smsgateway/domain/ProcessingState.kt +++ b/app/src/main/java/pt/whatsms/gateway/domain/ProcessingState.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.domain +package pt.whatsms.gateway.domain enum class ProcessingState { Pending, diff --git a/app/src/main/java/me/capcom/smsgateway/extensions/GsonBuilder.kt b/app/src/main/java/pt/whatsms/gateway/extensions/GsonBuilder.kt similarity index 95% rename from app/src/main/java/me/capcom/smsgateway/extensions/GsonBuilder.kt rename to app/src/main/java/pt/whatsms/gateway/extensions/GsonBuilder.kt index 8ca5c69..a225fc2 100644 --- a/app/src/main/java/me/capcom/smsgateway/extensions/GsonBuilder.kt +++ b/app/src/main/java/pt/whatsms/gateway/extensions/GsonBuilder.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.extensions +package pt.whatsms.gateway.extensions import android.os.Build import com.google.gson.GsonBuilder diff --git a/app/src/main/java/me/capcom/smsgateway/helpers/BuildHelper.kt b/app/src/main/java/pt/whatsms/gateway/helpers/BuildHelper.kt similarity index 64% rename from app/src/main/java/me/capcom/smsgateway/helpers/BuildHelper.kt rename to app/src/main/java/pt/whatsms/gateway/helpers/BuildHelper.kt index 79dbad3..4bcb1f1 100644 --- a/app/src/main/java/me/capcom/smsgateway/helpers/BuildHelper.kt +++ b/app/src/main/java/pt/whatsms/gateway/helpers/BuildHelper.kt @@ -1,6 +1,6 @@ -package me.capcom.smsgateway.helpers +package pt.whatsms.gateway.helpers -import me.capcom.smsgateway.BuildConfig +import pt.whatsms.gateway.BuildConfig object BuildHelper { val isInsecureVersion = diff --git a/app/src/main/java/me/capcom/smsgateway/helpers/DateTimeParser.kt b/app/src/main/java/pt/whatsms/gateway/helpers/DateTimeParser.kt similarity index 97% rename from app/src/main/java/me/capcom/smsgateway/helpers/DateTimeParser.kt rename to app/src/main/java/pt/whatsms/gateway/helpers/DateTimeParser.kt index 4c9004a..8f6becc 100644 --- a/app/src/main/java/me/capcom/smsgateway/helpers/DateTimeParser.kt +++ b/app/src/main/java/pt/whatsms/gateway/helpers/DateTimeParser.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.helpers +package pt.whatsms.gateway.helpers import android.os.Build import java.text.ParseException diff --git a/app/src/main/java/me/capcom/smsgateway/helpers/PhoneHelper.kt b/app/src/main/java/pt/whatsms/gateway/helpers/PhoneHelper.kt similarity index 95% rename from app/src/main/java/me/capcom/smsgateway/helpers/PhoneHelper.kt rename to app/src/main/java/pt/whatsms/gateway/helpers/PhoneHelper.kt index acf0626..0635cc2 100644 --- a/app/src/main/java/me/capcom/smsgateway/helpers/PhoneHelper.kt +++ b/app/src/main/java/pt/whatsms/gateway/helpers/PhoneHelper.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.helpers +package pt.whatsms.gateway.helpers import com.google.i18n.phonenumbers.PhoneNumberUtil diff --git a/app/src/main/java/me/capcom/smsgateway/helpers/SSEManager.kt b/app/src/main/java/pt/whatsms/gateway/helpers/SSEManager.kt similarity index 99% rename from app/src/main/java/me/capcom/smsgateway/helpers/SSEManager.kt rename to app/src/main/java/pt/whatsms/gateway/helpers/SSEManager.kt index 289cecc..3b33ca8 100644 --- a/app/src/main/java/me/capcom/smsgateway/helpers/SSEManager.kt +++ b/app/src/main/java/pt/whatsms/gateway/helpers/SSEManager.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.helpers +package pt.whatsms.gateway.helpers import android.util.Log import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/me/capcom/smsgateway/helpers/SettingsHelper.kt b/app/src/main/java/pt/whatsms/gateway/helpers/SettingsHelper.kt similarity index 94% rename from app/src/main/java/me/capcom/smsgateway/helpers/SettingsHelper.kt rename to app/src/main/java/pt/whatsms/gateway/helpers/SettingsHelper.kt index 6c72fa1..3630d74 100644 --- a/app/src/main/java/me/capcom/smsgateway/helpers/SettingsHelper.kt +++ b/app/src/main/java/pt/whatsms/gateway/helpers/SettingsHelper.kt @@ -1,11 +1,11 @@ -package me.capcom.smsgateway.helpers +package pt.whatsms.gateway.helpers import android.content.ComponentName import android.content.Context import android.content.pm.PackageManager import androidx.core.content.edit import androidx.preference.PreferenceManager -import me.capcom.smsgateway.receivers.BootReceiver +import pt.whatsms.gateway.receivers.BootReceiver class SettingsHelper(private val context: Context) { private val settings = PreferenceManager.getDefaultSharedPreferences(context) diff --git a/app/src/main/java/me/capcom/smsgateway/helpers/SubscriptionsHelper.kt b/app/src/main/java/pt/whatsms/gateway/helpers/SubscriptionsHelper.kt similarity index 99% rename from app/src/main/java/me/capcom/smsgateway/helpers/SubscriptionsHelper.kt rename to app/src/main/java/pt/whatsms/gateway/helpers/SubscriptionsHelper.kt index 6fd22c6..498f902 100644 --- a/app/src/main/java/me/capcom/smsgateway/helpers/SubscriptionsHelper.kt +++ b/app/src/main/java/pt/whatsms/gateway/helpers/SubscriptionsHelper.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.helpers +package pt.whatsms.gateway.helpers import android.Manifest import android.annotation.SuppressLint diff --git a/app/src/main/java/me/capcom/smsgateway/modules/connection/CellularNetworkType.kt b/app/src/main/java/pt/whatsms/gateway/modules/connection/CellularNetworkType.kt similarity index 70% rename from app/src/main/java/me/capcom/smsgateway/modules/connection/CellularNetworkType.kt rename to app/src/main/java/pt/whatsms/gateway/modules/connection/CellularNetworkType.kt index 0158a87..8f26f53 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/connection/CellularNetworkType.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/connection/CellularNetworkType.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.connection +package pt.whatsms.gateway.modules.connection enum class CellularNetworkType { None, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/connection/ConnectionService.kt b/app/src/main/java/pt/whatsms/gateway/modules/connection/ConnectionService.kt similarity index 95% rename from app/src/main/java/me/capcom/smsgateway/modules/connection/ConnectionService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/connection/ConnectionService.kt index fd06ae7..99cd06d 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/connection/ConnectionService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/connection/ConnectionService.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.connection +package pt.whatsms.gateway.modules.connection import android.Manifest import android.content.Context @@ -11,10 +11,10 @@ import android.telephony.TelephonyManager import androidx.core.app.ActivityCompat import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import me.capcom.smsgateway.modules.health.domain.CheckResult -import me.capcom.smsgateway.modules.health.domain.Status -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.health.domain.CheckResult +import pt.whatsms.gateway.modules.health.domain.Status +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry import org.koin.core.component.KoinComponent import org.koin.core.component.inject diff --git a/app/src/main/java/me/capcom/smsgateway/modules/connection/Module.kt b/app/src/main/java/pt/whatsms/gateway/modules/connection/Module.kt similarity index 77% rename from app/src/main/java/me/capcom/smsgateway/modules/connection/Module.kt rename to app/src/main/java/pt/whatsms/gateway/modules/connection/Module.kt index 9c82f2b..be5bd5b 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/connection/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/connection/Module.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.connection +package pt.whatsms.gateway.modules.connection import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/modules/connection/TransportType.kt b/app/src/main/java/pt/whatsms/gateway/modules/connection/TransportType.kt similarity index 70% rename from app/src/main/java/me/capcom/smsgateway/modules/connection/TransportType.kt rename to app/src/main/java/pt/whatsms/gateway/modules/connection/TransportType.kt index f7c058e..cc4c87d 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/connection/TransportType.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/connection/TransportType.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.connection +package pt.whatsms.gateway.modules.connection enum class TransportType( val value: Int diff --git a/app/src/main/java/me/capcom/smsgateway/modules/encryption/EncryptionService.kt b/app/src/main/java/pt/whatsms/gateway/modules/encryption/EncryptionService.kt similarity index 98% rename from app/src/main/java/me/capcom/smsgateway/modules/encryption/EncryptionService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/encryption/EncryptionService.kt index d143856..260f08e 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/encryption/EncryptionService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/encryption/EncryptionService.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.encryption +package pt.whatsms.gateway.modules.encryption import android.util.Base64 import javax.crypto.Cipher diff --git a/app/src/main/java/me/capcom/smsgateway/modules/encryption/EncryptionSettings.kt b/app/src/main/java/pt/whatsms/gateway/modules/encryption/EncryptionSettings.kt similarity index 84% rename from app/src/main/java/me/capcom/smsgateway/modules/encryption/EncryptionSettings.kt rename to app/src/main/java/pt/whatsms/gateway/modules/encryption/EncryptionSettings.kt index 8a64e76..e4c23a6 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/encryption/EncryptionSettings.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/encryption/EncryptionSettings.kt @@ -1,8 +1,8 @@ -package me.capcom.smsgateway.modules.encryption +package pt.whatsms.gateway.modules.encryption -import me.capcom.smsgateway.modules.settings.Importer -import me.capcom.smsgateway.modules.settings.KeyValueStorage -import me.capcom.smsgateway.modules.settings.get +import pt.whatsms.gateway.modules.settings.Importer +import pt.whatsms.gateway.modules.settings.KeyValueStorage +import pt.whatsms.gateway.modules.settings.get class EncryptionSettings( private val storage: KeyValueStorage, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/encryption/Module.kt b/app/src/main/java/pt/whatsms/gateway/modules/encryption/Module.kt similarity index 70% rename from app/src/main/java/me/capcom/smsgateway/modules/encryption/Module.kt rename to app/src/main/java/pt/whatsms/gateway/modules/encryption/Module.kt index c8f827e..1f41370 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/encryption/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/encryption/Module.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.encryption +package pt.whatsms.gateway.modules.encryption import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/modules/events/AppEvent.kt b/app/src/main/java/pt/whatsms/gateway/modules/events/AppEvent.kt similarity index 57% rename from app/src/main/java/me/capcom/smsgateway/modules/events/AppEvent.kt rename to app/src/main/java/pt/whatsms/gateway/modules/events/AppEvent.kt index d32fef7..11f48db 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/events/AppEvent.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/events/AppEvent.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.events +package pt.whatsms.gateway.modules.events open class AppEvent( @Transient diff --git a/app/src/main/java/me/capcom/smsgateway/modules/events/EventBus.kt b/app/src/main/java/pt/whatsms/gateway/modules/events/EventBus.kt similarity index 93% rename from app/src/main/java/me/capcom/smsgateway/modules/events/EventBus.kt rename to app/src/main/java/pt/whatsms/gateway/modules/events/EventBus.kt index f94d4f0..e3f0f9a 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/events/EventBus.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/events/EventBus.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.events +package pt.whatsms.gateway.modules.events import android.util.Log import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/app/src/main/java/me/capcom/smsgateway/modules/events/EventsReceiver.kt b/app/src/main/java/pt/whatsms/gateway/modules/events/EventsReceiver.kt similarity index 94% rename from app/src/main/java/me/capcom/smsgateway/modules/events/EventsReceiver.kt rename to app/src/main/java/pt/whatsms/gateway/modules/events/EventsReceiver.kt index 4ca437b..a736e27 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/events/EventsReceiver.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/events/EventsReceiver.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.events +package pt.whatsms.gateway.modules.events import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/me/capcom/smsgateway/modules/events/ExternalEvent.kt b/app/src/main/java/pt/whatsms/gateway/modules/events/ExternalEvent.kt similarity index 65% rename from app/src/main/java/me/capcom/smsgateway/modules/events/ExternalEvent.kt rename to app/src/main/java/pt/whatsms/gateway/modules/events/ExternalEvent.kt index 0ce1a98..6a14158 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/events/ExternalEvent.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/events/ExternalEvent.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.events +package pt.whatsms.gateway.modules.events data class ExternalEvent( val type: ExternalEventType, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/events/ExternalEventType.kt b/app/src/main/java/pt/whatsms/gateway/modules/events/ExternalEventType.kt similarity index 88% rename from app/src/main/java/me/capcom/smsgateway/modules/events/ExternalEventType.kt rename to app/src/main/java/pt/whatsms/gateway/modules/events/ExternalEventType.kt index 1571478..e4cf567 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/events/ExternalEventType.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/events/ExternalEventType.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.events +package pt.whatsms.gateway.modules.events import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/me/capcom/smsgateway/modules/events/Module.kt b/app/src/main/java/pt/whatsms/gateway/modules/events/Module.kt similarity index 66% rename from app/src/main/java/me/capcom/smsgateway/modules/events/Module.kt rename to app/src/main/java/pt/whatsms/gateway/modules/events/Module.kt index 19bfa38..5b6c9b1 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/events/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/events/Module.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.events +package pt.whatsms.gateway.modules.events import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/EventsReceiver.kt b/app/src/main/java/pt/whatsms/gateway/modules/gateway/EventsReceiver.kt similarity index 73% rename from app/src/main/java/me/capcom/smsgateway/modules/gateway/EventsReceiver.kt rename to app/src/main/java/pt/whatsms/gateway/modules/gateway/EventsReceiver.kt index d4884b1..c7f322d 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/EventsReceiver.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/gateway/EventsReceiver.kt @@ -1,22 +1,22 @@ -package me.capcom.smsgateway.modules.gateway +package pt.whatsms.gateway.modules.gateway import android.util.Log import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.launch -import me.capcom.smsgateway.domain.EntitySource -import me.capcom.smsgateway.modules.events.EventBus -import me.capcom.smsgateway.modules.events.EventsReceiver -import me.capcom.smsgateway.modules.gateway.events.DeviceRegisteredEvent -import me.capcom.smsgateway.modules.gateway.events.MessageEnqueuedEvent -import me.capcom.smsgateway.modules.gateway.events.SettingsUpdatedEvent -import me.capcom.smsgateway.modules.gateway.events.WebhooksUpdatedEvent -import me.capcom.smsgateway.modules.gateway.services.SSEForegroundService -import me.capcom.smsgateway.modules.gateway.workers.PullMessagesWorker -import me.capcom.smsgateway.modules.gateway.workers.SendStateWorker -import me.capcom.smsgateway.modules.gateway.workers.SettingsUpdateWorker -import me.capcom.smsgateway.modules.gateway.workers.WebhooksUpdateWorker -import me.capcom.smsgateway.modules.messages.events.MessageStateChangedEvent -import me.capcom.smsgateway.modules.ping.events.PingEvent +import pt.whatsms.gateway.domain.EntitySource +import pt.whatsms.gateway.modules.events.EventBus +import pt.whatsms.gateway.modules.events.EventsReceiver +import pt.whatsms.gateway.modules.gateway.events.DeviceRegisteredEvent +import pt.whatsms.gateway.modules.gateway.events.MessageEnqueuedEvent +import pt.whatsms.gateway.modules.gateway.events.SettingsUpdatedEvent +import pt.whatsms.gateway.modules.gateway.events.WebhooksUpdatedEvent +import pt.whatsms.gateway.modules.gateway.services.SSEForegroundService +import pt.whatsms.gateway.modules.gateway.workers.PullMessagesWorker +import pt.whatsms.gateway.modules.gateway.workers.SendStateWorker +import pt.whatsms.gateway.modules.gateway.workers.SettingsUpdateWorker +import pt.whatsms.gateway.modules.gateway.workers.WebhooksUpdateWorker +import pt.whatsms.gateway.modules.messages.events.MessageStateChangedEvent +import pt.whatsms.gateway.modules.ping.events.PingEvent import org.koin.core.component.get class EventsReceiver : EventsReceiver() { diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayApi.kt b/app/src/main/java/pt/whatsms/gateway/modules/gateway/GatewayApi.kt similarity index 95% rename from app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayApi.kt rename to app/src/main/java/pt/whatsms/gateway/modules/gateway/GatewayApi.kt index 44ab56c..899c1b1 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayApi.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/gateway/GatewayApi.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.gateway +package pt.whatsms.gateway.modules.gateway import com.google.gson.annotations.SerializedName import io.ktor.client.HttpClient @@ -20,10 +20,10 @@ import io.ktor.http.contentType import io.ktor.http.hostWithPort import io.ktor.serialization.gson.gson import io.ktor.util.encodeBase64 -import me.capcom.smsgateway.BuildConfig -import me.capcom.smsgateway.domain.ProcessingState -import me.capcom.smsgateway.extensions.configure -import me.capcom.smsgateway.modules.webhooks.domain.WebHookEvent +import pt.whatsms.gateway.BuildConfig +import pt.whatsms.gateway.domain.ProcessingState +import pt.whatsms.gateway.extensions.configure +import pt.whatsms.gateway.modules.webhooks.domain.WebHookEvent import java.util.Date class GatewayApi( @@ -35,7 +35,7 @@ class GatewayApi( private val client = HttpClient(OkHttp) { install(UserAgent) { - agent = "me.capcom.smsgateway/" + BuildConfig.VERSION_NAME + agent = "pt.whatsms.gateway/" + BuildConfig.VERSION_NAME } install(ContentNegotiation) { gson { diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayService.kt b/app/src/main/java/pt/whatsms/gateway/modules/gateway/GatewayService.kt similarity index 88% rename from app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/gateway/GatewayService.kt index 433aeed..2cc062c 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewayService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/gateway/GatewayService.kt @@ -1,26 +1,26 @@ -package me.capcom.smsgateway.modules.gateway +package pt.whatsms.gateway.modules.gateway import android.content.Context import android.os.Build import io.ktor.client.plugins.ClientRequestException import io.ktor.http.HttpStatusCode -import me.capcom.smsgateway.data.entities.MessageWithRecipients -import me.capcom.smsgateway.domain.EntitySource -import me.capcom.smsgateway.domain.MessageContent -import me.capcom.smsgateway.modules.events.EventBus -import me.capcom.smsgateway.modules.gateway.events.DeviceRegisteredEvent -import me.capcom.smsgateway.modules.gateway.services.SSEForegroundService -import me.capcom.smsgateway.modules.gateway.workers.PullMessagesWorker -import me.capcom.smsgateway.modules.gateway.workers.SendStateWorker -import me.capcom.smsgateway.modules.gateway.workers.SettingsUpdateWorker -import me.capcom.smsgateway.modules.gateway.workers.WebhooksUpdateWorker -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.messages.MessagesService -import me.capcom.smsgateway.modules.messages.MessagesSettings -import me.capcom.smsgateway.modules.messages.data.SendParams -import me.capcom.smsgateway.modules.messages.data.SendRequest -import me.capcom.smsgateway.services.PushService +import pt.whatsms.gateway.data.entities.MessageWithRecipients +import pt.whatsms.gateway.domain.EntitySource +import pt.whatsms.gateway.domain.MessageContent +import pt.whatsms.gateway.modules.events.EventBus +import pt.whatsms.gateway.modules.gateway.events.DeviceRegisteredEvent +import pt.whatsms.gateway.modules.gateway.services.SSEForegroundService +import pt.whatsms.gateway.modules.gateway.workers.PullMessagesWorker +import pt.whatsms.gateway.modules.gateway.workers.SendStateWorker +import pt.whatsms.gateway.modules.gateway.workers.SettingsUpdateWorker +import pt.whatsms.gateway.modules.gateway.workers.WebhooksUpdateWorker +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.messages.MessagesService +import pt.whatsms.gateway.modules.messages.MessagesSettings +import pt.whatsms.gateway.modules.messages.data.SendParams +import pt.whatsms.gateway.modules.messages.data.SendRequest +import pt.whatsms.gateway.services.PushService import java.util.Date class GatewayService( @@ -224,7 +224,7 @@ class GatewayService( val request = SendRequest( EntitySource.Cloud, - me.capcom.smsgateway.modules.messages.data.Message( + pt.whatsms.gateway.modules.messages.data.Message( message.id, when (val content = message.content) { is GatewayApi.MessageContent.Text -> MessageContent.Text(content.text) diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewaySettings.kt b/app/src/main/java/pt/whatsms/gateway/modules/gateway/GatewaySettings.kt similarity index 92% rename from app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewaySettings.kt rename to app/src/main/java/pt/whatsms/gateway/modules/gateway/GatewaySettings.kt index 648859a..84623f5 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/GatewaySettings.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/gateway/GatewaySettings.kt @@ -1,9 +1,9 @@ -package me.capcom.smsgateway.modules.gateway +package pt.whatsms.gateway.modules.gateway -import me.capcom.smsgateway.modules.settings.Exporter -import me.capcom.smsgateway.modules.settings.Importer -import me.capcom.smsgateway.modules.settings.KeyValueStorage -import me.capcom.smsgateway.modules.settings.get +import pt.whatsms.gateway.modules.settings.Exporter +import pt.whatsms.gateway.modules.settings.Importer +import pt.whatsms.gateway.modules.settings.KeyValueStorage +import pt.whatsms.gateway.modules.settings.get class GatewaySettings( private val storage: KeyValueStorage, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/Module.kt b/app/src/main/java/pt/whatsms/gateway/modules/gateway/Module.kt similarity index 78% rename from app/src/main/java/me/capcom/smsgateway/modules/gateway/Module.kt rename to app/src/main/java/pt/whatsms/gateway/modules/gateway/Module.kt index e3e150e..1fe2276 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/gateway/Module.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.gateway +package pt.whatsms.gateway.modules.gateway import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/events/DeviceRegisteredEvent.kt b/app/src/main/java/pt/whatsms/gateway/modules/gateway/events/DeviceRegisteredEvent.kt similarity index 79% rename from app/src/main/java/me/capcom/smsgateway/modules/gateway/events/DeviceRegisteredEvent.kt rename to app/src/main/java/pt/whatsms/gateway/modules/gateway/events/DeviceRegisteredEvent.kt index b35c3a1..6435219 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/events/DeviceRegisteredEvent.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/gateway/events/DeviceRegisteredEvent.kt @@ -1,6 +1,6 @@ -package me.capcom.smsgateway.modules.gateway.events +package pt.whatsms.gateway.modules.gateway.events -import me.capcom.smsgateway.modules.events.AppEvent +import pt.whatsms.gateway.modules.events.AppEvent sealed class DeviceRegisteredEvent( val server: String, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/events/MessageEnqueuedEvent.kt b/app/src/main/java/pt/whatsms/gateway/modules/gateway/events/MessageEnqueuedEvent.kt similarity index 54% rename from app/src/main/java/me/capcom/smsgateway/modules/gateway/events/MessageEnqueuedEvent.kt rename to app/src/main/java/pt/whatsms/gateway/modules/gateway/events/MessageEnqueuedEvent.kt index 795a1a1..1b89142 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/events/MessageEnqueuedEvent.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/gateway/events/MessageEnqueuedEvent.kt @@ -1,6 +1,6 @@ -package me.capcom.smsgateway.modules.gateway.events +package pt.whatsms.gateway.modules.gateway.events -import me.capcom.smsgateway.modules.events.AppEvent +import pt.whatsms.gateway.modules.events.AppEvent class MessageEnqueuedEvent : AppEvent(NAME) { companion object { diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/events/SettingsUpdatedEvent.kt b/app/src/main/java/pt/whatsms/gateway/modules/gateway/events/SettingsUpdatedEvent.kt similarity index 54% rename from app/src/main/java/me/capcom/smsgateway/modules/gateway/events/SettingsUpdatedEvent.kt rename to app/src/main/java/pt/whatsms/gateway/modules/gateway/events/SettingsUpdatedEvent.kt index f04d511..d6db5fa 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/events/SettingsUpdatedEvent.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/gateway/events/SettingsUpdatedEvent.kt @@ -1,6 +1,6 @@ -package me.capcom.smsgateway.modules.gateway.events +package pt.whatsms.gateway.modules.gateway.events -import me.capcom.smsgateway.modules.events.AppEvent +import pt.whatsms.gateway.modules.events.AppEvent class SettingsUpdatedEvent : AppEvent(NAME) { diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/events/WebhooksUpdatedEvent.kt b/app/src/main/java/pt/whatsms/gateway/modules/gateway/events/WebhooksUpdatedEvent.kt similarity index 54% rename from app/src/main/java/me/capcom/smsgateway/modules/gateway/events/WebhooksUpdatedEvent.kt rename to app/src/main/java/pt/whatsms/gateway/modules/gateway/events/WebhooksUpdatedEvent.kt index ca25904..1998f52 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/events/WebhooksUpdatedEvent.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/gateway/events/WebhooksUpdatedEvent.kt @@ -1,6 +1,6 @@ -package me.capcom.smsgateway.modules.gateway.events +package pt.whatsms.gateway.modules.gateway.events -import me.capcom.smsgateway.modules.events.AppEvent +import pt.whatsms.gateway.modules.events.AppEvent class WebhooksUpdatedEvent : AppEvent(NAME) { companion object { diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/services/SSEForegroundService.kt b/app/src/main/java/pt/whatsms/gateway/modules/gateway/services/SSEForegroundService.kt similarity index 88% rename from app/src/main/java/me/capcom/smsgateway/modules/gateway/services/SSEForegroundService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/gateway/services/SSEForegroundService.kt index 3b46440..9faea13 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/services/SSEForegroundService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/gateway/services/SSEForegroundService.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.gateway.services +package pt.whatsms.gateway.modules.gateway.services import android.app.Service import android.content.Context @@ -8,16 +8,16 @@ import android.os.Build import android.os.IBinder import android.os.PowerManager import android.util.Log -import me.capcom.smsgateway.R -import me.capcom.smsgateway.helpers.SSEManager -import me.capcom.smsgateway.modules.events.ExternalEvent -import me.capcom.smsgateway.modules.events.ExternalEventType -import me.capcom.smsgateway.modules.gateway.GatewaySettings -import me.capcom.smsgateway.modules.gateway.workers.PullMessagesWorker -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.notifications.NotificationsService -import me.capcom.smsgateway.modules.orchestrator.EventsRouter +import pt.whatsms.gateway.R +import pt.whatsms.gateway.helpers.SSEManager +import pt.whatsms.gateway.modules.events.ExternalEvent +import pt.whatsms.gateway.modules.events.ExternalEventType +import pt.whatsms.gateway.modules.gateway.GatewaySettings +import pt.whatsms.gateway.modules.gateway.workers.PullMessagesWorker +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.notifications.NotificationsService +import pt.whatsms.gateway.modules.orchestrator.EventsRouter import org.koin.android.ext.android.inject class SSEForegroundService : Service() { diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/PullMessagesWorker.kt b/app/src/main/java/pt/whatsms/gateway/modules/gateway/workers/PullMessagesWorker.kt similarity index 96% rename from app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/PullMessagesWorker.kt rename to app/src/main/java/pt/whatsms/gateway/modules/gateway/workers/PullMessagesWorker.kt index cb83023..7928067 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/PullMessagesWorker.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/gateway/workers/PullMessagesWorker.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.gateway.workers +package pt.whatsms.gateway.modules.gateway.workers import android.content.Context import androidx.lifecycle.map @@ -15,7 +15,7 @@ import androidx.work.WorkRequest import androidx.work.WorkerParameters import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import me.capcom.smsgateway.App +import pt.whatsms.gateway.App import java.util.concurrent.TimeUnit class PullMessagesWorker( diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/RegistrationWorker.kt b/app/src/main/java/pt/whatsms/gateway/modules/gateway/workers/RegistrationWorker.kt similarity index 91% rename from app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/RegistrationWorker.kt rename to app/src/main/java/pt/whatsms/gateway/modules/gateway/workers/RegistrationWorker.kt index 63bd21a..3739892 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/RegistrationWorker.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/gateway/workers/RegistrationWorker.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.gateway.workers +package pt.whatsms.gateway.modules.gateway.workers import android.content.Context import androidx.work.BackoffPolicy @@ -11,10 +11,10 @@ import androidx.work.WorkManager import androidx.work.WorkRequest import androidx.work.WorkerParameters import androidx.work.workDataOf -import me.capcom.smsgateway.App -import me.capcom.smsgateway.modules.gateway.GatewayService -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.App +import pt.whatsms.gateway.modules.gateway.GatewayService +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry import org.koin.core.component.KoinComponent import org.koin.core.component.inject import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/SendStateWorker.kt b/app/src/main/java/pt/whatsms/gateway/modules/gateway/workers/SendStateWorker.kt similarity index 92% rename from app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/SendStateWorker.kt rename to app/src/main/java/pt/whatsms/gateway/modules/gateway/workers/SendStateWorker.kt index b5ddd92..c9615b9 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/SendStateWorker.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/gateway/workers/SendStateWorker.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.gateway.workers +package pt.whatsms.gateway.modules.gateway.workers import android.content.Context import androidx.work.BackoffPolicy @@ -12,8 +12,8 @@ import androidx.work.WorkerParameters import androidx.work.workDataOf import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import me.capcom.smsgateway.modules.gateway.GatewayService -import me.capcom.smsgateway.modules.messages.MessagesService +import pt.whatsms.gateway.modules.gateway.GatewayService +import pt.whatsms.gateway.modules.messages.MessagesService import org.koin.core.component.KoinComponent import org.koin.core.component.inject import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/SettingsUpdateWorker.kt b/app/src/main/java/pt/whatsms/gateway/modules/gateway/workers/SettingsUpdateWorker.kt similarity index 92% rename from app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/SettingsUpdateWorker.kt rename to app/src/main/java/pt/whatsms/gateway/modules/gateway/workers/SettingsUpdateWorker.kt index c326ffd..fe56dac 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/SettingsUpdateWorker.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/gateway/workers/SettingsUpdateWorker.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.gateway.workers +package pt.whatsms.gateway.modules.gateway.workers import android.content.Context import androidx.work.BackoffPolicy @@ -10,8 +10,8 @@ import androidx.work.PeriodicWorkRequestBuilder import androidx.work.WorkManager import androidx.work.WorkRequest import androidx.work.WorkerParameters -import me.capcom.smsgateway.modules.gateway.GatewayService -import me.capcom.smsgateway.modules.settings.SettingsService +import pt.whatsms.gateway.modules.gateway.GatewayService +import pt.whatsms.gateway.modules.settings.SettingsService import org.koin.core.component.KoinComponent import org.koin.core.component.get import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/WebhooksUpdateWorker.kt b/app/src/main/java/pt/whatsms/gateway/modules/gateway/workers/WebhooksUpdateWorker.kt similarity index 87% rename from app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/WebhooksUpdateWorker.kt rename to app/src/main/java/pt/whatsms/gateway/modules/gateway/workers/WebhooksUpdateWorker.kt index 7d7f205..9be4f6c 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/gateway/workers/WebhooksUpdateWorker.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/gateway/workers/WebhooksUpdateWorker.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.gateway.workers +package pt.whatsms.gateway.modules.gateway.workers import android.content.Context import androidx.work.BackoffPolicy @@ -10,11 +10,11 @@ import androidx.work.PeriodicWorkRequestBuilder import androidx.work.WorkManager import androidx.work.WorkRequest import androidx.work.WorkerParameters -import me.capcom.smsgateway.domain.EntitySource -import me.capcom.smsgateway.modules.gateway.GatewayApi -import me.capcom.smsgateway.modules.gateway.GatewayService -import me.capcom.smsgateway.modules.webhooks.WebHooksService -import me.capcom.smsgateway.modules.webhooks.domain.WebHookDTO +import pt.whatsms.gateway.domain.EntitySource +import pt.whatsms.gateway.modules.gateway.GatewayApi +import pt.whatsms.gateway.modules.gateway.GatewayService +import pt.whatsms.gateway.modules.webhooks.WebHooksService +import pt.whatsms.gateway.modules.webhooks.domain.WebHookDTO import org.koin.core.component.KoinComponent import org.koin.core.component.get import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/me/capcom/smsgateway/modules/health/HealthService.kt b/app/src/main/java/pt/whatsms/gateway/modules/health/HealthService.kt similarity index 71% rename from app/src/main/java/me/capcom/smsgateway/modules/health/HealthService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/health/HealthService.kt index be7623c..75772f8 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/health/HealthService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/health/HealthService.kt @@ -1,10 +1,10 @@ -package me.capcom.smsgateway.modules.health +package pt.whatsms.gateway.modules.health -import me.capcom.smsgateway.modules.connection.ConnectionService -import me.capcom.smsgateway.modules.health.domain.HealthResult -import me.capcom.smsgateway.modules.health.domain.Status -import me.capcom.smsgateway.modules.health.monitors.BatteryMonitor -import me.capcom.smsgateway.modules.messages.MessagesService +import pt.whatsms.gateway.modules.connection.ConnectionService +import pt.whatsms.gateway.modules.health.domain.HealthResult +import pt.whatsms.gateway.modules.health.domain.Status +import pt.whatsms.gateway.modules.health.monitors.BatteryMonitor +import pt.whatsms.gateway.modules.messages.MessagesService class HealthService( private val messagesSvc: MessagesService, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/health/Module.kt b/app/src/main/java/pt/whatsms/gateway/modules/health/Module.kt similarity index 56% rename from app/src/main/java/me/capcom/smsgateway/modules/health/Module.kt rename to app/src/main/java/pt/whatsms/gateway/modules/health/Module.kt index 199d545..b6837c5 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/health/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/health/Module.kt @@ -1,5 +1,5 @@ -import me.capcom.smsgateway.modules.health.HealthService -import me.capcom.smsgateway.modules.health.monitors.BatteryMonitor +import pt.whatsms.gateway.modules.health.HealthService +import pt.whatsms.gateway.modules.health.monitors.BatteryMonitor import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/modules/health/domain/CheckResult.kt b/app/src/main/java/pt/whatsms/gateway/modules/health/domain/CheckResult.kt similarity index 73% rename from app/src/main/java/me/capcom/smsgateway/modules/health/domain/CheckResult.kt rename to app/src/main/java/pt/whatsms/gateway/modules/health/domain/CheckResult.kt index 6e58403..8af719e 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/health/domain/CheckResult.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/health/domain/CheckResult.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.health.domain +package pt.whatsms.gateway.modules.health.domain data class CheckResult( val status: Status, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/health/domain/HealthResult.kt b/app/src/main/java/pt/whatsms/gateway/modules/health/domain/HealthResult.kt similarity index 64% rename from app/src/main/java/me/capcom/smsgateway/modules/health/domain/HealthResult.kt rename to app/src/main/java/pt/whatsms/gateway/modules/health/domain/HealthResult.kt index 9665acd..d7654c6 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/health/domain/HealthResult.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/health/domain/HealthResult.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.health.domain +package pt.whatsms.gateway.modules.health.domain data class HealthResult( val status: Status, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/health/domain/Status.kt b/app/src/main/java/pt/whatsms/gateway/modules/health/domain/Status.kt similarity index 78% rename from app/src/main/java/me/capcom/smsgateway/modules/health/domain/Status.kt rename to app/src/main/java/pt/whatsms/gateway/modules/health/domain/Status.kt index cffc39d..de0b728 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/health/domain/Status.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/health/domain/Status.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.health.domain +package pt.whatsms.gateway.modules.health.domain import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/me/capcom/smsgateway/modules/health/monitors/BatteryMonitor.kt b/app/src/main/java/pt/whatsms/gateway/modules/health/monitors/BatteryMonitor.kt similarity index 92% rename from app/src/main/java/me/capcom/smsgateway/modules/health/monitors/BatteryMonitor.kt rename to app/src/main/java/pt/whatsms/gateway/modules/health/monitors/BatteryMonitor.kt index 7d506a9..f1a7c32 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/health/monitors/BatteryMonitor.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/health/monitors/BatteryMonitor.kt @@ -1,11 +1,11 @@ -package me.capcom.smsgateway.modules.health.monitors +package pt.whatsms.gateway.modules.health.monitors import android.content.Context import android.content.Intent import android.content.IntentFilter import android.os.BatteryManager -import me.capcom.smsgateway.modules.health.domain.CheckResult -import me.capcom.smsgateway.modules.health.domain.Status +import pt.whatsms.gateway.modules.health.domain.CheckResult +import pt.whatsms.gateway.modules.health.domain.Status class BatteryMonitor( private val context: Context diff --git a/app/src/main/java/me/capcom/smsgateway/modules/incoming/IncomingMessagesService.kt b/app/src/main/java/pt/whatsms/gateway/modules/incoming/IncomingMessagesService.kt similarity index 87% rename from app/src/main/java/me/capcom/smsgateway/modules/incoming/IncomingMessagesService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/incoming/IncomingMessagesService.kt index 01d87fd..6b6519b 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/incoming/IncomingMessagesService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/incoming/IncomingMessagesService.kt @@ -1,9 +1,9 @@ -package me.capcom.smsgateway.modules.incoming +package pt.whatsms.gateway.modules.incoming -import me.capcom.smsgateway.modules.incoming.db.IncomingMessage -import me.capcom.smsgateway.modules.incoming.db.IncomingMessageType -import me.capcom.smsgateway.modules.incoming.repositories.IncomingMessagesRepository -import me.capcom.smsgateway.modules.receiver.data.InboxMessage +import pt.whatsms.gateway.modules.incoming.db.IncomingMessage +import pt.whatsms.gateway.modules.incoming.db.IncomingMessageType +import pt.whatsms.gateway.modules.incoming.repositories.IncomingMessagesRepository +import pt.whatsms.gateway.modules.receiver.data.InboxMessage import java.util.UUID class IncomingMessagesService( diff --git a/app/src/main/java/me/capcom/smsgateway/modules/incoming/Module.kt b/app/src/main/java/pt/whatsms/gateway/modules/incoming/Module.kt similarity index 60% rename from app/src/main/java/me/capcom/smsgateway/modules/incoming/Module.kt rename to app/src/main/java/pt/whatsms/gateway/modules/incoming/Module.kt index 3099377..ba659ce 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/incoming/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/incoming/Module.kt @@ -1,7 +1,7 @@ -package me.capcom.smsgateway.modules.incoming +package pt.whatsms.gateway.modules.incoming -import me.capcom.smsgateway.modules.incoming.repositories.IncomingMessagesRepository -import me.capcom.smsgateway.modules.incoming.vm.IncomingMessagesListViewModel +import pt.whatsms.gateway.modules.incoming.repositories.IncomingMessagesRepository +import pt.whatsms.gateway.modules.incoming.vm.IncomingMessagesListViewModel import org.koin.androidx.viewmodel.dsl.viewModelOf import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/modules/incoming/db/IncomingMessage.kt b/app/src/main/java/pt/whatsms/gateway/modules/incoming/db/IncomingMessage.kt similarity index 92% rename from app/src/main/java/me/capcom/smsgateway/modules/incoming/db/IncomingMessage.kt rename to app/src/main/java/pt/whatsms/gateway/modules/incoming/db/IncomingMessage.kt index af7dab9..871d7d8 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/incoming/db/IncomingMessage.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/incoming/db/IncomingMessage.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.incoming.db +package pt.whatsms.gateway.modules.incoming.db import androidx.room.Entity import androidx.room.Index diff --git a/app/src/main/java/me/capcom/smsgateway/modules/incoming/db/IncomingMessageTotals.kt b/app/src/main/java/pt/whatsms/gateway/modules/incoming/db/IncomingMessageTotals.kt similarity index 70% rename from app/src/main/java/me/capcom/smsgateway/modules/incoming/db/IncomingMessageTotals.kt rename to app/src/main/java/pt/whatsms/gateway/modules/incoming/db/IncomingMessageTotals.kt index c632272..5288fba 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/incoming/db/IncomingMessageTotals.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/incoming/db/IncomingMessageTotals.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.incoming.db +package pt.whatsms.gateway.modules.incoming.db data class IncomingMessageTotals( val total: Long, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/incoming/db/IncomingMessagesDao.kt b/app/src/main/java/pt/whatsms/gateway/modules/incoming/db/IncomingMessagesDao.kt similarity index 97% rename from app/src/main/java/me/capcom/smsgateway/modules/incoming/db/IncomingMessagesDao.kt rename to app/src/main/java/pt/whatsms/gateway/modules/incoming/db/IncomingMessagesDao.kt index f843fd5..98cb08b 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/incoming/db/IncomingMessagesDao.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/incoming/db/IncomingMessagesDao.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.incoming.db +package pt.whatsms.gateway.modules.incoming.db import androidx.lifecycle.LiveData import androidx.room.Dao diff --git a/app/src/main/java/me/capcom/smsgateway/modules/incoming/repositories/IncomingMessagesRepository.kt b/app/src/main/java/pt/whatsms/gateway/modules/incoming/repositories/IncomingMessagesRepository.kt similarity index 71% rename from app/src/main/java/me/capcom/smsgateway/modules/incoming/repositories/IncomingMessagesRepository.kt rename to app/src/main/java/pt/whatsms/gateway/modules/incoming/repositories/IncomingMessagesRepository.kt index 03e6440..dcabfee 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/incoming/repositories/IncomingMessagesRepository.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/incoming/repositories/IncomingMessagesRepository.kt @@ -1,11 +1,11 @@ -package me.capcom.smsgateway.modules.incoming.repositories +package pt.whatsms.gateway.modules.incoming.repositories import androidx.lifecycle.LiveData import androidx.lifecycle.distinctUntilChanged -import me.capcom.smsgateway.modules.incoming.db.IncomingMessage -import me.capcom.smsgateway.modules.incoming.db.IncomingMessageTotals -import me.capcom.smsgateway.modules.incoming.db.IncomingMessageType -import me.capcom.smsgateway.modules.incoming.db.IncomingMessagesDao +import pt.whatsms.gateway.modules.incoming.db.IncomingMessage +import pt.whatsms.gateway.modules.incoming.db.IncomingMessageTotals +import pt.whatsms.gateway.modules.incoming.db.IncomingMessageType +import pt.whatsms.gateway.modules.incoming.db.IncomingMessagesDao class IncomingMessagesRepository(private val dao: IncomingMessagesDao) { fun selectLast(limit: Int): LiveData> = diff --git a/app/src/main/java/me/capcom/smsgateway/modules/incoming/vm/IncomingMessagesListViewModel.kt b/app/src/main/java/pt/whatsms/gateway/modules/incoming/vm/IncomingMessagesListViewModel.kt similarity index 81% rename from app/src/main/java/me/capcom/smsgateway/modules/incoming/vm/IncomingMessagesListViewModel.kt rename to app/src/main/java/pt/whatsms/gateway/modules/incoming/vm/IncomingMessagesListViewModel.kt index 808fa34..fcd1f2d 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/incoming/vm/IncomingMessagesListViewModel.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/incoming/vm/IncomingMessagesListViewModel.kt @@ -1,13 +1,13 @@ -package me.capcom.smsgateway.modules.incoming.vm +package pt.whatsms.gateway.modules.incoming.vm import androidx.lifecycle.LiveData import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.switchMap -import me.capcom.smsgateway.modules.incoming.db.IncomingMessage -import me.capcom.smsgateway.modules.incoming.db.IncomingMessageTotals -import me.capcom.smsgateway.modules.incoming.repositories.IncomingMessagesRepository +import pt.whatsms.gateway.modules.incoming.db.IncomingMessage +import pt.whatsms.gateway.modules.incoming.db.IncomingMessageTotals +import pt.whatsms.gateway.modules.incoming.repositories.IncomingMessagesRepository class IncomingMessagesListViewModel( private val repository: IncomingMessagesRepository, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/LocalServerService.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/LocalServerService.kt similarity index 83% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/LocalServerService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/LocalServerService.kt index 8c750b3..e8f40d4 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/LocalServerService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/LocalServerService.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver +package pt.whatsms.gateway.modules.localserver import android.content.Context import android.os.Build @@ -6,10 +6,10 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.launch -import me.capcom.smsgateway.modules.events.EventBus -import me.capcom.smsgateway.modules.localserver.events.IPReceivedEvent -import me.capcom.smsgateway.providers.LocalIPProvider -import me.capcom.smsgateway.providers.PublicIPProvider +import pt.whatsms.gateway.modules.events.EventBus +import pt.whatsms.gateway.modules.localserver.events.IPReceivedEvent +import pt.whatsms.gateway.providers.LocalIPProvider +import pt.whatsms.gateway.providers.PublicIPProvider class LocalServerService( private val settings: LocalServerSettings, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/LocalServerSettings.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/LocalServerSettings.kt similarity index 92% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/LocalServerSettings.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/LocalServerSettings.kt index 200f145..ce869be 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/LocalServerSettings.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/LocalServerSettings.kt @@ -1,8 +1,8 @@ -package me.capcom.smsgateway.modules.localserver +package pt.whatsms.gateway.modules.localserver import com.aventrix.jnanoid.jnanoid.NanoIdUtils -import me.capcom.smsgateway.modules.settings.KeyValueStorage -import me.capcom.smsgateway.modules.settings.get +import pt.whatsms.gateway.modules.settings.KeyValueStorage +import pt.whatsms.gateway.modules.settings.get class LocalServerSettings( private val storage: KeyValueStorage, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/Module.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/Module.kt similarity index 73% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/Module.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/Module.kt index debd0ef..7801c1d 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/Module.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver +package pt.whatsms.gateway.modules.localserver import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/WebService.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/WebService.kt similarity index 88% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/WebService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/WebService.kt index d89cf8e..d19b548 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/WebService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/WebService.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver +package pt.whatsms.gateway.modules.localserver import android.app.Service import android.content.Context @@ -33,22 +33,22 @@ import io.ktor.server.routing.get import io.ktor.server.routing.route import io.ktor.server.routing.routing import io.ktor.util.date.GMTDate -import me.capcom.smsgateway.R -import me.capcom.smsgateway.domain.HealthResponse -import me.capcom.smsgateway.extensions.configure -import me.capcom.smsgateway.modules.health.HealthService -import me.capcom.smsgateway.modules.health.domain.Status -import me.capcom.smsgateway.modules.localserver.auth.AuthScopes -import me.capcom.smsgateway.modules.localserver.auth.JwtService -import me.capcom.smsgateway.modules.localserver.auth.requireScope -import me.capcom.smsgateway.modules.localserver.domain.Device -import me.capcom.smsgateway.modules.localserver.routes.AuthRoutes -import me.capcom.smsgateway.modules.localserver.routes.DocsRoutes -import me.capcom.smsgateway.modules.localserver.routes.InboxRoutes -import me.capcom.smsgateway.modules.localserver.routes.LogsRoutes -import me.capcom.smsgateway.modules.localserver.routes.MessagesRoutes -import me.capcom.smsgateway.modules.localserver.routes.WebhooksRoutes -import me.capcom.smsgateway.modules.notifications.NotificationsService +import pt.whatsms.gateway.R +import pt.whatsms.gateway.domain.HealthResponse +import pt.whatsms.gateway.extensions.configure +import pt.whatsms.gateway.modules.health.HealthService +import pt.whatsms.gateway.modules.health.domain.Status +import pt.whatsms.gateway.modules.localserver.auth.AuthScopes +import pt.whatsms.gateway.modules.localserver.auth.JwtService +import pt.whatsms.gateway.modules.localserver.auth.requireScope +import pt.whatsms.gateway.modules.localserver.domain.Device +import pt.whatsms.gateway.modules.localserver.routes.AuthRoutes +import pt.whatsms.gateway.modules.localserver.routes.DocsRoutes +import pt.whatsms.gateway.modules.localserver.routes.InboxRoutes +import pt.whatsms.gateway.modules.localserver.routes.LogsRoutes +import pt.whatsms.gateway.modules.localserver.routes.MessagesRoutes +import pt.whatsms.gateway.modules.localserver.routes.WebhooksRoutes +import pt.whatsms.gateway.modules.notifications.NotificationsService import org.koin.android.ext.android.get import org.koin.android.ext.android.inject import java.util.Date @@ -108,7 +108,7 @@ class WebService : Service() { } install(ContentNegotiation) { gson { - if (me.capcom.smsgateway.BuildConfig.DEBUG) { + if (pt.whatsms.gateway.BuildConfig.DEBUG) { setPrettyPrinting() } configure() @@ -196,7 +196,7 @@ class WebService : Service() { LogsRoutes(get()).register(this) } route("/settings") { - me.capcom.smsgateway.modules.localserver.routes.SettingsRoutes(get()) + pt.whatsms.gateway.modules.localserver.routes.SettingsRoutes(get()) .register(this) } route("/docs") { diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/auth/AuthScopes.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/auth/AuthScopes.kt similarity index 93% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/auth/AuthScopes.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/auth/AuthScopes.kt index 712e76a..05b092c 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/auth/AuthScopes.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/auth/AuthScopes.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver.auth +package pt.whatsms.gateway.modules.localserver.auth enum class AuthScopes(val value: String) { AllAny("all:any"), diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/auth/JwtService.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/auth/JwtService.kt similarity index 90% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/auth/JwtService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/auth/JwtService.kt index 961779a..159bf3a 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/auth/JwtService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/auth/JwtService.kt @@ -1,12 +1,12 @@ -package me.capcom.smsgateway.modules.localserver.auth +package pt.whatsms.gateway.modules.localserver.auth import android.content.Context import com.auth0.jwt.JWT import com.auth0.jwt.algorithms.Algorithm import com.aventrix.jnanoid.jnanoid.NanoIdUtils -import me.capcom.smsgateway.data.dao.TokensDao -import me.capcom.smsgateway.data.entities.Token -import me.capcom.smsgateway.modules.localserver.LocalServerSettings +import pt.whatsms.gateway.data.dao.TokensDao +import pt.whatsms.gateway.data.entities.Token +import pt.whatsms.gateway.modules.localserver.LocalServerSettings import java.util.Date data class GeneratedToken( diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/auth/ScopeAuthorization.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/auth/ScopeAuthorization.kt similarity index 95% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/auth/ScopeAuthorization.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/auth/ScopeAuthorization.kt index 182a33c..7670473 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/auth/ScopeAuthorization.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/auth/ScopeAuthorization.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver.auth +package pt.whatsms.gateway.modules.localserver.auth import io.ktor.http.HttpStatusCode import io.ktor.server.application.ApplicationCall diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/Device.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/Device.kt similarity index 74% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/Device.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/Device.kt index 04f29e2..4d6ad85 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/Device.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/Device.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver.domain +package pt.whatsms.gateway.modules.localserver.domain import java.util.Date diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/GetLogsResponse.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/GetLogsResponse.kt similarity index 83% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/GetLogsResponse.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/GetLogsResponse.kt index bfe6586..4558bfc 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/GetLogsResponse.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/GetLogsResponse.kt @@ -1,7 +1,7 @@ -package me.capcom.smsgateway.modules.localserver.domain +package pt.whatsms.gateway.modules.localserver.domain import com.google.gson.JsonElement -import me.capcom.smsgateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.logs.db.LogEntry import java.util.Date data class GetLogsResponse( diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/PostMessagesInboxExportRequest.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/PostMessagesInboxExportRequest.kt similarity index 91% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/PostMessagesInboxExportRequest.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/PostMessagesInboxExportRequest.kt index 4e93785..d0b1e96 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/PostMessagesInboxExportRequest.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/PostMessagesInboxExportRequest.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver.domain +package pt.whatsms.gateway.modules.localserver.domain import java.util.Date diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/TokenRequest.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/TokenRequest.kt similarity index 76% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/TokenRequest.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/TokenRequest.kt index 55a5956..bae1017 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/TokenRequest.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/TokenRequest.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver.domain +package pt.whatsms.gateway.modules.localserver.domain import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/TokenResponse.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/TokenResponse.kt similarity index 85% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/TokenResponse.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/TokenResponse.kt index 4da6c9c..ee3dfa6 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/TokenResponse.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/TokenResponse.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver.domain +package pt.whatsms.gateway.modules.localserver.domain import com.google.gson.annotations.SerializedName import java.util.Date diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/messages/DataMessage.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/messages/DataMessage.kt similarity index 66% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/messages/DataMessage.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/messages/DataMessage.kt index 3cb09f0..3b02b1c 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/messages/DataMessage.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/messages/DataMessage.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver.domain.messages +package pt.whatsms.gateway.modules.localserver.domain.messages data class DataMessage( val data: String, // Base64-encoded payload diff --git a/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/messages/HashedMessage.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/messages/HashedMessage.kt new file mode 100644 index 0000000..ebc7b86 --- /dev/null +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/messages/HashedMessage.kt @@ -0,0 +1,5 @@ +package pt.whatsms.gateway.modules.localserver.domain.messages + +data class HashedMessage( + val hash: String, +) \ No newline at end of file diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/messages/Message.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/messages/Message.kt similarity index 81% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/messages/Message.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/messages/Message.kt index 581ebeb..babde35 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/messages/Message.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/messages/Message.kt @@ -1,6 +1,6 @@ -package me.capcom.smsgateway.modules.localserver.domain.messages +package pt.whatsms.gateway.modules.localserver.domain.messages -import me.capcom.smsgateway.domain.ProcessingState +import pt.whatsms.gateway.domain.ProcessingState import java.util.Date open class Message( diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/messages/PostMessageRequest.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/messages/PostMessageRequest.kt similarity index 94% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/messages/PostMessageRequest.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/messages/PostMessageRequest.kt index 3f82d11..c74d516 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/domain/messages/PostMessageRequest.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/messages/PostMessageRequest.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver.domain.messages +package pt.whatsms.gateway.modules.localserver.domain.messages import com.google.gson.annotations.SerializedName import java.util.Date diff --git a/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/messages/TextMessage.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/messages/TextMessage.kt new file mode 100644 index 0000000..b9eb21a --- /dev/null +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/domain/messages/TextMessage.kt @@ -0,0 +1,5 @@ +package pt.whatsms.gateway.modules.localserver.domain.messages + +data class TextMessage( + val text: String, +) \ No newline at end of file diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/events/IPReceivedEvent.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/events/IPReceivedEvent.kt similarity index 61% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/events/IPReceivedEvent.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/events/IPReceivedEvent.kt index 71306ac..aa5e174 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/events/IPReceivedEvent.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/events/IPReceivedEvent.kt @@ -1,6 +1,6 @@ -package me.capcom.smsgateway.modules.localserver.events +package pt.whatsms.gateway.modules.localserver.events -import me.capcom.smsgateway.modules.events.AppEvent +import pt.whatsms.gateway.modules.events.AppEvent class IPReceivedEvent( val localIP: String?, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/AuthRoutes.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/AuthRoutes.kt similarity index 79% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/AuthRoutes.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/AuthRoutes.kt index afcde5a..5ea02d2 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/AuthRoutes.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/AuthRoutes.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver.routes +package pt.whatsms.gateway.modules.localserver.routes import io.ktor.http.HttpStatusCode import io.ktor.server.application.call @@ -8,11 +8,11 @@ import io.ktor.server.routing.Route import io.ktor.server.routing.delete import io.ktor.server.routing.post import io.ktor.server.routing.route -import me.capcom.smsgateway.modules.localserver.auth.AuthScopes -import me.capcom.smsgateway.modules.localserver.auth.JwtService -import me.capcom.smsgateway.modules.localserver.auth.requireScope -import me.capcom.smsgateway.modules.localserver.domain.TokenRequest -import me.capcom.smsgateway.modules.localserver.domain.TokenResponse +import pt.whatsms.gateway.modules.localserver.auth.AuthScopes +import pt.whatsms.gateway.modules.localserver.auth.JwtService +import pt.whatsms.gateway.modules.localserver.auth.requireScope +import pt.whatsms.gateway.modules.localserver.domain.TokenRequest +import pt.whatsms.gateway.modules.localserver.domain.TokenResponse class AuthRoutes( private val jwtService: JwtService, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/DocsRoutes.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/DocsRoutes.kt similarity index 97% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/DocsRoutes.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/DocsRoutes.kt index c1d9f76..7c742d9 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/DocsRoutes.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/DocsRoutes.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver.routes +package pt.whatsms.gateway.modules.localserver.routes import android.content.Context import io.ktor.http.ContentType diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/InboxRoutes.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/InboxRoutes.kt similarity index 91% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/InboxRoutes.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/InboxRoutes.kt index 74ef223..1640124 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/InboxRoutes.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/InboxRoutes.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver.routes +package pt.whatsms.gateway.modules.localserver.routes import android.content.Context import io.ktor.http.HttpStatusCode @@ -9,15 +9,15 @@ import io.ktor.server.routing.Route import io.ktor.server.routing.get import io.ktor.server.routing.post import kotlinx.coroutines.CancellationException -import me.capcom.smsgateway.helpers.DateTimeParser -import me.capcom.smsgateway.modules.incoming.IncomingMessagesService -import me.capcom.smsgateway.modules.incoming.db.IncomingMessage -import me.capcom.smsgateway.modules.incoming.db.IncomingMessageType -import me.capcom.smsgateway.modules.localserver.LocalServerSettings -import me.capcom.smsgateway.modules.localserver.auth.AuthScopes -import me.capcom.smsgateway.modules.localserver.auth.requireScope -import me.capcom.smsgateway.modules.localserver.domain.PostMessagesInboxExportRequest -import me.capcom.smsgateway.modules.receiver.ReceiverService +import pt.whatsms.gateway.helpers.DateTimeParser +import pt.whatsms.gateway.modules.incoming.IncomingMessagesService +import pt.whatsms.gateway.modules.incoming.db.IncomingMessage +import pt.whatsms.gateway.modules.incoming.db.IncomingMessageType +import pt.whatsms.gateway.modules.localserver.LocalServerSettings +import pt.whatsms.gateway.modules.localserver.auth.AuthScopes +import pt.whatsms.gateway.modules.localserver.auth.requireScope +import pt.whatsms.gateway.modules.localserver.domain.PostMessagesInboxExportRequest +import pt.whatsms.gateway.modules.receiver.ReceiverService import java.util.Date class InboxRoutes( diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/LogsRoutes.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/LogsRoutes.kt similarity index 74% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/LogsRoutes.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/LogsRoutes.kt index 44dbdd3..dc41ca1 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/LogsRoutes.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/LogsRoutes.kt @@ -1,15 +1,15 @@ -package me.capcom.smsgateway.modules.localserver.routes +package pt.whatsms.gateway.modules.localserver.routes import io.ktor.http.HttpStatusCode import io.ktor.server.application.call import io.ktor.server.response.respond import io.ktor.server.routing.Route import io.ktor.server.routing.get -import me.capcom.smsgateway.helpers.DateTimeParser -import me.capcom.smsgateway.modules.localserver.auth.AuthScopes -import me.capcom.smsgateway.modules.localserver.auth.requireScope -import me.capcom.smsgateway.modules.localserver.domain.GetLogsResponse -import me.capcom.smsgateway.modules.logs.LogsService +import pt.whatsms.gateway.helpers.DateTimeParser +import pt.whatsms.gateway.modules.localserver.auth.AuthScopes +import pt.whatsms.gateway.modules.localserver.auth.requireScope +import pt.whatsms.gateway.modules.localserver.domain.GetLogsResponse +import pt.whatsms.gateway.modules.logs.LogsService class LogsRoutes( private val logsService: LogsService, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/MessagesRoutes.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/MessagesRoutes.kt similarity index 88% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/MessagesRoutes.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/MessagesRoutes.kt index 0147e87..6e81495 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/MessagesRoutes.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/MessagesRoutes.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver.routes +package pt.whatsms.gateway.modules.localserver.routes import android.content.Context import com.aventrix.jnanoid.jnanoid.NanoIdUtils @@ -10,24 +10,24 @@ import io.ktor.server.routing.Route import io.ktor.server.routing.get import io.ktor.server.routing.post import io.ktor.server.routing.route -import me.capcom.smsgateway.data.entities.MessageWithRecipients -import me.capcom.smsgateway.domain.EntitySource -import me.capcom.smsgateway.domain.MessageContent -import me.capcom.smsgateway.domain.ProcessingState -import me.capcom.smsgateway.helpers.DateTimeParser -import me.capcom.smsgateway.modules.localserver.LocalServerSettings -import me.capcom.smsgateway.modules.localserver.auth.AuthScopes -import me.capcom.smsgateway.modules.localserver.auth.requireScope -import me.capcom.smsgateway.modules.localserver.domain.PostMessagesInboxExportRequest -import me.capcom.smsgateway.modules.localserver.domain.messages.DataMessage -import me.capcom.smsgateway.modules.localserver.domain.messages.PostMessageRequest -import me.capcom.smsgateway.modules.localserver.domain.messages.TextMessage -import me.capcom.smsgateway.modules.messages.MessagesService -import me.capcom.smsgateway.modules.messages.data.Message -import me.capcom.smsgateway.modules.messages.data.SendParams -import me.capcom.smsgateway.modules.messages.data.SendRequest -import me.capcom.smsgateway.modules.messages.exceptions.ConflictException -import me.capcom.smsgateway.modules.receiver.ReceiverService +import pt.whatsms.gateway.data.entities.MessageWithRecipients +import pt.whatsms.gateway.domain.EntitySource +import pt.whatsms.gateway.domain.MessageContent +import pt.whatsms.gateway.domain.ProcessingState +import pt.whatsms.gateway.helpers.DateTimeParser +import pt.whatsms.gateway.modules.localserver.LocalServerSettings +import pt.whatsms.gateway.modules.localserver.auth.AuthScopes +import pt.whatsms.gateway.modules.localserver.auth.requireScope +import pt.whatsms.gateway.modules.localserver.domain.PostMessagesInboxExportRequest +import pt.whatsms.gateway.modules.localserver.domain.messages.DataMessage +import pt.whatsms.gateway.modules.localserver.domain.messages.PostMessageRequest +import pt.whatsms.gateway.modules.localserver.domain.messages.TextMessage +import pt.whatsms.gateway.modules.messages.MessagesService +import pt.whatsms.gateway.modules.messages.data.Message +import pt.whatsms.gateway.modules.messages.data.SendParams +import pt.whatsms.gateway.modules.messages.data.SendRequest +import pt.whatsms.gateway.modules.messages.exceptions.ConflictException +import pt.whatsms.gateway.modules.receiver.ReceiverService import java.util.Date class MessagesRoutes( @@ -316,8 +316,8 @@ class MessagesRoutes( private fun MessageWithRecipients.toDomain( deviceId: String, includeContent: Boolean = false - ): me.capcom.smsgateway.modules.localserver.domain.messages.Message { - return me.capcom.smsgateway.modules.localserver.domain.messages.Message( + ): pt.whatsms.gateway.modules.localserver.domain.messages.Message { + return pt.whatsms.gateway.modules.localserver.domain.messages.Message( id = message.id, deviceId = deviceId, state = message.state, @@ -342,7 +342,7 @@ class MessagesRoutes( }, hashedMessage = null, recipients = recipients.map { - me.capcom.smsgateway.modules.localserver.domain.messages.Message.Recipient( + pt.whatsms.gateway.modules.localserver.domain.messages.Message.Recipient( it.phoneNumber, it.state, it.error diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/SettingsRoutes.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/SettingsRoutes.kt similarity index 86% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/SettingsRoutes.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/SettingsRoutes.kt index 5ed9951..2252081 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/SettingsRoutes.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/SettingsRoutes.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver.routes +package pt.whatsms.gateway.modules.localserver.routes import io.ktor.http.HttpStatusCode import io.ktor.server.application.call @@ -7,9 +7,9 @@ import io.ktor.server.response.respond import io.ktor.server.routing.Route import io.ktor.server.routing.get import io.ktor.server.routing.patch -import me.capcom.smsgateway.modules.localserver.auth.AuthScopes -import me.capcom.smsgateway.modules.localserver.auth.requireScope -import me.capcom.smsgateway.modules.settings.SettingsService +import pt.whatsms.gateway.modules.localserver.auth.AuthScopes +import pt.whatsms.gateway.modules.localserver.auth.requireScope +import pt.whatsms.gateway.modules.settings.SettingsService class SettingsRoutes( private val settingsService: SettingsService diff --git a/app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/WebhooksRoutes.kt b/app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/WebhooksRoutes.kt similarity index 78% rename from app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/WebhooksRoutes.kt rename to app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/WebhooksRoutes.kt index e115092..2be4286 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/localserver/routes/WebhooksRoutes.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/localserver/routes/WebhooksRoutes.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.localserver.routes +package pt.whatsms.gateway.modules.localserver.routes import io.ktor.http.HttpStatusCode import io.ktor.server.application.call @@ -8,12 +8,12 @@ import io.ktor.server.routing.Route import io.ktor.server.routing.delete import io.ktor.server.routing.get import io.ktor.server.routing.post -import me.capcom.smsgateway.domain.EntitySource -import me.capcom.smsgateway.modules.localserver.LocalServerSettings -import me.capcom.smsgateway.modules.localserver.auth.AuthScopes -import me.capcom.smsgateway.modules.localserver.auth.requireScope -import me.capcom.smsgateway.modules.webhooks.WebHooksService -import me.capcom.smsgateway.modules.webhooks.domain.WebHookDTO +import pt.whatsms.gateway.domain.EntitySource +import pt.whatsms.gateway.modules.localserver.LocalServerSettings +import pt.whatsms.gateway.modules.localserver.auth.AuthScopes +import pt.whatsms.gateway.modules.localserver.auth.requireScope +import pt.whatsms.gateway.modules.webhooks.WebHooksService +import pt.whatsms.gateway.modules.webhooks.domain.WebHookDTO class WebhooksRoutes( private val webHooksService: WebHooksService, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/logs/LogsService.kt b/app/src/main/java/pt/whatsms/gateway/modules/logs/LogsService.kt similarity index 82% rename from app/src/main/java/me/capcom/smsgateway/modules/logs/LogsService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/logs/LogsService.kt index 172e2e1..5e96fb5 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/logs/LogsService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/logs/LogsService.kt @@ -1,11 +1,11 @@ -package me.capcom.smsgateway.modules.logs +package pt.whatsms.gateway.modules.logs import android.content.Context import com.google.gson.GsonBuilder -import me.capcom.smsgateway.extensions.configure -import me.capcom.smsgateway.modules.logs.db.LogEntriesDao -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.logs.workers.TruncateWorker +import pt.whatsms.gateway.extensions.configure +import pt.whatsms.gateway.modules.logs.db.LogEntriesDao +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.logs.workers.TruncateWorker class LogsService( private val dao: LogEntriesDao, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/logs/LogsSettings.kt b/app/src/main/java/pt/whatsms/gateway/modules/logs/LogsSettings.kt similarity index 83% rename from app/src/main/java/me/capcom/smsgateway/modules/logs/LogsSettings.kt rename to app/src/main/java/pt/whatsms/gateway/modules/logs/LogsSettings.kt index 9836b7b..18d6d78 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/logs/LogsSettings.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/logs/LogsSettings.kt @@ -1,9 +1,9 @@ -package me.capcom.smsgateway.modules.logs +package pt.whatsms.gateway.modules.logs -import me.capcom.smsgateway.modules.settings.Exporter -import me.capcom.smsgateway.modules.settings.Importer -import me.capcom.smsgateway.modules.settings.KeyValueStorage -import me.capcom.smsgateway.modules.settings.get +import pt.whatsms.gateway.modules.settings.Exporter +import pt.whatsms.gateway.modules.settings.Importer +import pt.whatsms.gateway.modules.settings.KeyValueStorage +import pt.whatsms.gateway.modules.settings.get class LogsSettings( private val storage: KeyValueStorage, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/logs/LogsUtils.kt b/app/src/main/java/pt/whatsms/gateway/modules/logs/LogsUtils.kt similarity index 93% rename from app/src/main/java/me/capcom/smsgateway/modules/logs/LogsUtils.kt rename to app/src/main/java/pt/whatsms/gateway/modules/logs/LogsUtils.kt index fddf35d..7a67c76 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/logs/LogsUtils.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/logs/LogsUtils.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.logs +package pt.whatsms.gateway.modules.logs import android.content.Intent import org.json.JSONObject diff --git a/app/src/main/java/me/capcom/smsgateway/modules/logs/Module.kt b/app/src/main/java/pt/whatsms/gateway/modules/logs/Module.kt similarity index 60% rename from app/src/main/java/me/capcom/smsgateway/modules/logs/Module.kt rename to app/src/main/java/pt/whatsms/gateway/modules/logs/Module.kt index bb55159..33b8105 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/logs/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/logs/Module.kt @@ -1,7 +1,7 @@ -package me.capcom.smsgateway.modules.logs +package pt.whatsms.gateway.modules.logs -import me.capcom.smsgateway.modules.logs.repositories.LogsRepository -import me.capcom.smsgateway.modules.logs.vm.LogsViewModel +import pt.whatsms.gateway.modules.logs.repositories.LogsRepository +import pt.whatsms.gateway.modules.logs.vm.LogsViewModel import org.koin.androidx.viewmodel.dsl.viewModelOf import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/modules/logs/db/LogEntriesDao.kt b/app/src/main/java/pt/whatsms/gateway/modules/logs/db/LogEntriesDao.kt similarity index 92% rename from app/src/main/java/me/capcom/smsgateway/modules/logs/db/LogEntriesDao.kt rename to app/src/main/java/pt/whatsms/gateway/modules/logs/db/LogEntriesDao.kt index f87e810..a4b6832 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/logs/db/LogEntriesDao.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/logs/db/LogEntriesDao.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.logs.db +package pt.whatsms.gateway.modules.logs.db import androidx.lifecycle.LiveData import androidx.room.Dao diff --git a/app/src/main/java/me/capcom/smsgateway/modules/logs/db/LogEntry.kt b/app/src/main/java/pt/whatsms/gateway/modules/logs/db/LogEntry.kt similarity index 92% rename from app/src/main/java/me/capcom/smsgateway/modules/logs/db/LogEntry.kt rename to app/src/main/java/pt/whatsms/gateway/modules/logs/db/LogEntry.kt index 19a4f45..0cb2374 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/logs/db/LogEntry.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/logs/db/LogEntry.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.logs.db +package pt.whatsms.gateway.modules.logs.db import androidx.room.Entity import androidx.room.PrimaryKey diff --git a/app/src/main/java/me/capcom/smsgateway/modules/logs/repositories/LogsRepository.kt b/app/src/main/java/pt/whatsms/gateway/modules/logs/repositories/LogsRepository.kt similarity index 60% rename from app/src/main/java/me/capcom/smsgateway/modules/logs/repositories/LogsRepository.kt rename to app/src/main/java/pt/whatsms/gateway/modules/logs/repositories/LogsRepository.kt index 7591f8d..1653d2b 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/logs/repositories/LogsRepository.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/logs/repositories/LogsRepository.kt @@ -1,7 +1,7 @@ -package me.capcom.smsgateway.modules.logs.repositories +package pt.whatsms.gateway.modules.logs.repositories import androidx.lifecycle.distinctUntilChanged -import me.capcom.smsgateway.modules.logs.db.LogEntriesDao +import pt.whatsms.gateway.modules.logs.db.LogEntriesDao class LogsRepository( private val dao: LogEntriesDao diff --git a/app/src/main/java/me/capcom/smsgateway/modules/logs/vm/LogsViewModel.kt b/app/src/main/java/pt/whatsms/gateway/modules/logs/vm/LogsViewModel.kt similarity index 54% rename from app/src/main/java/me/capcom/smsgateway/modules/logs/vm/LogsViewModel.kt rename to app/src/main/java/pt/whatsms/gateway/modules/logs/vm/LogsViewModel.kt index 6c4690e..b384096 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/logs/vm/LogsViewModel.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/logs/vm/LogsViewModel.kt @@ -1,9 +1,9 @@ -package me.capcom.smsgateway.modules.logs.vm +package pt.whatsms.gateway.modules.logs.vm import androidx.lifecycle.LiveData import androidx.lifecycle.ViewModel -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.logs.repositories.LogsRepository +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.logs.repositories.LogsRepository class LogsViewModel( logs: LogsRepository diff --git a/app/src/main/java/me/capcom/smsgateway/modules/logs/workers/TruncateWorker.kt b/app/src/main/java/pt/whatsms/gateway/modules/logs/workers/TruncateWorker.kt similarity index 88% rename from app/src/main/java/me/capcom/smsgateway/modules/logs/workers/TruncateWorker.kt rename to app/src/main/java/pt/whatsms/gateway/modules/logs/workers/TruncateWorker.kt index b4515f4..1b19013 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/logs/workers/TruncateWorker.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/logs/workers/TruncateWorker.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.logs.workers +package pt.whatsms.gateway.modules.logs.workers import android.content.Context import androidx.work.Constraints @@ -7,8 +7,8 @@ import androidx.work.ExistingPeriodicWorkPolicy import androidx.work.PeriodicWorkRequestBuilder import androidx.work.WorkManager import androidx.work.WorkerParameters -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry import org.koin.core.component.KoinComponent import org.koin.core.component.inject import java.util.concurrent.TimeUnit @@ -24,7 +24,7 @@ class TruncateWorker(appContext: Context, params: WorkerParameters) : } catch (e: Throwable) { logsSvc.insert( LogEntry.Priority.ERROR, - me.capcom.smsgateway.modules.logs.NAME, + pt.whatsms.gateway.modules.logs.NAME, "Failed to truncate logs: ${e.message}" ) e.printStackTrace() diff --git a/app/src/main/java/me/capcom/smsgateway/modules/messages/MessagesRepository.kt b/app/src/main/java/pt/whatsms/gateway/modules/messages/MessagesRepository.kt similarity index 83% rename from app/src/main/java/me/capcom/smsgateway/modules/messages/MessagesRepository.kt rename to app/src/main/java/pt/whatsms/gateway/modules/messages/MessagesRepository.kt index a5469c2..3075c7f 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/messages/MessagesRepository.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/messages/MessagesRepository.kt @@ -1,19 +1,19 @@ -package me.capcom.smsgateway.modules.messages +package pt.whatsms.gateway.modules.messages import androidx.lifecycle.LiveData import androidx.lifecycle.distinctUntilChanged import com.google.gson.GsonBuilder -import me.capcom.smsgateway.data.dao.MessagesDao -import me.capcom.smsgateway.data.entities.Message -import me.capcom.smsgateway.data.entities.MessageRecipient -import me.capcom.smsgateway.data.entities.MessageType -import me.capcom.smsgateway.data.entities.MessageWithRecipients -import me.capcom.smsgateway.data.entities.MessagesTotals -import me.capcom.smsgateway.domain.MessageContent -import me.capcom.smsgateway.domain.ProcessingState -import me.capcom.smsgateway.modules.messages.data.SendParams -import me.capcom.smsgateway.modules.messages.data.SendRequest -import me.capcom.smsgateway.modules.messages.data.StoredSendRequest +import pt.whatsms.gateway.data.dao.MessagesDao +import pt.whatsms.gateway.data.entities.Message +import pt.whatsms.gateway.data.entities.MessageRecipient +import pt.whatsms.gateway.data.entities.MessageType +import pt.whatsms.gateway.data.entities.MessageWithRecipients +import pt.whatsms.gateway.data.entities.MessagesTotals +import pt.whatsms.gateway.domain.MessageContent +import pt.whatsms.gateway.domain.ProcessingState +import pt.whatsms.gateway.modules.messages.data.SendParams +import pt.whatsms.gateway.modules.messages.data.SendRequest +import pt.whatsms.gateway.modules.messages.data.StoredSendRequest import java.util.Date class MessagesRepository(private val dao: MessagesDao) { @@ -82,7 +82,7 @@ class MessagesRepository(private val dao: MessagesDao) { state = message.state, recipients = this.recipients, message.message.source, - me.capcom.smsgateway.modules.messages.data.Message( + pt.whatsms.gateway.modules.messages.data.Message( id = message.message.id, content = when (message.message.type) { MessageType.Text -> gson.fromJson( diff --git a/app/src/main/java/me/capcom/smsgateway/modules/messages/MessagesService.kt b/app/src/main/java/pt/whatsms/gateway/modules/messages/MessagesService.kt similarity index 94% rename from app/src/main/java/me/capcom/smsgateway/modules/messages/MessagesService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/messages/MessagesService.kt index 270cc0c..2148b9d 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/messages/MessagesService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/messages/MessagesService.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.messages +package pt.whatsms.gateway.modules.messages import android.Manifest import android.annotation.SuppressLint @@ -17,28 +17,28 @@ import androidx.core.app.ActivityCompat import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.delay import kotlinx.coroutines.withContext -import me.capcom.smsgateway.data.dao.MessagesDao -import me.capcom.smsgateway.data.entities.Message -import me.capcom.smsgateway.data.entities.MessageWithRecipients -import me.capcom.smsgateway.domain.EntitySource -import me.capcom.smsgateway.domain.MessageContent -import me.capcom.smsgateway.domain.ProcessingState -import me.capcom.smsgateway.helpers.PhoneHelper -import me.capcom.smsgateway.helpers.SubscriptionsHelper -import me.capcom.smsgateway.modules.encryption.EncryptionService -import me.capcom.smsgateway.modules.events.EventBus -import me.capcom.smsgateway.modules.health.domain.CheckResult -import me.capcom.smsgateway.modules.health.domain.Status -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.messages.data.SendParams -import me.capcom.smsgateway.modules.messages.data.SendRequest -import me.capcom.smsgateway.modules.messages.data.StoredSendRequest -import me.capcom.smsgateway.modules.messages.events.MessageStateChangedEvent -import me.capcom.smsgateway.modules.messages.exceptions.ConflictException -import me.capcom.smsgateway.modules.messages.workers.LogTruncateWorker -import me.capcom.smsgateway.modules.messages.workers.SendMessagesWorker -import me.capcom.smsgateway.receivers.EventsReceiver +import pt.whatsms.gateway.data.dao.MessagesDao +import pt.whatsms.gateway.data.entities.Message +import pt.whatsms.gateway.data.entities.MessageWithRecipients +import pt.whatsms.gateway.domain.EntitySource +import pt.whatsms.gateway.domain.MessageContent +import pt.whatsms.gateway.domain.ProcessingState +import pt.whatsms.gateway.helpers.PhoneHelper +import pt.whatsms.gateway.helpers.SubscriptionsHelper +import pt.whatsms.gateway.modules.encryption.EncryptionService +import pt.whatsms.gateway.modules.events.EventBus +import pt.whatsms.gateway.modules.health.domain.CheckResult +import pt.whatsms.gateway.modules.health.domain.Status +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.messages.data.SendParams +import pt.whatsms.gateway.modules.messages.data.SendRequest +import pt.whatsms.gateway.modules.messages.data.StoredSendRequest +import pt.whatsms.gateway.modules.messages.events.MessageStateChangedEvent +import pt.whatsms.gateway.modules.messages.exceptions.ConflictException +import pt.whatsms.gateway.modules.messages.workers.LogTruncateWorker +import pt.whatsms.gateway.modules.messages.workers.SendMessagesWorker +import pt.whatsms.gateway.receivers.EventsReceiver import java.util.Date class MessagesService( diff --git a/app/src/main/java/me/capcom/smsgateway/modules/messages/MessagesSettings.kt b/app/src/main/java/pt/whatsms/gateway/modules/messages/MessagesSettings.kt similarity index 95% rename from app/src/main/java/me/capcom/smsgateway/modules/messages/MessagesSettings.kt rename to app/src/main/java/pt/whatsms/gateway/modules/messages/MessagesSettings.kt index 4827124..d6debdf 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/messages/MessagesSettings.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/messages/MessagesSettings.kt @@ -1,9 +1,9 @@ -package me.capcom.smsgateway.modules.messages +package pt.whatsms.gateway.modules.messages -import me.capcom.smsgateway.modules.settings.Exporter -import me.capcom.smsgateway.modules.settings.Importer -import me.capcom.smsgateway.modules.settings.KeyValueStorage -import me.capcom.smsgateway.modules.settings.get +import pt.whatsms.gateway.modules.settings.Exporter +import pt.whatsms.gateway.modules.settings.Importer +import pt.whatsms.gateway.modules.settings.KeyValueStorage +import pt.whatsms.gateway.modules.settings.get class MessagesSettings( private val storage: KeyValueStorage, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/messages/Module.kt b/app/src/main/java/pt/whatsms/gateway/modules/messages/Module.kt similarity index 66% rename from app/src/main/java/me/capcom/smsgateway/modules/messages/Module.kt rename to app/src/main/java/pt/whatsms/gateway/modules/messages/Module.kt index 77f321a..ad0045f 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/messages/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/messages/Module.kt @@ -1,7 +1,7 @@ -package me.capcom.smsgateway.modules.messages +package pt.whatsms.gateway.modules.messages -import me.capcom.smsgateway.modules.messages.vm.MessageDetailsViewModel -import me.capcom.smsgateway.modules.messages.vm.MessagesListViewModel +import pt.whatsms.gateway.modules.messages.vm.MessageDetailsViewModel +import pt.whatsms.gateway.modules.messages.vm.MessagesListViewModel import org.koin.androidx.viewmodel.dsl.viewModel import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/modules/messages/data/Message.kt b/app/src/main/java/pt/whatsms/gateway/modules/messages/data/Message.kt similarity index 65% rename from app/src/main/java/me/capcom/smsgateway/modules/messages/data/Message.kt rename to app/src/main/java/pt/whatsms/gateway/modules/messages/data/Message.kt index 31651a3..dbfc0a6 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/messages/data/Message.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/messages/data/Message.kt @@ -1,6 +1,6 @@ -package me.capcom.smsgateway.modules.messages.data +package pt.whatsms.gateway.modules.messages.data -import me.capcom.smsgateway.domain.MessageContent +import pt.whatsms.gateway.domain.MessageContent import java.util.Date data class Message( diff --git a/app/src/main/java/me/capcom/smsgateway/modules/messages/data/SendParams.kt b/app/src/main/java/pt/whatsms/gateway/modules/messages/data/SendParams.kt similarity index 82% rename from app/src/main/java/me/capcom/smsgateway/modules/messages/data/SendParams.kt rename to app/src/main/java/pt/whatsms/gateway/modules/messages/data/SendParams.kt index a3d45cf..daf138e 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/messages/data/SendParams.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/messages/data/SendParams.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.messages.data +package pt.whatsms.gateway.modules.messages.data import java.util.Date diff --git a/app/src/main/java/me/capcom/smsgateway/modules/messages/data/SendRequest.kt b/app/src/main/java/pt/whatsms/gateway/modules/messages/data/SendRequest.kt similarity index 52% rename from app/src/main/java/me/capcom/smsgateway/modules/messages/data/SendRequest.kt rename to app/src/main/java/pt/whatsms/gateway/modules/messages/data/SendRequest.kt index 6587a21..0b8506b 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/messages/data/SendRequest.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/messages/data/SendRequest.kt @@ -1,6 +1,6 @@ -package me.capcom.smsgateway.modules.messages.data +package pt.whatsms.gateway.modules.messages.data -import me.capcom.smsgateway.domain.EntitySource +import pt.whatsms.gateway.domain.EntitySource open class SendRequest( val source: EntitySource, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/messages/data/StoredSendRequest.kt b/app/src/main/java/pt/whatsms/gateway/modules/messages/data/StoredSendRequest.kt similarity index 53% rename from app/src/main/java/me/capcom/smsgateway/modules/messages/data/StoredSendRequest.kt rename to app/src/main/java/pt/whatsms/gateway/modules/messages/data/StoredSendRequest.kt index 9f36d07..ef00670 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/messages/data/StoredSendRequest.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/messages/data/StoredSendRequest.kt @@ -1,8 +1,8 @@ -package me.capcom.smsgateway.modules.messages.data +package pt.whatsms.gateway.modules.messages.data -import me.capcom.smsgateway.data.entities.MessageRecipient -import me.capcom.smsgateway.domain.EntitySource -import me.capcom.smsgateway.domain.ProcessingState +import pt.whatsms.gateway.data.entities.MessageRecipient +import pt.whatsms.gateway.domain.EntitySource +import pt.whatsms.gateway.domain.ProcessingState class StoredSendRequest( val id: Long, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/messages/events/MessageStateChangedEvent.kt b/app/src/main/java/pt/whatsms/gateway/modules/messages/events/MessageStateChangedEvent.kt similarity index 61% rename from app/src/main/java/me/capcom/smsgateway/modules/messages/events/MessageStateChangedEvent.kt rename to app/src/main/java/pt/whatsms/gateway/modules/messages/events/MessageStateChangedEvent.kt index e0e6d92..7139ef0 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/messages/events/MessageStateChangedEvent.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/messages/events/MessageStateChangedEvent.kt @@ -1,8 +1,8 @@ -package me.capcom.smsgateway.modules.messages.events +package pt.whatsms.gateway.modules.messages.events -import me.capcom.smsgateway.domain.EntitySource -import me.capcom.smsgateway.domain.ProcessingState -import me.capcom.smsgateway.modules.events.AppEvent +import pt.whatsms.gateway.domain.EntitySource +import pt.whatsms.gateway.domain.ProcessingState +import pt.whatsms.gateway.modules.events.AppEvent class MessageStateChangedEvent( val id: String, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/messages/exceptions/ConflictException.kt b/app/src/main/java/pt/whatsms/gateway/modules/messages/exceptions/ConflictException.kt similarity index 60% rename from app/src/main/java/me/capcom/smsgateway/modules/messages/exceptions/ConflictException.kt rename to app/src/main/java/pt/whatsms/gateway/modules/messages/exceptions/ConflictException.kt index 30b4078..8a1d545 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/messages/exceptions/ConflictException.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/messages/exceptions/ConflictException.kt @@ -1,3 +1,3 @@ -package me.capcom.smsgateway.modules.messages.exceptions +package pt.whatsms.gateway.modules.messages.exceptions class ConflictException : RuntimeException("Message with the same ID already exists") \ No newline at end of file diff --git a/app/src/main/java/me/capcom/smsgateway/modules/messages/vm/MessageDetailsViewModel.kt b/app/src/main/java/pt/whatsms/gateway/modules/messages/vm/MessageDetailsViewModel.kt similarity index 76% rename from app/src/main/java/me/capcom/smsgateway/modules/messages/vm/MessageDetailsViewModel.kt rename to app/src/main/java/pt/whatsms/gateway/modules/messages/vm/MessageDetailsViewModel.kt index 72f56a4..6ecbc7b 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/messages/vm/MessageDetailsViewModel.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/messages/vm/MessageDetailsViewModel.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.messages.vm +package pt.whatsms.gateway.modules.messages.vm import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -6,8 +6,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import me.capcom.smsgateway.modules.messages.MessagesRepository -import me.capcom.smsgateway.modules.messages.data.StoredSendRequest +import pt.whatsms.gateway.modules.messages.MessagesRepository +import pt.whatsms.gateway.modules.messages.data.StoredSendRequest class MessageDetailsViewModel( private val messagesRepo: MessagesRepository diff --git a/app/src/main/java/me/capcom/smsgateway/modules/messages/vm/MessagesListViewModel.kt b/app/src/main/java/pt/whatsms/gateway/modules/messages/vm/MessagesListViewModel.kt similarity index 84% rename from app/src/main/java/me/capcom/smsgateway/modules/messages/vm/MessagesListViewModel.kt rename to app/src/main/java/pt/whatsms/gateway/modules/messages/vm/MessagesListViewModel.kt index 170ab42..cc88715 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/messages/vm/MessagesListViewModel.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/messages/vm/MessagesListViewModel.kt @@ -1,13 +1,13 @@ -package me.capcom.smsgateway.modules.messages.vm +package pt.whatsms.gateway.modules.messages.vm import androidx.lifecycle.LiveData import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.switchMap -import me.capcom.smsgateway.data.entities.Message -import me.capcom.smsgateway.data.entities.MessagesTotals -import me.capcom.smsgateway.modules.messages.MessagesRepository +import pt.whatsms.gateway.data.entities.Message +import pt.whatsms.gateway.data.entities.MessagesTotals +import pt.whatsms.gateway.modules.messages.MessagesRepository class MessagesListViewModel( private val messagesRepo: MessagesRepository diff --git a/app/src/main/java/me/capcom/smsgateway/modules/messages/workers/LogTruncateWorker.kt b/app/src/main/java/pt/whatsms/gateway/modules/messages/workers/LogTruncateWorker.kt similarity index 93% rename from app/src/main/java/me/capcom/smsgateway/modules/messages/workers/LogTruncateWorker.kt rename to app/src/main/java/pt/whatsms/gateway/modules/messages/workers/LogTruncateWorker.kt index 87261bc..ec33ee8 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/messages/workers/LogTruncateWorker.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/messages/workers/LogTruncateWorker.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.messages.workers +package pt.whatsms.gateway.modules.messages.workers import android.content.Context import androidx.work.Constraints @@ -7,7 +7,7 @@ import androidx.work.ExistingPeriodicWorkPolicy import androidx.work.PeriodicWorkRequestBuilder import androidx.work.WorkManager import androidx.work.WorkerParameters -import me.capcom.smsgateway.modules.messages.MessagesService +import pt.whatsms.gateway.modules.messages.MessagesService import org.koin.core.component.KoinComponent import org.koin.core.component.inject import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/me/capcom/smsgateway/modules/messages/workers/SendMessagesWorker.kt b/app/src/main/java/pt/whatsms/gateway/modules/messages/workers/SendMessagesWorker.kt similarity index 90% rename from app/src/main/java/me/capcom/smsgateway/modules/messages/workers/SendMessagesWorker.kt rename to app/src/main/java/pt/whatsms/gateway/modules/messages/workers/SendMessagesWorker.kt index 6d68686..4bacc7f 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/messages/workers/SendMessagesWorker.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/messages/workers/SendMessagesWorker.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.messages.workers +package pt.whatsms.gateway.modules.messages.workers import android.content.Context import androidx.work.BackoffPolicy @@ -10,11 +10,11 @@ import androidx.work.OutOfQuotaPolicy import androidx.work.WorkManager import androidx.work.WorkRequest import androidx.work.WorkerParameters -import me.capcom.smsgateway.R -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.messages.MessagesService -import me.capcom.smsgateway.modules.notifications.NotificationsService +import pt.whatsms.gateway.R +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.messages.MessagesService +import pt.whatsms.gateway.modules.notifications.NotificationsService import org.koin.core.component.KoinComponent import org.koin.core.component.inject import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/me/capcom/smsgateway/modules/notifications/Module.kt b/app/src/main/java/pt/whatsms/gateway/modules/notifications/Module.kt similarity index 67% rename from app/src/main/java/me/capcom/smsgateway/modules/notifications/Module.kt rename to app/src/main/java/pt/whatsms/gateway/modules/notifications/Module.kt index 7addd34..0f72cf0 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/notifications/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/notifications/Module.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.notifications +package pt.whatsms.gateway.modules.notifications import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/modules/notifications/NotificationsService.kt b/app/src/main/java/pt/whatsms/gateway/modules/notifications/NotificationsService.kt similarity index 96% rename from app/src/main/java/me/capcom/smsgateway/modules/notifications/NotificationsService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/notifications/NotificationsService.kt index f754049..8645de9 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/notifications/NotificationsService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/notifications/NotificationsService.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.notifications +package pt.whatsms.gateway.modules.notifications import android.app.Notification import android.app.NotificationChannel @@ -7,8 +7,8 @@ import android.app.PendingIntent import android.content.Context import android.os.Build import androidx.core.app.NotificationCompat -import me.capcom.smsgateway.MainActivity -import me.capcom.smsgateway.R +import pt.whatsms.gateway.MainActivity +import pt.whatsms.gateway.R class NotificationsService( context: Context diff --git a/app/src/main/java/me/capcom/smsgateway/modules/orchestrator/EventsRouter.kt b/app/src/main/java/pt/whatsms/gateway/modules/orchestrator/EventsRouter.kt similarity index 68% rename from app/src/main/java/me/capcom/smsgateway/modules/orchestrator/EventsRouter.kt rename to app/src/main/java/pt/whatsms/gateway/modules/orchestrator/EventsRouter.kt index bc1c6f1..4559976 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/orchestrator/EventsRouter.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/orchestrator/EventsRouter.kt @@ -1,16 +1,16 @@ -package me.capcom.smsgateway.modules.orchestrator +package pt.whatsms.gateway.modules.orchestrator import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.launch -import me.capcom.smsgateway.modules.events.EventBus -import me.capcom.smsgateway.modules.events.ExternalEvent -import me.capcom.smsgateway.modules.events.ExternalEventType -import me.capcom.smsgateway.modules.gateway.events.MessageEnqueuedEvent -import me.capcom.smsgateway.modules.gateway.events.SettingsUpdatedEvent -import me.capcom.smsgateway.modules.gateway.events.WebhooksUpdatedEvent -import me.capcom.smsgateway.modules.receiver.events.MessagesExportRequestedEvent +import pt.whatsms.gateway.modules.events.EventBus +import pt.whatsms.gateway.modules.events.ExternalEvent +import pt.whatsms.gateway.modules.events.ExternalEventType +import pt.whatsms.gateway.modules.gateway.events.MessageEnqueuedEvent +import pt.whatsms.gateway.modules.gateway.events.SettingsUpdatedEvent +import pt.whatsms.gateway.modules.gateway.events.WebhooksUpdatedEvent +import pt.whatsms.gateway.modules.receiver.events.MessagesExportRequestedEvent class EventsRouter( private val eventBus: EventBus diff --git a/app/src/main/java/me/capcom/smsgateway/modules/orchestrator/Module.kt b/app/src/main/java/pt/whatsms/gateway/modules/orchestrator/Module.kt similarity index 80% rename from app/src/main/java/me/capcom/smsgateway/modules/orchestrator/Module.kt rename to app/src/main/java/pt/whatsms/gateway/modules/orchestrator/Module.kt index 9ef0158..a62895d 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/orchestrator/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/orchestrator/Module.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.orchestrator +package pt.whatsms.gateway.modules.orchestrator import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/modules/orchestrator/OrchestratorService.kt b/app/src/main/java/pt/whatsms/gateway/modules/orchestrator/OrchestratorService.kt similarity index 73% rename from app/src/main/java/me/capcom/smsgateway/modules/orchestrator/OrchestratorService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/orchestrator/OrchestratorService.kt index 091bb15..8ad30f5 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/orchestrator/OrchestratorService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/orchestrator/OrchestratorService.kt @@ -1,15 +1,15 @@ -package me.capcom.smsgateway.modules.orchestrator +package pt.whatsms.gateway.modules.orchestrator import android.content.Context -import me.capcom.smsgateway.helpers.SettingsHelper -import me.capcom.smsgateway.modules.gateway.GatewayService -import me.capcom.smsgateway.modules.localserver.LocalServerService -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.messages.MessagesService -import me.capcom.smsgateway.modules.ping.PingService -import me.capcom.smsgateway.modules.receiver.ReceiverService -import me.capcom.smsgateway.modules.webhooks.WebHooksService +import pt.whatsms.gateway.helpers.SettingsHelper +import pt.whatsms.gateway.modules.gateway.GatewayService +import pt.whatsms.gateway.modules.localserver.LocalServerService +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.messages.MessagesService +import pt.whatsms.gateway.modules.ping.PingService +import pt.whatsms.gateway.modules.receiver.ReceiverService +import pt.whatsms.gateway.modules.webhooks.WebHooksService class OrchestratorService( private val messagesSvc: MessagesService, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/ping/Module.kt b/app/src/main/java/pt/whatsms/gateway/modules/ping/Module.kt similarity index 74% rename from app/src/main/java/me/capcom/smsgateway/modules/ping/Module.kt rename to app/src/main/java/pt/whatsms/gateway/modules/ping/Module.kt index 9c7774e..2ba4206 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/ping/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/ping/Module.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.ping +package pt.whatsms.gateway.modules.ping import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/modules/ping/PingService.kt b/app/src/main/java/pt/whatsms/gateway/modules/ping/PingService.kt similarity index 72% rename from app/src/main/java/me/capcom/smsgateway/modules/ping/PingService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/ping/PingService.kt index 4d4fc82..cb0feb8 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/ping/PingService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/ping/PingService.kt @@ -1,7 +1,7 @@ -package me.capcom.smsgateway.modules.ping +package pt.whatsms.gateway.modules.ping import android.content.Context -import me.capcom.smsgateway.modules.ping.services.PingForegroundService +import pt.whatsms.gateway.modules.ping.services.PingForegroundService class PingService( private val settings: PingSettings, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/ping/PingSettings.kt b/app/src/main/java/pt/whatsms/gateway/modules/ping/PingSettings.kt similarity index 81% rename from app/src/main/java/me/capcom/smsgateway/modules/ping/PingSettings.kt rename to app/src/main/java/pt/whatsms/gateway/modules/ping/PingSettings.kt index 68754e1..066dad0 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/ping/PingSettings.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/ping/PingSettings.kt @@ -1,9 +1,9 @@ -package me.capcom.smsgateway.modules.ping +package pt.whatsms.gateway.modules.ping -import me.capcom.smsgateway.modules.settings.Exporter -import me.capcom.smsgateway.modules.settings.Importer -import me.capcom.smsgateway.modules.settings.KeyValueStorage -import me.capcom.smsgateway.modules.settings.get +import pt.whatsms.gateway.modules.settings.Exporter +import pt.whatsms.gateway.modules.settings.Importer +import pt.whatsms.gateway.modules.settings.KeyValueStorage +import pt.whatsms.gateway.modules.settings.get class PingSettings( private val storage: KeyValueStorage, diff --git a/app/src/main/java/pt/whatsms/gateway/modules/ping/events/PingEvent.kt b/app/src/main/java/pt/whatsms/gateway/modules/ping/events/PingEvent.kt new file mode 100644 index 0000000..ee59722 --- /dev/null +++ b/app/src/main/java/pt/whatsms/gateway/modules/ping/events/PingEvent.kt @@ -0,0 +1,12 @@ +package pt.whatsms.gateway.modules.ping.events + +import pt.whatsms.gateway.domain.HealthResponse +import pt.whatsms.gateway.modules.events.AppEvent + +class PingEvent( + val health: HealthResponse, +) : AppEvent(TYPE) { + companion object { + const val TYPE = "PingEvent" + } +} \ No newline at end of file diff --git a/app/src/main/java/me/capcom/smsgateway/modules/ping/services/PingForegroundService.kt b/app/src/main/java/pt/whatsms/gateway/modules/ping/services/PingForegroundService.kt similarity index 88% rename from app/src/main/java/me/capcom/smsgateway/modules/ping/services/PingForegroundService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/ping/services/PingForegroundService.kt index ab7ffdb..4bde025 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/ping/services/PingForegroundService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/ping/services/PingForegroundService.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.ping.services +package pt.whatsms.gateway.modules.ping.services import android.app.Service import android.content.Context @@ -13,13 +13,13 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel import kotlinx.coroutines.launch -import me.capcom.smsgateway.R -import me.capcom.smsgateway.domain.HealthResponse -import me.capcom.smsgateway.modules.events.EventBus -import me.capcom.smsgateway.modules.health.HealthService -import me.capcom.smsgateway.modules.notifications.NotificationsService -import me.capcom.smsgateway.modules.ping.PingSettings -import me.capcom.smsgateway.modules.ping.events.PingEvent +import pt.whatsms.gateway.R +import pt.whatsms.gateway.domain.HealthResponse +import pt.whatsms.gateway.modules.events.EventBus +import pt.whatsms.gateway.modules.health.HealthService +import pt.whatsms.gateway.modules.notifications.NotificationsService +import pt.whatsms.gateway.modules.ping.PingSettings +import pt.whatsms.gateway.modules.ping.events.PingEvent import org.koin.android.ext.android.get import org.koin.android.ext.android.inject import kotlin.concurrent.thread diff --git a/app/src/main/java/me/capcom/smsgateway/modules/receiver/EventsReceiver.kt b/app/src/main/java/pt/whatsms/gateway/modules/receiver/EventsReceiver.kt similarity index 77% rename from app/src/main/java/me/capcom/smsgateway/modules/receiver/EventsReceiver.kt rename to app/src/main/java/pt/whatsms/gateway/modules/receiver/EventsReceiver.kt index d6742d4..7dee016 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/receiver/EventsReceiver.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/receiver/EventsReceiver.kt @@ -1,11 +1,11 @@ -package me.capcom.smsgateway.modules.receiver +package pt.whatsms.gateway.modules.receiver import android.util.Log import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.launch -import me.capcom.smsgateway.modules.events.EventBus -import me.capcom.smsgateway.modules.events.EventsReceiver -import me.capcom.smsgateway.modules.receiver.events.MessagesExportRequestedEvent +import pt.whatsms.gateway.modules.events.EventBus +import pt.whatsms.gateway.modules.events.EventsReceiver +import pt.whatsms.gateway.modules.receiver.events.MessagesExportRequestedEvent import org.koin.core.component.get import org.koin.core.component.inject diff --git a/app/src/main/java/me/capcom/smsgateway/modules/receiver/MessagesReceiver.kt b/app/src/main/java/pt/whatsms/gateway/modules/receiver/MessagesReceiver.kt similarity index 94% rename from app/src/main/java/me/capcom/smsgateway/modules/receiver/MessagesReceiver.kt rename to app/src/main/java/pt/whatsms/gateway/modules/receiver/MessagesReceiver.kt index 7d6ca65..dd24bc1 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/receiver/MessagesReceiver.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/receiver/MessagesReceiver.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.receiver +package pt.whatsms.gateway.modules.receiver import android.content.BroadcastReceiver import android.content.Context @@ -6,8 +6,8 @@ import android.content.Intent import android.content.IntentFilter import android.provider.Telephony.Sms.Intents import android.util.Log -import me.capcom.smsgateway.helpers.SubscriptionsHelper -import me.capcom.smsgateway.modules.receiver.data.InboxMessage +import pt.whatsms.gateway.helpers.SubscriptionsHelper +import pt.whatsms.gateway.modules.receiver.data.InboxMessage import org.koin.core.component.KoinComponent import org.koin.core.component.inject import java.util.Date diff --git a/app/src/main/java/me/capcom/smsgateway/modules/receiver/MmsContentObserver.kt b/app/src/main/java/pt/whatsms/gateway/modules/receiver/MmsContentObserver.kt similarity index 94% rename from app/src/main/java/me/capcom/smsgateway/modules/receiver/MmsContentObserver.kt rename to app/src/main/java/pt/whatsms/gateway/modules/receiver/MmsContentObserver.kt index 489ac54..c7f3f7d 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/receiver/MmsContentObserver.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/receiver/MmsContentObserver.kt @@ -1,13 +1,13 @@ -package me.capcom.smsgateway.modules.receiver +package pt.whatsms.gateway.modules.receiver import android.content.Context import android.database.ContentObserver import android.net.Uri import android.os.Handler import android.os.HandlerThread -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.receiver.data.InboxMessage +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.receiver.data.InboxMessage import org.koin.core.component.KoinComponent import org.koin.core.component.inject diff --git a/app/src/main/java/me/capcom/smsgateway/modules/receiver/MmsContentReader.kt b/app/src/main/java/pt/whatsms/gateway/modules/receiver/MmsContentReader.kt similarity index 99% rename from app/src/main/java/me/capcom/smsgateway/modules/receiver/MmsContentReader.kt rename to app/src/main/java/pt/whatsms/gateway/modules/receiver/MmsContentReader.kt index 67e92f3..c4ba152 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/receiver/MmsContentReader.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/receiver/MmsContentReader.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.receiver +package pt.whatsms.gateway.modules.receiver import android.content.ContentResolver import android.content.Context diff --git a/app/src/main/java/me/capcom/smsgateway/modules/receiver/MmsReceiver.kt b/app/src/main/java/pt/whatsms/gateway/modules/receiver/MmsReceiver.kt similarity index 91% rename from app/src/main/java/me/capcom/smsgateway/modules/receiver/MmsReceiver.kt rename to app/src/main/java/pt/whatsms/gateway/modules/receiver/MmsReceiver.kt index 17a4f1b..e9e10cc 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/receiver/MmsReceiver.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/receiver/MmsReceiver.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.receiver +package pt.whatsms.gateway.modules.receiver import android.content.BroadcastReceiver import android.content.Context @@ -7,11 +7,11 @@ import android.content.IntentFilter import android.os.Bundle import android.provider.Telephony import android.util.Log -import me.capcom.smsgateway.helpers.SubscriptionsHelper -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.receiver.data.InboxMessage -import me.capcom.smsgateway.modules.receiver.parsers.MMSParser +import pt.whatsms.gateway.helpers.SubscriptionsHelper +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.receiver.data.InboxMessage +import pt.whatsms.gateway.modules.receiver.parsers.MMSParser import org.koin.core.component.KoinComponent import org.koin.core.component.inject import java.util.Date diff --git a/app/src/main/java/me/capcom/smsgateway/modules/receiver/Module.kt b/app/src/main/java/pt/whatsms/gateway/modules/receiver/Module.kt similarity index 78% rename from app/src/main/java/me/capcom/smsgateway/modules/receiver/Module.kt rename to app/src/main/java/pt/whatsms/gateway/modules/receiver/Module.kt index 9f9f643..3c872b8 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/receiver/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/receiver/Module.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.receiver +package pt.whatsms.gateway.modules.receiver import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/modules/receiver/ReceiverService.kt b/app/src/main/java/pt/whatsms/gateway/modules/receiver/ReceiverService.kt similarity index 91% rename from app/src/main/java/me/capcom/smsgateway/modules/receiver/ReceiverService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/receiver/ReceiverService.kt index 53c7e7b..0a1ad64 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/receiver/ReceiverService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/receiver/ReceiverService.kt @@ -1,19 +1,19 @@ -package me.capcom.smsgateway.modules.receiver +package pt.whatsms.gateway.modules.receiver import android.content.Context import android.os.Build import android.provider.Telephony import android.util.Base64 -import me.capcom.smsgateway.helpers.SubscriptionsHelper -import me.capcom.smsgateway.modules.incoming.IncomingMessagesService -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.receiver.data.InboxMessage -import me.capcom.smsgateway.modules.webhooks.WebHooksService -import me.capcom.smsgateway.modules.webhooks.domain.WebHookEvent -import me.capcom.smsgateway.modules.webhooks.payload.MmsDownloadedPayload -import me.capcom.smsgateway.modules.webhooks.payload.MmsReceivedPayload -import me.capcom.smsgateway.modules.webhooks.payload.SmsEventPayload +import pt.whatsms.gateway.helpers.SubscriptionsHelper +import pt.whatsms.gateway.modules.incoming.IncomingMessagesService +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.receiver.data.InboxMessage +import pt.whatsms.gateway.modules.webhooks.WebHooksService +import pt.whatsms.gateway.modules.webhooks.domain.WebHookEvent +import pt.whatsms.gateway.modules.webhooks.payload.MmsDownloadedPayload +import pt.whatsms.gateway.modules.webhooks.payload.MmsReceivedPayload +import pt.whatsms.gateway.modules.webhooks.payload.SmsEventPayload import org.koin.core.component.KoinComponent import org.koin.core.component.inject import java.util.Date diff --git a/app/src/main/java/me/capcom/smsgateway/modules/receiver/StateStorage.kt b/app/src/main/java/pt/whatsms/gateway/modules/receiver/StateStorage.kt similarity index 70% rename from app/src/main/java/me/capcom/smsgateway/modules/receiver/StateStorage.kt rename to app/src/main/java/pt/whatsms/gateway/modules/receiver/StateStorage.kt index 8403707..b8881b5 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/receiver/StateStorage.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/receiver/StateStorage.kt @@ -1,7 +1,7 @@ -package me.capcom.smsgateway.modules.receiver +package pt.whatsms.gateway.modules.receiver -import me.capcom.smsgateway.modules.settings.KeyValueStorage -import me.capcom.smsgateway.modules.settings.get +import pt.whatsms.gateway.modules.settings.KeyValueStorage +import pt.whatsms.gateway.modules.settings.get class StateStorage( private val storage: KeyValueStorage, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/receiver/data/InboxMessage.kt b/app/src/main/java/pt/whatsms/gateway/modules/receiver/data/InboxMessage.kt similarity index 98% rename from app/src/main/java/me/capcom/smsgateway/modules/receiver/data/InboxMessage.kt rename to app/src/main/java/pt/whatsms/gateway/modules/receiver/data/InboxMessage.kt index b38ae93..9b8993c 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/receiver/data/InboxMessage.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/receiver/data/InboxMessage.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.receiver.data +package pt.whatsms.gateway.modules.receiver.data import java.util.Arrays import java.util.Date diff --git a/app/src/main/java/me/capcom/smsgateway/modules/receiver/events/MessagesExportRequestedEvent.kt b/app/src/main/java/pt/whatsms/gateway/modules/receiver/events/MessagesExportRequestedEvent.kt similarity index 81% rename from app/src/main/java/me/capcom/smsgateway/modules/receiver/events/MessagesExportRequestedEvent.kt rename to app/src/main/java/pt/whatsms/gateway/modules/receiver/events/MessagesExportRequestedEvent.kt index 892baa1..037c673 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/receiver/events/MessagesExportRequestedEvent.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/receiver/events/MessagesExportRequestedEvent.kt @@ -1,9 +1,9 @@ -package me.capcom.smsgateway.modules.receiver.events +package pt.whatsms.gateway.modules.receiver.events import com.google.gson.GsonBuilder import com.google.gson.annotations.SerializedName -import me.capcom.smsgateway.extensions.configure -import me.capcom.smsgateway.modules.events.AppEvent +import pt.whatsms.gateway.extensions.configure +import pt.whatsms.gateway.modules.events.AppEvent import java.util.Date class MessagesExportRequestedEvent( diff --git a/app/src/main/java/me/capcom/smsgateway/modules/receiver/parsers/MMSParser.kt b/app/src/main/java/pt/whatsms/gateway/modules/receiver/parsers/MMSParser.kt similarity index 99% rename from app/src/main/java/me/capcom/smsgateway/modules/receiver/parsers/MMSParser.kt rename to app/src/main/java/pt/whatsms/gateway/modules/receiver/parsers/MMSParser.kt index fa6a6cc..a136509 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/receiver/parsers/MMSParser.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/receiver/parsers/MMSParser.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.receiver.parsers +package pt.whatsms.gateway.modules.receiver.parsers import java.nio.ByteBuffer import java.nio.ByteOrder diff --git a/app/src/main/java/me/capcom/smsgateway/modules/settings/Exporter.kt b/app/src/main/java/pt/whatsms/gateway/modules/settings/Exporter.kt similarity index 54% rename from app/src/main/java/me/capcom/smsgateway/modules/settings/Exporter.kt rename to app/src/main/java/pt/whatsms/gateway/modules/settings/Exporter.kt index 42218c1..696ef08 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/settings/Exporter.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/settings/Exporter.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.settings +package pt.whatsms.gateway.modules.settings interface Exporter { fun export(): Map diff --git a/app/src/main/java/me/capcom/smsgateway/modules/settings/Importer.kt b/app/src/main/java/pt/whatsms/gateway/modules/settings/Importer.kt similarity index 60% rename from app/src/main/java/me/capcom/smsgateway/modules/settings/Importer.kt rename to app/src/main/java/pt/whatsms/gateway/modules/settings/Importer.kt index bdebdab..bfe1552 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/settings/Importer.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/settings/Importer.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.settings +package pt.whatsms.gateway.modules.settings interface Importer { fun import(data: Map): Boolean diff --git a/app/src/main/java/me/capcom/smsgateway/modules/settings/KeyValueStorage.kt b/app/src/main/java/pt/whatsms/gateway/modules/settings/KeyValueStorage.kt similarity index 87% rename from app/src/main/java/me/capcom/smsgateway/modules/settings/KeyValueStorage.kt rename to app/src/main/java/pt/whatsms/gateway/modules/settings/KeyValueStorage.kt index 46b0f84..a1ba991 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/settings/KeyValueStorage.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/settings/KeyValueStorage.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.settings +package pt.whatsms.gateway.modules.settings import com.google.gson.reflect.TypeToken import java.lang.reflect.Type diff --git a/app/src/main/java/me/capcom/smsgateway/modules/settings/Module.kt b/app/src/main/java/pt/whatsms/gateway/modules/settings/Module.kt similarity index 65% rename from app/src/main/java/me/capcom/smsgateway/modules/settings/Module.kt rename to app/src/main/java/pt/whatsms/gateway/modules/settings/Module.kt index fbbd397..c52e324 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/settings/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/settings/Module.kt @@ -1,16 +1,16 @@ -package me.capcom.smsgateway.modules.settings +package pt.whatsms.gateway.modules.settings import androidx.preference.PreferenceManager -import me.capcom.smsgateway.helpers.SettingsHelper -import me.capcom.smsgateway.modules.encryption.EncryptionSettings -import me.capcom.smsgateway.modules.gateway.GatewaySettings -import me.capcom.smsgateway.modules.localserver.LocalServerSettings -import me.capcom.smsgateway.modules.logs.LogsSettings -import me.capcom.smsgateway.modules.messages.MessagesSettings -import me.capcom.smsgateway.modules.ping.PingSettings -import me.capcom.smsgateway.modules.receiver.StateStorage -import me.capcom.smsgateway.modules.webhooks.TemporaryStorage -import me.capcom.smsgateway.modules.webhooks.WebhooksSettings +import pt.whatsms.gateway.helpers.SettingsHelper +import pt.whatsms.gateway.modules.encryption.EncryptionSettings +import pt.whatsms.gateway.modules.gateway.GatewaySettings +import pt.whatsms.gateway.modules.localserver.LocalServerSettings +import pt.whatsms.gateway.modules.logs.LogsSettings +import pt.whatsms.gateway.modules.messages.MessagesSettings +import pt.whatsms.gateway.modules.ping.PingSettings +import pt.whatsms.gateway.modules.receiver.StateStorage +import pt.whatsms.gateway.modules.webhooks.TemporaryStorage +import pt.whatsms.gateway.modules.webhooks.WebhooksSettings import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/modules/settings/PreferencesStorage.kt b/app/src/main/java/pt/whatsms/gateway/modules/settings/PreferencesStorage.kt similarity index 97% rename from app/src/main/java/me/capcom/smsgateway/modules/settings/PreferencesStorage.kt rename to app/src/main/java/pt/whatsms/gateway/modules/settings/PreferencesStorage.kt index ddda3a9..3b71e76 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/settings/PreferencesStorage.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/settings/PreferencesStorage.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.settings +package pt.whatsms.gateway.modules.settings import android.content.SharedPreferences import androidx.core.content.edit diff --git a/app/src/main/java/me/capcom/smsgateway/modules/settings/SettingsService.kt b/app/src/main/java/pt/whatsms/gateway/modules/settings/SettingsService.kt similarity index 75% rename from app/src/main/java/me/capcom/smsgateway/modules/settings/SettingsService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/settings/SettingsService.kt index 34c9999..311ef8f 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/settings/SettingsService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/settings/SettingsService.kt @@ -1,14 +1,14 @@ -package me.capcom.smsgateway.modules.settings +package pt.whatsms.gateway.modules.settings import android.content.Context -import me.capcom.smsgateway.R -import me.capcom.smsgateway.modules.encryption.EncryptionSettings -import me.capcom.smsgateway.modules.gateway.GatewaySettings -import me.capcom.smsgateway.modules.logs.LogsSettings -import me.capcom.smsgateway.modules.messages.MessagesSettings -import me.capcom.smsgateway.modules.notifications.NotificationsService -import me.capcom.smsgateway.modules.ping.PingSettings -import me.capcom.smsgateway.modules.webhooks.WebhooksSettings +import pt.whatsms.gateway.R +import pt.whatsms.gateway.modules.encryption.EncryptionSettings +import pt.whatsms.gateway.modules.gateway.GatewaySettings +import pt.whatsms.gateway.modules.logs.LogsSettings +import pt.whatsms.gateway.modules.messages.MessagesSettings +import pt.whatsms.gateway.modules.notifications.NotificationsService +import pt.whatsms.gateway.modules.ping.PingSettings +import pt.whatsms.gateway.modules.webhooks.WebhooksSettings class SettingsService( private val context: Context, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/settings/ValueSerializer.kt b/app/src/main/java/pt/whatsms/gateway/modules/settings/ValueSerializer.kt similarity index 87% rename from app/src/main/java/me/capcom/smsgateway/modules/settings/ValueSerializer.kt rename to app/src/main/java/pt/whatsms/gateway/modules/settings/ValueSerializer.kt index 0b4af87..7839f5d 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/settings/ValueSerializer.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/settings/ValueSerializer.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.settings +package pt.whatsms.gateway.modules.settings import com.google.gson.GsonBuilder import java.lang.reflect.Type diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/EventsReceiver.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/EventsReceiver.kt similarity index 85% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/EventsReceiver.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/EventsReceiver.kt index 732c419..64c9722 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/EventsReceiver.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/EventsReceiver.kt @@ -1,16 +1,16 @@ -package me.capcom.smsgateway.modules.webhooks +package pt.whatsms.gateway.modules.webhooks import android.util.Log import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.launch -import me.capcom.smsgateway.domain.ProcessingState -import me.capcom.smsgateway.helpers.SubscriptionsHelper -import me.capcom.smsgateway.modules.events.EventBus -import me.capcom.smsgateway.modules.events.EventsReceiver -import me.capcom.smsgateway.modules.messages.events.MessageStateChangedEvent -import me.capcom.smsgateway.modules.ping.events.PingEvent -import me.capcom.smsgateway.modules.webhooks.domain.WebHookEvent -import me.capcom.smsgateway.modules.webhooks.payload.SmsEventPayload +import pt.whatsms.gateway.domain.ProcessingState +import pt.whatsms.gateway.helpers.SubscriptionsHelper +import pt.whatsms.gateway.modules.events.EventBus +import pt.whatsms.gateway.modules.events.EventsReceiver +import pt.whatsms.gateway.modules.messages.events.MessageStateChangedEvent +import pt.whatsms.gateway.modules.ping.events.PingEvent +import pt.whatsms.gateway.modules.webhooks.domain.WebHookEvent +import pt.whatsms.gateway.modules.webhooks.payload.SmsEventPayload import org.koin.core.component.get import java.util.Date diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/Module.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/Module.kt similarity index 66% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/Module.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/Module.kt index a9a01af..b9fead2 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/Module.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/Module.kt @@ -1,6 +1,6 @@ -package me.capcom.smsgateway.modules.webhooks +package pt.whatsms.gateway.modules.webhooks -import me.capcom.smsgateway.modules.webhooks.db.WebhookQueueRepository +import pt.whatsms.gateway.modules.webhooks.db.WebhookQueueRepository import org.koin.core.module.dsl.singleOf import org.koin.dsl.module diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/TemporaryStorage.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/TemporaryStorage.kt similarity index 71% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/TemporaryStorage.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/TemporaryStorage.kt index b4ef8a1..e71da57 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/TemporaryStorage.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/TemporaryStorage.kt @@ -1,7 +1,7 @@ -package me.capcom.smsgateway.modules.webhooks +package pt.whatsms.gateway.modules.webhooks -import me.capcom.smsgateway.modules.settings.KeyValueStorage -import me.capcom.smsgateway.modules.settings.get +import pt.whatsms.gateway.modules.settings.KeyValueStorage +import pt.whatsms.gateway.modules.settings.get class TemporaryStorage( private val storage: KeyValueStorage, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/WebHooksService.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/WebHooksService.kt similarity index 86% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/WebHooksService.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/WebHooksService.kt index d6763d9..685daa3 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/WebHooksService.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/WebHooksService.kt @@ -1,24 +1,24 @@ -package me.capcom.smsgateway.modules.webhooks +package pt.whatsms.gateway.modules.webhooks import android.content.Context import android.webkit.URLUtil import com.aventrix.jnanoid.jnanoid.NanoIdUtils -import me.capcom.smsgateway.R -import me.capcom.smsgateway.domain.EntitySource -import me.capcom.smsgateway.helpers.BuildHelper -import me.capcom.smsgateway.modules.gateway.GatewaySettings -import me.capcom.smsgateway.modules.localserver.LocalServerSettings -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.notifications.NotificationsService -import me.capcom.smsgateway.modules.webhooks.db.WebHook -import me.capcom.smsgateway.modules.webhooks.db.WebHooksDao -import me.capcom.smsgateway.modules.webhooks.domain.WebHookDTO -import me.capcom.smsgateway.modules.webhooks.domain.WebHookEvent -import me.capcom.smsgateway.modules.webhooks.domain.WebHookEventDTO -import me.capcom.smsgateway.modules.webhooks.workers.ReviewWebhooksWorker -import me.capcom.smsgateway.modules.webhooks.workers.SendWebhookWorker -import me.capcom.smsgateway.modules.webhooks.workers.WebhookQueueProcessorWorker +import pt.whatsms.gateway.R +import pt.whatsms.gateway.domain.EntitySource +import pt.whatsms.gateway.helpers.BuildHelper +import pt.whatsms.gateway.modules.gateway.GatewaySettings +import pt.whatsms.gateway.modules.localserver.LocalServerSettings +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.notifications.NotificationsService +import pt.whatsms.gateway.modules.webhooks.db.WebHook +import pt.whatsms.gateway.modules.webhooks.db.WebHooksDao +import pt.whatsms.gateway.modules.webhooks.domain.WebHookDTO +import pt.whatsms.gateway.modules.webhooks.domain.WebHookEvent +import pt.whatsms.gateway.modules.webhooks.domain.WebHookEventDTO +import pt.whatsms.gateway.modules.webhooks.workers.ReviewWebhooksWorker +import pt.whatsms.gateway.modules.webhooks.workers.SendWebhookWorker +import pt.whatsms.gateway.modules.webhooks.workers.WebhookQueueProcessorWorker import org.koin.core.component.KoinComponent import org.koin.core.component.get import java.net.URL diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/WebhookPayloadStorage.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/WebhookPayloadStorage.kt similarity index 96% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/WebhookPayloadStorage.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/WebhookPayloadStorage.kt index 96a09c2..aabfb86 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/WebhookPayloadStorage.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/WebhookPayloadStorage.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.webhooks +package pt.whatsms.gateway.modules.webhooks import android.content.Context import java.io.File diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/WebhooksSettings.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/WebhooksSettings.kt similarity index 88% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/WebhooksSettings.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/WebhooksSettings.kt index c680504..f962ca8 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/WebhooksSettings.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/WebhooksSettings.kt @@ -1,10 +1,10 @@ -package me.capcom.smsgateway.modules.webhooks +package pt.whatsms.gateway.modules.webhooks import com.aventrix.jnanoid.jnanoid.NanoIdUtils -import me.capcom.smsgateway.modules.settings.Exporter -import me.capcom.smsgateway.modules.settings.Importer -import me.capcom.smsgateway.modules.settings.KeyValueStorage -import me.capcom.smsgateway.modules.settings.get +import pt.whatsms.gateway.modules.settings.Exporter +import pt.whatsms.gateway.modules.settings.Importer +import pt.whatsms.gateway.modules.settings.KeyValueStorage +import pt.whatsms.gateway.modules.settings.get class WebhooksSettings( private val storage: KeyValueStorage, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebHook.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebHook.kt similarity index 56% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebHook.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebHook.kt index afa79f3..cdecd01 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebHook.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebHook.kt @@ -1,9 +1,9 @@ -package me.capcom.smsgateway.modules.webhooks.db +package pt.whatsms.gateway.modules.webhooks.db import androidx.room.Entity import androidx.room.PrimaryKey -import me.capcom.smsgateway.domain.EntitySource -import me.capcom.smsgateway.modules.webhooks.domain.WebHookEvent +import pt.whatsms.gateway.domain.EntitySource +import pt.whatsms.gateway.modules.webhooks.domain.WebHookEvent @Entity data class WebHook( diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebHooksDao.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebHooksDao.kt similarity index 88% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebHooksDao.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebHooksDao.kt index bb27370..f39a2f4 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebHooksDao.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebHooksDao.kt @@ -1,12 +1,12 @@ -package me.capcom.smsgateway.modules.webhooks.db +package pt.whatsms.gateway.modules.webhooks.db import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Transaction -import me.capcom.smsgateway.domain.EntitySource -import me.capcom.smsgateway.modules.webhooks.domain.WebHookEvent +import pt.whatsms.gateway.domain.EntitySource +import pt.whatsms.gateway.modules.webhooks.domain.WebHookEvent @Dao diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebhookConverters.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebhookConverters.kt similarity index 88% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebhookConverters.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebhookConverters.kt index fd96675..561ba99 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebhookConverters.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebhookConverters.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.webhooks.db +package pt.whatsms.gateway.modules.webhooks.db import androidx.room.TypeConverter diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebhookQueueDao.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebhookQueueDao.kt similarity index 98% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebhookQueueDao.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebhookQueueDao.kt index e71ba6e..148f343 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebhookQueueDao.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebhookQueueDao.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.webhooks.db +package pt.whatsms.gateway.modules.webhooks.db import androidx.room.* diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebhookQueueEntity.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebhookQueueEntity.kt similarity index 95% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebhookQueueEntity.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebhookQueueEntity.kt index 14849e8..faa64aa 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebhookQueueEntity.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebhookQueueEntity.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.webhooks.db +package pt.whatsms.gateway.modules.webhooks.db import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebhookQueueRepository.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebhookQueueRepository.kt similarity index 97% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebhookQueueRepository.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebhookQueueRepository.kt index d0c3b01..c6af08c 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebhookQueueRepository.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebhookQueueRepository.kt @@ -1,7 +1,7 @@ -package me.capcom.smsgateway.modules.webhooks.db +package pt.whatsms.gateway.modules.webhooks.db import com.aventrix.jnanoid.jnanoid.NanoIdUtils -import me.capcom.smsgateway.modules.webhooks.WebhookPayloadStorage +import pt.whatsms.gateway.modules.webhooks.WebhookPayloadStorage import org.koin.core.component.KoinComponent import org.koin.core.component.inject diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebhookStatus.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebhookStatus.kt similarity index 95% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebhookStatus.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebhookStatus.kt index f992bff..87b0d10 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/db/WebhookStatus.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/db/WebhookStatus.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.webhooks.db +package pt.whatsms.gateway.modules.webhooks.db import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/domain/WebHookDTO.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/domain/WebHookDTO.kt similarity index 60% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/domain/WebHookDTO.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/domain/WebHookDTO.kt index f90a039..5e64bf4 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/domain/WebHookDTO.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/domain/WebHookDTO.kt @@ -1,6 +1,6 @@ -package me.capcom.smsgateway.modules.webhooks.domain +package pt.whatsms.gateway.modules.webhooks.domain -import me.capcom.smsgateway.domain.EntitySource +import pt.whatsms.gateway.domain.EntitySource data class WebHookDTO( val id: String?, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/domain/WebHookEvent.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/domain/WebHookEvent.kt similarity index 92% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/domain/WebHookEvent.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/domain/WebHookEvent.kt index 2eea29a..f18bf5e 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/domain/WebHookEvent.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/domain/WebHookEvent.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.webhooks.domain +package pt.whatsms.gateway.modules.webhooks.domain import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/domain/WebHookEventDTO.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/domain/WebHookEventDTO.kt similarity index 74% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/domain/WebHookEventDTO.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/domain/WebHookEventDTO.kt index 4c54883..868ee58 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/domain/WebHookEventDTO.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/domain/WebHookEventDTO.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.webhooks.domain +package pt.whatsms.gateway.modules.webhooks.domain data class WebHookEventDTO( val id: String, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/payload/MessageEventPayload.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/payload/MessageEventPayload.kt similarity index 82% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/payload/MessageEventPayload.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/payload/MessageEventPayload.kt index e4b8f76..240ce18 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/payload/MessageEventPayload.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/payload/MessageEventPayload.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.webhooks.payload +package pt.whatsms.gateway.modules.webhooks.payload abstract class MessageEventPayload( val messageId: String, diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/payload/MmsDownloadedPayload.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/payload/MmsDownloadedPayload.kt similarity index 90% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/payload/MmsDownloadedPayload.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/payload/MmsDownloadedPayload.kt index 18369aa..3a05aab 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/payload/MmsDownloadedPayload.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/payload/MmsDownloadedPayload.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.webhooks.payload +package pt.whatsms.gateway.modules.webhooks.payload import java.util.Date diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/payload/MmsReceivedPayload.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/payload/MmsReceivedPayload.kt similarity index 86% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/payload/MmsReceivedPayload.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/payload/MmsReceivedPayload.kt index 5e14586..34678db 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/payload/MmsReceivedPayload.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/payload/MmsReceivedPayload.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.webhooks.payload +package pt.whatsms.gateway.modules.webhooks.payload import java.util.Date diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/payload/SmsEventPayload.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/payload/SmsEventPayload.kt similarity index 96% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/payload/SmsEventPayload.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/payload/SmsEventPayload.kt index c25d407..ce3b863 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/payload/SmsEventPayload.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/payload/SmsEventPayload.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.webhooks.payload +package pt.whatsms.gateway.modules.webhooks.payload import java.util.Date diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/plugins/PayloadSingingPlugin.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/plugins/PayloadSingingPlugin.kt similarity index 97% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/plugins/PayloadSingingPlugin.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/plugins/PayloadSingingPlugin.kt index 2a0ed6c..928392e 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/plugins/PayloadSingingPlugin.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/plugins/PayloadSingingPlugin.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.webhooks.plugins +package pt.whatsms.gateway.modules.webhooks.plugins import io.ktor.client.plugins.api.createClientPlugin import io.ktor.client.request.header diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/workers/ReviewWebhooksWorker.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/workers/ReviewWebhooksWorker.kt similarity index 87% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/workers/ReviewWebhooksWorker.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/workers/ReviewWebhooksWorker.kt index f517452..58d98e9 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/workers/ReviewWebhooksWorker.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/workers/ReviewWebhooksWorker.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.webhooks.workers +package pt.whatsms.gateway.modules.webhooks.workers import android.content.Context import androidx.work.CoroutineWorker @@ -6,10 +6,10 @@ import androidx.work.ExistingPeriodicWorkPolicy import androidx.work.PeriodicWorkRequestBuilder import androidx.work.WorkManager import androidx.work.WorkerParameters -import me.capcom.smsgateway.R -import me.capcom.smsgateway.modules.notifications.NotificationsService -import me.capcom.smsgateway.modules.webhooks.WebHooksService -import me.capcom.smsgateway.modules.webhooks.domain.WebHookEvent +import pt.whatsms.gateway.R +import pt.whatsms.gateway.modules.notifications.NotificationsService +import pt.whatsms.gateway.modules.webhooks.WebHooksService +import pt.whatsms.gateway.modules.webhooks.domain.WebHookEvent import org.koin.core.component.KoinComponent import org.koin.core.component.inject import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/workers/SendWebhookWorker.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/workers/SendWebhookWorker.kt similarity index 93% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/workers/SendWebhookWorker.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/workers/SendWebhookWorker.kt index d307a88..cccd95c 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/workers/SendWebhookWorker.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/workers/SendWebhookWorker.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.webhooks.workers +package pt.whatsms.gateway.modules.webhooks.workers import android.content.Context import androidx.work.BackoffPolicy @@ -27,18 +27,18 @@ import io.ktor.http.contentType import io.ktor.http.userAgent import io.ktor.serialization.gson.gson import kotlinx.coroutines.runBlocking -import me.capcom.smsgateway.BuildConfig -import me.capcom.smsgateway.R -import me.capcom.smsgateway.extensions.configure -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.notifications.NotificationsService -import me.capcom.smsgateway.modules.webhooks.NAME -import me.capcom.smsgateway.modules.webhooks.TemporaryStorage -import me.capcom.smsgateway.modules.webhooks.WebhooksSettings -import me.capcom.smsgateway.modules.webhooks.db.WebhookQueueRepository -import me.capcom.smsgateway.modules.webhooks.domain.WebHookEventDTO -import me.capcom.smsgateway.modules.webhooks.plugins.PayloadSingingPlugin +import pt.whatsms.gateway.BuildConfig +import pt.whatsms.gateway.R +import pt.whatsms.gateway.extensions.configure +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.notifications.NotificationsService +import pt.whatsms.gateway.modules.webhooks.NAME +import pt.whatsms.gateway.modules.webhooks.TemporaryStorage +import pt.whatsms.gateway.modules.webhooks.WebhooksSettings +import pt.whatsms.gateway.modules.webhooks.db.WebhookQueueRepository +import pt.whatsms.gateway.modules.webhooks.domain.WebHookEventDTO +import pt.whatsms.gateway.modules.webhooks.plugins.PayloadSingingPlugin import org.json.JSONException import org.koin.core.component.KoinComponent import org.koin.core.component.get diff --git a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/workers/WebhookQueueProcessorWorker.kt b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/workers/WebhookQueueProcessorWorker.kt similarity index 95% rename from app/src/main/java/me/capcom/smsgateway/modules/webhooks/workers/WebhookQueueProcessorWorker.kt rename to app/src/main/java/pt/whatsms/gateway/modules/webhooks/workers/WebhookQueueProcessorWorker.kt index 62ad089..86f809b 100644 --- a/app/src/main/java/me/capcom/smsgateway/modules/webhooks/workers/WebhookQueueProcessorWorker.kt +++ b/app/src/main/java/pt/whatsms/gateway/modules/webhooks/workers/WebhookQueueProcessorWorker.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.webhooks.workers +package pt.whatsms.gateway.modules.webhooks.workers import android.content.Context import androidx.work.BackoffPolicy @@ -28,18 +28,18 @@ import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.delay import kotlinx.coroutines.isActive import kotlinx.coroutines.withContext -import me.capcom.smsgateway.BuildConfig -import me.capcom.smsgateway.R -import me.capcom.smsgateway.extensions.configure -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.notifications.NotificationsService -import me.capcom.smsgateway.modules.webhooks.NAME -import me.capcom.smsgateway.modules.webhooks.WebhookPayloadStorage -import me.capcom.smsgateway.modules.webhooks.WebhooksSettings -import me.capcom.smsgateway.modules.webhooks.db.WebhookQueueEntity -import me.capcom.smsgateway.modules.webhooks.db.WebhookQueueRepository -import me.capcom.smsgateway.modules.webhooks.plugins.PayloadSingingPlugin +import pt.whatsms.gateway.BuildConfig +import pt.whatsms.gateway.R +import pt.whatsms.gateway.extensions.configure +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.notifications.NotificationsService +import pt.whatsms.gateway.modules.webhooks.NAME +import pt.whatsms.gateway.modules.webhooks.WebhookPayloadStorage +import pt.whatsms.gateway.modules.webhooks.WebhooksSettings +import pt.whatsms.gateway.modules.webhooks.db.WebhookQueueEntity +import pt.whatsms.gateway.modules.webhooks.db.WebhookQueueRepository +import pt.whatsms.gateway.modules.webhooks.plugins.PayloadSingingPlugin import org.json.JSONException import org.koin.core.component.KoinComponent import org.koin.core.component.inject diff --git a/app/src/main/java/me/capcom/smsgateway/providers/IPProvider.kt b/app/src/main/java/pt/whatsms/gateway/providers/IPProvider.kt similarity index 59% rename from app/src/main/java/me/capcom/smsgateway/providers/IPProvider.kt rename to app/src/main/java/pt/whatsms/gateway/providers/IPProvider.kt index 2959f82..20aadab 100644 --- a/app/src/main/java/me/capcom/smsgateway/providers/IPProvider.kt +++ b/app/src/main/java/pt/whatsms/gateway/providers/IPProvider.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.providers +package pt.whatsms.gateway.providers interface IPProvider { suspend fun getIP(): String? diff --git a/app/src/main/java/me/capcom/smsgateway/providers/LocalIPProvider.kt b/app/src/main/java/pt/whatsms/gateway/providers/LocalIPProvider.kt similarity index 98% rename from app/src/main/java/me/capcom/smsgateway/providers/LocalIPProvider.kt rename to app/src/main/java/pt/whatsms/gateway/providers/LocalIPProvider.kt index 55624ea..9c4caed 100644 --- a/app/src/main/java/me/capcom/smsgateway/providers/LocalIPProvider.kt +++ b/app/src/main/java/pt/whatsms/gateway/providers/LocalIPProvider.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.providers +package pt.whatsms.gateway.providers import android.content.Context import android.net.wifi.WifiManager diff --git a/app/src/main/java/me/capcom/smsgateway/providers/PublicIPProvider.kt b/app/src/main/java/pt/whatsms/gateway/providers/PublicIPProvider.kt similarity index 78% rename from app/src/main/java/me/capcom/smsgateway/providers/PublicIPProvider.kt rename to app/src/main/java/pt/whatsms/gateway/providers/PublicIPProvider.kt index e5fdc31..210aa4f 100644 --- a/app/src/main/java/me/capcom/smsgateway/providers/PublicIPProvider.kt +++ b/app/src/main/java/pt/whatsms/gateway/providers/PublicIPProvider.kt @@ -1,6 +1,6 @@ -package me.capcom.smsgateway.providers +package pt.whatsms.gateway.providers -import me.capcom.smsgateway.modules.gateway.GatewayService +import pt.whatsms.gateway.modules.gateway.GatewayService import org.koin.java.KoinJavaComponent.inject class PublicIPProvider: IPProvider { diff --git a/app/src/main/java/me/capcom/smsgateway/receivers/BootReceiver.kt b/app/src/main/java/pt/whatsms/gateway/receivers/BootReceiver.kt similarity index 87% rename from app/src/main/java/me/capcom/smsgateway/receivers/BootReceiver.kt rename to app/src/main/java/pt/whatsms/gateway/receivers/BootReceiver.kt index ec44bc2..3b8d4bc 100644 --- a/app/src/main/java/me/capcom/smsgateway/receivers/BootReceiver.kt +++ b/app/src/main/java/pt/whatsms/gateway/receivers/BootReceiver.kt @@ -1,9 +1,9 @@ -package me.capcom.smsgateway.receivers +package pt.whatsms.gateway.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import me.capcom.smsgateway.modules.orchestrator.OrchestratorService +import pt.whatsms.gateway.modules.orchestrator.OrchestratorService import org.koin.core.component.KoinComponent import org.koin.core.component.get diff --git a/app/src/main/java/me/capcom/smsgateway/receivers/EventsReceiver.kt b/app/src/main/java/pt/whatsms/gateway/receivers/EventsReceiver.kt similarity index 76% rename from app/src/main/java/me/capcom/smsgateway/receivers/EventsReceiver.kt rename to app/src/main/java/pt/whatsms/gateway/receivers/EventsReceiver.kt index 36420eb..d6f2d8c 100644 --- a/app/src/main/java/me/capcom/smsgateway/receivers/EventsReceiver.kt +++ b/app/src/main/java/pt/whatsms/gateway/receivers/EventsReceiver.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.receivers +package pt.whatsms.gateway.receivers import android.content.BroadcastReceiver import android.content.Context @@ -7,11 +7,11 @@ import android.content.IntentFilter import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.launch -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.LogsUtils.toLogContext -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.messages.MODULE_NAME -import me.capcom.smsgateway.modules.messages.MessagesService +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.LogsUtils.toLogContext +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.messages.MODULE_NAME +import pt.whatsms.gateway.modules.messages.MessagesService import org.koin.core.component.KoinComponent import org.koin.core.component.inject @@ -43,8 +43,8 @@ class EventsReceiver : BroadcastReceiver(), KoinComponent { private var INSTANCE: EventsReceiver? = null - const val ACTION_SENT = "me.capcom.smsgateway.ACTION_SENT" - const val ACTION_DELIVERED = "me.capcom.smsgateway.ACTION_DELIVERED" + const val ACTION_SENT = "pt.whatsms.gateway.ACTION_SENT" + const val ACTION_DELIVERED = "pt.whatsms.gateway.ACTION_DELIVERED" private fun getInstance(): EventsReceiver { return INSTANCE ?: EventsReceiver().also { INSTANCE = it } diff --git a/app/src/main/java/me/capcom/smsgateway/services/PushService.kt b/app/src/main/java/pt/whatsms/gateway/services/PushService.kt similarity index 88% rename from app/src/main/java/me/capcom/smsgateway/services/PushService.kt rename to app/src/main/java/pt/whatsms/gateway/services/PushService.kt index bc670de..e5b887c 100644 --- a/app/src/main/java/me/capcom/smsgateway/services/PushService.kt +++ b/app/src/main/java/pt/whatsms/gateway/services/PushService.kt @@ -1,17 +1,17 @@ -package me.capcom.smsgateway.services +package pt.whatsms.gateway.services import android.content.Context import android.util.Log import com.google.firebase.messaging.FirebaseMessaging import com.google.firebase.messaging.FirebaseMessagingService import com.google.firebase.messaging.RemoteMessage -import me.capcom.smsgateway.modules.events.ExternalEvent -import me.capcom.smsgateway.modules.events.ExternalEventType -import me.capcom.smsgateway.modules.gateway.GatewaySettings -import me.capcom.smsgateway.modules.gateway.workers.RegistrationWorker -import me.capcom.smsgateway.modules.logs.LogsService -import me.capcom.smsgateway.modules.logs.db.LogEntry -import me.capcom.smsgateway.modules.orchestrator.EventsRouter +import pt.whatsms.gateway.modules.events.ExternalEvent +import pt.whatsms.gateway.modules.events.ExternalEventType +import pt.whatsms.gateway.modules.gateway.GatewaySettings +import pt.whatsms.gateway.modules.gateway.workers.RegistrationWorker +import pt.whatsms.gateway.modules.logs.LogsService +import pt.whatsms.gateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.modules.orchestrator.EventsRouter import org.koin.core.component.KoinComponent import org.koin.core.component.get import org.koin.core.component.inject diff --git a/app/src/main/java/me/capcom/smsgateway/ui/HolderFragment.kt b/app/src/main/java/pt/whatsms/gateway/ui/HolderFragment.kt similarity index 96% rename from app/src/main/java/me/capcom/smsgateway/ui/HolderFragment.kt rename to app/src/main/java/pt/whatsms/gateway/ui/HolderFragment.kt index 67d758a..4d95160 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/HolderFragment.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/HolderFragment.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.ui +package pt.whatsms.gateway.ui import android.content.Context import android.os.Bundle @@ -7,8 +7,8 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.commit -import me.capcom.smsgateway.R -import me.capcom.smsgateway.databinding.FragmentHolderBinding +import pt.whatsms.gateway.R +import pt.whatsms.gateway.databinding.FragmentHolderBinding class HolderFragment : Fragment() { private var _binding: FragmentHolderBinding? = null diff --git a/app/src/main/java/me/capcom/smsgateway/ui/HomeFragment.kt b/app/src/main/java/pt/whatsms/gateway/ui/HomeFragment.kt similarity index 95% rename from app/src/main/java/me/capcom/smsgateway/ui/HomeFragment.kt rename to app/src/main/java/pt/whatsms/gateway/ui/HomeFragment.kt index 315cbe8..c6dd777 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/HomeFragment.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/HomeFragment.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.ui +package pt.whatsms.gateway.ui import android.Manifest import android.content.ClipData @@ -27,19 +27,19 @@ import androidx.fragment.app.setFragmentResultListener import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.lifecycleScope import kotlinx.coroutines.launch -import me.capcom.smsgateway.R -import me.capcom.smsgateway.databinding.FragmentHomeBinding -import me.capcom.smsgateway.helpers.SettingsHelper -import me.capcom.smsgateway.modules.connection.ConnectionService -import me.capcom.smsgateway.modules.events.EventBus -import me.capcom.smsgateway.modules.gateway.GatewayService -import me.capcom.smsgateway.modules.gateway.GatewaySettings -import me.capcom.smsgateway.modules.gateway.events.DeviceRegisteredEvent -import me.capcom.smsgateway.modules.localserver.LocalServerService -import me.capcom.smsgateway.modules.localserver.LocalServerSettings -import me.capcom.smsgateway.modules.localserver.events.IPReceivedEvent -import me.capcom.smsgateway.modules.orchestrator.OrchestratorService -import me.capcom.smsgateway.ui.dialogs.FirstStartDialogFragment +import pt.whatsms.gateway.R +import pt.whatsms.gateway.databinding.FragmentHomeBinding +import pt.whatsms.gateway.helpers.SettingsHelper +import pt.whatsms.gateway.modules.connection.ConnectionService +import pt.whatsms.gateway.modules.events.EventBus +import pt.whatsms.gateway.modules.gateway.GatewayService +import pt.whatsms.gateway.modules.gateway.GatewaySettings +import pt.whatsms.gateway.modules.gateway.events.DeviceRegisteredEvent +import pt.whatsms.gateway.modules.localserver.LocalServerService +import pt.whatsms.gateway.modules.localserver.LocalServerSettings +import pt.whatsms.gateway.modules.localserver.events.IPReceivedEvent +import pt.whatsms.gateway.modules.orchestrator.OrchestratorService +import pt.whatsms.gateway.ui.dialogs.FirstStartDialogFragment import org.koin.android.ext.android.inject class HomeFragment : Fragment() { diff --git a/app/src/main/java/me/capcom/smsgateway/ui/IncomingMessagesListFragment.kt b/app/src/main/java/pt/whatsms/gateway/ui/IncomingMessagesListFragment.kt similarity index 91% rename from app/src/main/java/me/capcom/smsgateway/ui/IncomingMessagesListFragment.kt rename to app/src/main/java/pt/whatsms/gateway/ui/IncomingMessagesListFragment.kt index 113fb02..506a1b6 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/IncomingMessagesListFragment.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/IncomingMessagesListFragment.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.ui +package pt.whatsms.gateway.ui import android.os.Bundle import android.view.LayoutInflater @@ -8,10 +8,10 @@ import androidx.fragment.app.Fragment import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import me.capcom.smsgateway.R -import me.capcom.smsgateway.databinding.FragmentIncomingMessagesListBinding -import me.capcom.smsgateway.modules.incoming.vm.IncomingMessagesListViewModel -import me.capcom.smsgateway.ui.adapters.IncomingMessagesAdapter +import pt.whatsms.gateway.R +import pt.whatsms.gateway.databinding.FragmentIncomingMessagesListBinding +import pt.whatsms.gateway.modules.incoming.vm.IncomingMessagesListViewModel +import pt.whatsms.gateway.ui.adapters.IncomingMessagesAdapter import org.koin.androidx.viewmodel.ext.android.viewModel class IncomingMessagesListFragment : Fragment() { diff --git a/app/src/main/java/me/capcom/smsgateway/ui/LogsListFragment.kt b/app/src/main/java/pt/whatsms/gateway/ui/LogsListFragment.kt similarity index 89% rename from app/src/main/java/me/capcom/smsgateway/ui/LogsListFragment.kt rename to app/src/main/java/pt/whatsms/gateway/ui/LogsListFragment.kt index 0e4ecb0..13667e4 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/LogsListFragment.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/LogsListFragment.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.ui +package pt.whatsms.gateway.ui import android.os.Bundle import android.view.LayoutInflater @@ -6,9 +6,9 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.recyclerview.widget.DividerItemDecoration -import me.capcom.smsgateway.databinding.FragmentLogsBinding -import me.capcom.smsgateway.modules.logs.vm.LogsViewModel -import me.capcom.smsgateway.ui.adapters.LogItemsAdapter +import pt.whatsms.gateway.databinding.FragmentLogsBinding +import pt.whatsms.gateway.modules.logs.vm.LogsViewModel +import pt.whatsms.gateway.ui.adapters.LogItemsAdapter import org.koin.androidx.viewmodel.ext.android.viewModel /** diff --git a/app/src/main/java/me/capcom/smsgateway/ui/MessageDetailsFragment.kt b/app/src/main/java/pt/whatsms/gateway/ui/MessageDetailsFragment.kt similarity index 89% rename from app/src/main/java/me/capcom/smsgateway/ui/MessageDetailsFragment.kt rename to app/src/main/java/pt/whatsms/gateway/ui/MessageDetailsFragment.kt index 06948d9..8f40f32 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/MessageDetailsFragment.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/MessageDetailsFragment.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.ui +package pt.whatsms.gateway.ui import android.os.Bundle import android.view.LayoutInflater @@ -6,9 +6,9 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.recyclerview.widget.DividerItemDecoration -import me.capcom.smsgateway.databinding.FragmentMessageDetailsBinding -import me.capcom.smsgateway.modules.messages.vm.MessageDetailsViewModel -import me.capcom.smsgateway.ui.adapters.MessageRecipientsAdapter +import pt.whatsms.gateway.databinding.FragmentMessageDetailsBinding +import pt.whatsms.gateway.modules.messages.vm.MessageDetailsViewModel +import pt.whatsms.gateway.ui.adapters.MessageRecipientsAdapter import org.koin.androidx.viewmodel.ext.android.viewModel class MessageDetailsFragment : Fragment() { diff --git a/app/src/main/java/me/capcom/smsgateway/ui/MessagesListFragment.kt b/app/src/main/java/pt/whatsms/gateway/ui/MessagesListFragment.kt similarity index 91% rename from app/src/main/java/me/capcom/smsgateway/ui/MessagesListFragment.kt rename to app/src/main/java/pt/whatsms/gateway/ui/MessagesListFragment.kt index fae7cc8..db02b7f 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/MessagesListFragment.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/MessagesListFragment.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.ui +package pt.whatsms.gateway.ui import android.os.Bundle import android.view.LayoutInflater @@ -9,11 +9,11 @@ import androidx.fragment.app.commit import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import me.capcom.smsgateway.R -import me.capcom.smsgateway.data.entities.Message -import me.capcom.smsgateway.databinding.FragmentMessagesListBinding -import me.capcom.smsgateway.modules.messages.vm.MessagesListViewModel -import me.capcom.smsgateway.ui.adapters.MessagesAdapter +import pt.whatsms.gateway.R +import pt.whatsms.gateway.data.entities.Message +import pt.whatsms.gateway.databinding.FragmentMessagesListBinding +import pt.whatsms.gateway.modules.messages.vm.MessagesListViewModel +import pt.whatsms.gateway.ui.adapters.MessagesAdapter import org.koin.androidx.viewmodel.ext.android.viewModel diff --git a/app/src/main/java/me/capcom/smsgateway/ui/ScanPairingActivity.kt b/app/src/main/java/pt/whatsms/gateway/ui/ScanPairingActivity.kt similarity index 96% rename from app/src/main/java/me/capcom/smsgateway/ui/ScanPairingActivity.kt rename to app/src/main/java/pt/whatsms/gateway/ui/ScanPairingActivity.kt index 4e5083f..a1fb72d 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/ScanPairingActivity.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/ScanPairingActivity.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.ui +package pt.whatsms.gateway.ui import android.app.Activity import android.content.Intent @@ -12,8 +12,8 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import me.capcom.smsgateway.R -import me.capcom.smsgateway.modules.gateway.GatewaySettings +import pt.whatsms.gateway.R +import pt.whatsms.gateway.modules.gateway.GatewaySettings import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient import okhttp3.Request diff --git a/app/src/main/java/me/capcom/smsgateway/ui/SettingsFragment.kt b/app/src/main/java/pt/whatsms/gateway/ui/SettingsFragment.kt similarity index 97% rename from app/src/main/java/me/capcom/smsgateway/ui/SettingsFragment.kt rename to app/src/main/java/pt/whatsms/gateway/ui/SettingsFragment.kt index 518237e..f96a69d 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/SettingsFragment.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/SettingsFragment.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.ui +package pt.whatsms.gateway.ui import android.content.Context import android.content.Intent @@ -13,8 +13,8 @@ import androidx.annotation.RequiresApi import androidx.preference.EditTextPreference import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import me.capcom.smsgateway.BuildConfig -import me.capcom.smsgateway.R +import pt.whatsms.gateway.BuildConfig +import pt.whatsms.gateway.R class SettingsFragment : PreferenceFragmentCompat() { diff --git a/app/src/main/java/me/capcom/smsgateway/ui/adapters/IncomingMessagesAdapter.kt b/app/src/main/java/pt/whatsms/gateway/ui/adapters/IncomingMessagesAdapter.kt similarity index 88% rename from app/src/main/java/me/capcom/smsgateway/ui/adapters/IncomingMessagesAdapter.kt rename to app/src/main/java/pt/whatsms/gateway/ui/adapters/IncomingMessagesAdapter.kt index 5ef8649..b41aa3b 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/adapters/IncomingMessagesAdapter.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/adapters/IncomingMessagesAdapter.kt @@ -1,14 +1,14 @@ -package me.capcom.smsgateway.ui.adapters +package pt.whatsms.gateway.ui.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import me.capcom.smsgateway.R -import me.capcom.smsgateway.databinding.ItemIncomingMessageBinding -import me.capcom.smsgateway.modules.incoming.db.IncomingMessage -import me.capcom.smsgateway.modules.incoming.db.IncomingMessageType +import pt.whatsms.gateway.R +import pt.whatsms.gateway.databinding.ItemIncomingMessageBinding +import pt.whatsms.gateway.modules.incoming.db.IncomingMessage +import pt.whatsms.gateway.modules.incoming.db.IncomingMessageType import java.text.DateFormat import java.util.Date diff --git a/app/src/main/java/me/capcom/smsgateway/ui/adapters/LogItemsAdapter.kt b/app/src/main/java/pt/whatsms/gateway/ui/adapters/LogItemsAdapter.kt similarity index 91% rename from app/src/main/java/me/capcom/smsgateway/ui/adapters/LogItemsAdapter.kt rename to app/src/main/java/pt/whatsms/gateway/ui/adapters/LogItemsAdapter.kt index 00e67ef..a1207e0 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/adapters/LogItemsAdapter.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/adapters/LogItemsAdapter.kt @@ -1,13 +1,13 @@ -package me.capcom.smsgateway.ui.adapters +package pt.whatsms.gateway.ui.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import me.capcom.smsgateway.R -import me.capcom.smsgateway.databinding.ItemLogEntryBinding -import me.capcom.smsgateway.modules.logs.db.LogEntry +import pt.whatsms.gateway.R +import pt.whatsms.gateway.databinding.ItemLogEntryBinding +import pt.whatsms.gateway.modules.logs.db.LogEntry import java.text.DateFormat import java.util.Date diff --git a/app/src/main/java/me/capcom/smsgateway/ui/adapters/MessageRecipientsAdapter.kt b/app/src/main/java/pt/whatsms/gateway/ui/adapters/MessageRecipientsAdapter.kt similarity index 90% rename from app/src/main/java/me/capcom/smsgateway/ui/adapters/MessageRecipientsAdapter.kt rename to app/src/main/java/pt/whatsms/gateway/ui/adapters/MessageRecipientsAdapter.kt index 4e6247c..95c1b46 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/adapters/MessageRecipientsAdapter.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/adapters/MessageRecipientsAdapter.kt @@ -1,12 +1,12 @@ -package me.capcom.smsgateway.ui.adapters +package pt.whatsms.gateway.ui.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import me.capcom.smsgateway.data.entities.MessageRecipient -import me.capcom.smsgateway.databinding.ItemMessageBinding -import me.capcom.smsgateway.ui.styles.color +import pt.whatsms.gateway.data.entities.MessageRecipient +import pt.whatsms.gateway.databinding.ItemMessageBinding +import pt.whatsms.gateway.ui.styles.color class MessageRecipientsAdapter : ListAdapter( diff --git a/app/src/main/java/me/capcom/smsgateway/ui/adapters/MessagesAdapter.kt b/app/src/main/java/pt/whatsms/gateway/ui/adapters/MessagesAdapter.kt similarity index 91% rename from app/src/main/java/me/capcom/smsgateway/ui/adapters/MessagesAdapter.kt rename to app/src/main/java/pt/whatsms/gateway/ui/adapters/MessagesAdapter.kt index 8745e7f..d54ebe5 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/adapters/MessagesAdapter.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/adapters/MessagesAdapter.kt @@ -1,12 +1,12 @@ -package me.capcom.smsgateway.ui.adapters +package pt.whatsms.gateway.ui.adapters import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import me.capcom.smsgateway.data.entities.Message -import me.capcom.smsgateway.databinding.ItemMessageBinding -import me.capcom.smsgateway.ui.styles.color +import pt.whatsms.gateway.data.entities.Message +import pt.whatsms.gateway.databinding.ItemMessageBinding +import pt.whatsms.gateway.ui.styles.color import java.text.DateFormat import java.util.Date diff --git a/app/src/main/java/me/capcom/smsgateway/ui/adapters/WebhookAdapter.kt b/app/src/main/java/pt/whatsms/gateway/ui/adapters/WebhookAdapter.kt similarity index 77% rename from app/src/main/java/me/capcom/smsgateway/ui/adapters/WebhookAdapter.kt rename to app/src/main/java/pt/whatsms/gateway/ui/adapters/WebhookAdapter.kt index ec43eba..c2175ce 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/adapters/WebhookAdapter.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/adapters/WebhookAdapter.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.ui.adapters +package pt.whatsms.gateway.ui.adapters import android.content.ClipData import android.content.ClipboardManager @@ -9,9 +9,9 @@ import android.widget.Toast import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import me.capcom.smsgateway.R -import me.capcom.smsgateway.databinding.ItemWebhookBinding -import me.capcom.smsgateway.modules.webhooks.domain.WebHookDTO +import pt.whatsms.gateway.R +import pt.whatsms.gateway.databinding.ItemWebhookBinding +import pt.whatsms.gateway.modules.webhooks.domain.WebHookDTO class WebhookAdapter : ListAdapter(WebhookDiffCallback()) { class ViewHolder(private val binding: ItemWebhookBinding) : @@ -22,20 +22,20 @@ class WebhookAdapter : ListAdapter(Webhoo urlText.text = webhook.url eventText.text = webhook.event.value sourceText.text = when (webhook.source) { - me.capcom.smsgateway.domain.EntitySource.Local -> binding.root.context.getString( + pt.whatsms.gateway.domain.EntitySource.Local -> binding.root.context.getString( R.string.local ) - me.capcom.smsgateway.domain.EntitySource.Gateway, - me.capcom.smsgateway.domain.EntitySource.Cloud -> binding.root.context.getString( + pt.whatsms.gateway.domain.EntitySource.Gateway, + pt.whatsms.gateway.domain.EntitySource.Cloud -> binding.root.context.getString( R.string.cloud ) } sourceIcon.setImageResource( when (webhook.source) { - me.capcom.smsgateway.domain.EntitySource.Local -> R.drawable.ic_local_server - me.capcom.smsgateway.domain.EntitySource.Cloud, - me.capcom.smsgateway.domain.EntitySource.Gateway -> R.drawable.ic_cloud_server + pt.whatsms.gateway.domain.EntitySource.Local -> R.drawable.ic_local_server + pt.whatsms.gateway.domain.EntitySource.Cloud, + pt.whatsms.gateway.domain.EntitySource.Gateway -> R.drawable.ic_cloud_server } ) } diff --git a/app/src/main/java/me/capcom/smsgateway/ui/dialogs/FirstStartDialogFragment.kt b/app/src/main/java/pt/whatsms/gateway/ui/dialogs/FirstStartDialogFragment.kt similarity index 98% rename from app/src/main/java/me/capcom/smsgateway/ui/dialogs/FirstStartDialogFragment.kt rename to app/src/main/java/pt/whatsms/gateway/ui/dialogs/FirstStartDialogFragment.kt index 86c26ea..b72f6f5 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/dialogs/FirstStartDialogFragment.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/dialogs/FirstStartDialogFragment.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.ui.dialogs +package pt.whatsms.gateway.ui.dialogs import android.app.Dialog import android.os.Bundle @@ -8,7 +8,7 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.setFragmentResult import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout.OnTabSelectedListener -import me.capcom.smsgateway.databinding.DialogFirstStartBinding +import pt.whatsms.gateway.databinding.DialogFirstStartBinding class FirstStartDialogFragment : DialogFragment() { diff --git a/app/src/main/java/me/capcom/smsgateway/ui/settings/BasePreferenceFragment.kt b/app/src/main/java/pt/whatsms/gateway/ui/settings/BasePreferenceFragment.kt similarity index 94% rename from app/src/main/java/me/capcom/smsgateway/ui/settings/BasePreferenceFragment.kt rename to app/src/main/java/pt/whatsms/gateway/ui/settings/BasePreferenceFragment.kt index b663261..635cc68 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/settings/BasePreferenceFragment.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/settings/BasePreferenceFragment.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.ui.settings +package pt.whatsms.gateway.ui.settings import android.os.Bundle import android.util.TypedValue diff --git a/app/src/main/java/me/capcom/smsgateway/ui/settings/CloudServerSettingsFragment.kt b/app/src/main/java/pt/whatsms/gateway/ui/settings/CloudServerSettingsFragment.kt similarity index 96% rename from app/src/main/java/me/capcom/smsgateway/ui/settings/CloudServerSettingsFragment.kt rename to app/src/main/java/pt/whatsms/gateway/ui/settings/CloudServerSettingsFragment.kt index fcaeeeb..e0f4c5c 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/settings/CloudServerSettingsFragment.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/settings/CloudServerSettingsFragment.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.ui.settings +package pt.whatsms.gateway.ui.settings import android.annotation.SuppressLint import android.os.Bundle @@ -10,9 +10,9 @@ import androidx.lifecycle.lifecycleScope import androidx.preference.EditTextPreference import androidx.preference.Preference import kotlinx.coroutines.launch -import me.capcom.smsgateway.R -import me.capcom.smsgateway.modules.gateway.GatewayService -import me.capcom.smsgateway.modules.gateway.GatewaySettings +import pt.whatsms.gateway.R +import pt.whatsms.gateway.modules.gateway.GatewayService +import pt.whatsms.gateway.modules.gateway.GatewaySettings import org.koin.android.ext.android.inject import java.net.URL import java.text.DateFormat diff --git a/app/src/main/java/me/capcom/smsgateway/ui/settings/LocalServerSettingsFragment.kt b/app/src/main/java/pt/whatsms/gateway/ui/settings/LocalServerSettingsFragment.kt similarity index 96% rename from app/src/main/java/me/capcom/smsgateway/ui/settings/LocalServerSettingsFragment.kt rename to app/src/main/java/pt/whatsms/gateway/ui/settings/LocalServerSettingsFragment.kt index 16a8c57..75ad13d 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/settings/LocalServerSettingsFragment.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/settings/LocalServerSettingsFragment.kt @@ -1,11 +1,11 @@ -package me.capcom.smsgateway.ui.settings +package pt.whatsms.gateway.ui.settings import android.os.Bundle import android.text.InputType import androidx.preference.EditTextPreference import androidx.preference.Preference -import me.capcom.smsgateway.R -import me.capcom.smsgateway.modules.localserver.LocalServerSettings +import pt.whatsms.gateway.R +import pt.whatsms.gateway.modules.localserver.LocalServerSettings import org.koin.android.ext.android.inject class LocalServerSettingsFragment : BasePreferenceFragment() { diff --git a/app/src/main/java/me/capcom/smsgateway/ui/settings/MessagesSettingsFragment.kt b/app/src/main/java/pt/whatsms/gateway/ui/settings/MessagesSettingsFragment.kt similarity index 96% rename from app/src/main/java/me/capcom/smsgateway/ui/settings/MessagesSettingsFragment.kt rename to app/src/main/java/pt/whatsms/gateway/ui/settings/MessagesSettingsFragment.kt index 58a9e9c..cf52f75 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/settings/MessagesSettingsFragment.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/settings/MessagesSettingsFragment.kt @@ -1,11 +1,11 @@ -package me.capcom.smsgateway.ui.settings +package pt.whatsms.gateway.ui.settings import android.content.SharedPreferences import android.os.Bundle import android.text.InputType import androidx.preference.EditTextPreference import androidx.preference.Preference -import me.capcom.smsgateway.R +import pt.whatsms.gateway.R class MessagesSettingsFragment : BasePreferenceFragment() { diff --git a/app/src/main/java/me/capcom/smsgateway/ui/settings/WebhooksListFragment.kt b/app/src/main/java/pt/whatsms/gateway/ui/settings/WebhooksListFragment.kt similarity index 88% rename from app/src/main/java/me/capcom/smsgateway/ui/settings/WebhooksListFragment.kt rename to app/src/main/java/pt/whatsms/gateway/ui/settings/WebhooksListFragment.kt index bff634c..b729147 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/settings/WebhooksListFragment.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/settings/WebhooksListFragment.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.ui.settings +package pt.whatsms.gateway.ui.settings import android.os.Bundle import android.view.LayoutInflater @@ -8,9 +8,9 @@ import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager -import me.capcom.smsgateway.databinding.FragmentWebhooksListBinding -import me.capcom.smsgateway.modules.webhooks.WebHooksService -import me.capcom.smsgateway.ui.adapters.WebhookAdapter +import pt.whatsms.gateway.databinding.FragmentWebhooksListBinding +import pt.whatsms.gateway.modules.webhooks.WebHooksService +import pt.whatsms.gateway.ui.adapters.WebhookAdapter import org.koin.android.ext.android.inject class WebhooksListFragment : Fragment() { diff --git a/app/src/main/java/me/capcom/smsgateway/ui/settings/WebhooksSettingsFragment.kt b/app/src/main/java/pt/whatsms/gateway/ui/settings/WebhooksSettingsFragment.kt similarity index 93% rename from app/src/main/java/me/capcom/smsgateway/ui/settings/WebhooksSettingsFragment.kt rename to app/src/main/java/pt/whatsms/gateway/ui/settings/WebhooksSettingsFragment.kt index bf88607..990c0d2 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/settings/WebhooksSettingsFragment.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/settings/WebhooksSettingsFragment.kt @@ -1,10 +1,10 @@ -package me.capcom.smsgateway.ui.settings +package pt.whatsms.gateway.ui.settings import android.os.Bundle import android.text.InputType import androidx.preference.EditTextPreference import androidx.preference.Preference -import me.capcom.smsgateway.R +import pt.whatsms.gateway.R class WebhooksSettingsFragment : BasePreferenceFragment() { diff --git a/app/src/main/java/me/capcom/smsgateway/ui/settings/WhatSmsServerSettingsFragment.kt b/app/src/main/java/pt/whatsms/gateway/ui/settings/WhatSmsServerSettingsFragment.kt similarity index 95% rename from app/src/main/java/me/capcom/smsgateway/ui/settings/WhatSmsServerSettingsFragment.kt rename to app/src/main/java/pt/whatsms/gateway/ui/settings/WhatSmsServerSettingsFragment.kt index c208fac..287c203 100644 --- a/app/src/main/java/me/capcom/smsgateway/ui/settings/WhatSmsServerSettingsFragment.kt +++ b/app/src/main/java/pt/whatsms/gateway/ui/settings/WhatSmsServerSettingsFragment.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.ui.settings +package pt.whatsms.gateway.ui.settings import android.annotation.SuppressLint import android.content.Intent @@ -10,10 +10,10 @@ import androidx.lifecycle.lifecycleScope import androidx.preference.EditTextPreference import androidx.preference.Preference import kotlinx.coroutines.launch -import me.capcom.smsgateway.R -import me.capcom.smsgateway.modules.gateway.GatewayService -import me.capcom.smsgateway.modules.gateway.GatewaySettings -import me.capcom.smsgateway.ui.ScanPairingActivity +import pt.whatsms.gateway.R +import pt.whatsms.gateway.modules.gateway.GatewayService +import pt.whatsms.gateway.modules.gateway.GatewaySettings +import pt.whatsms.gateway.ui.ScanPairingActivity import org.koin.android.ext.android.inject import java.text.DateFormat diff --git a/app/src/main/java/pt/whatsms/gateway/ui/styles/Colors.kt b/app/src/main/java/pt/whatsms/gateway/ui/styles/Colors.kt new file mode 100644 index 0000000..91316ec --- /dev/null +++ b/app/src/main/java/pt/whatsms/gateway/ui/styles/Colors.kt @@ -0,0 +1,12 @@ +package pt.whatsms.gateway.ui.styles + +import android.graphics.Color + +val pt.whatsms.gateway.domain.ProcessingState.color: Int + get() = when (this) { + pt.whatsms.gateway.domain.ProcessingState.Pending -> Color.parseColor("#FFBB86FC") + pt.whatsms.gateway.domain.ProcessingState.Processed -> Color.parseColor("#FF6200EE") + pt.whatsms.gateway.domain.ProcessingState.Sent -> Color.parseColor("#FF3700B3") + pt.whatsms.gateway.domain.ProcessingState.Delivered -> Color.parseColor("#FF03DAC5") + pt.whatsms.gateway.domain.ProcessingState.Failed -> Color.parseColor("#FF018786") + } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_logs.xml b/app/src/main/res/layout/fragment_logs.xml index 97b40b4..c3ca35e 100644 --- a/app/src/main/res/layout/fragment_logs.xml +++ b/app/src/main/res/layout/fragment_logs.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/list" - android:name="me.capcom.smsgateway.ui.LogsFragment" + android:name="pt.whatsms.gateway.ui.LogsFragment" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_margin="0dp" diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml index e932985..c097a4d 100644 --- a/app/src/main/res/xml/root_preferences.xml +++ b/app/src/main/res/xml/root_preferences.xml @@ -2,19 +2,19 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> @@ -37,7 +37,7 @@ \ No newline at end of file diff --git a/app/src/test/java/me/capcom/smsgateway/ExampleUnitTest.kt b/app/src/test/java/pt/whatsms/gateway/ExampleUnitTest.kt similarity index 91% rename from app/src/test/java/me/capcom/smsgateway/ExampleUnitTest.kt rename to app/src/test/java/pt/whatsms/gateway/ExampleUnitTest.kt index 817e5a0..21d6c6a 100644 --- a/app/src/test/java/me/capcom/smsgateway/ExampleUnitTest.kt +++ b/app/src/test/java/pt/whatsms/gateway/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway +package pt.whatsms.gateway import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/src/test/java/me/capcom/smsgateway/data/entities/MessageWithRecipientsTest.kt b/app/src/test/java/pt/whatsms/gateway/data/entities/MessageWithRecipientsTest.kt similarity index 95% rename from app/src/test/java/me/capcom/smsgateway/data/entities/MessageWithRecipientsTest.kt rename to app/src/test/java/pt/whatsms/gateway/data/entities/MessageWithRecipientsTest.kt index d27be1e..570d7c6 100644 --- a/app/src/test/java/me/capcom/smsgateway/data/entities/MessageWithRecipientsTest.kt +++ b/app/src/test/java/pt/whatsms/gateway/data/entities/MessageWithRecipientsTest.kt @@ -1,7 +1,7 @@ -package me.capcom.smsgateway.data.entities +package pt.whatsms.gateway.data.entities -import me.capcom.smsgateway.domain.EntitySource -import me.capcom.smsgateway.domain.ProcessingState +import pt.whatsms.gateway.domain.EntitySource +import pt.whatsms.gateway.domain.ProcessingState import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/src/test/java/me/capcom/smsgateway/helpers/PhoneHelperTest.kt b/app/src/test/java/pt/whatsms/gateway/helpers/PhoneHelperTest.kt similarity index 97% rename from app/src/test/java/me/capcom/smsgateway/helpers/PhoneHelperTest.kt rename to app/src/test/java/pt/whatsms/gateway/helpers/PhoneHelperTest.kt index 02e8e2e..04ed867 100644 --- a/app/src/test/java/me/capcom/smsgateway/helpers/PhoneHelperTest.kt +++ b/app/src/test/java/pt/whatsms/gateway/helpers/PhoneHelperTest.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.helpers +package pt.whatsms.gateway.helpers import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/src/test/java/me/capcom/smsgateway/modules/receiver/parsers/MMSParserTest.kt b/app/src/test/java/pt/whatsms/gateway/modules/receiver/parsers/MMSParserTest.kt similarity index 99% rename from app/src/test/java/me/capcom/smsgateway/modules/receiver/parsers/MMSParserTest.kt rename to app/src/test/java/pt/whatsms/gateway/modules/receiver/parsers/MMSParserTest.kt index c6b7d97..b4aba0c 100644 --- a/app/src/test/java/me/capcom/smsgateway/modules/receiver/parsers/MMSParserTest.kt +++ b/app/src/test/java/pt/whatsms/gateway/modules/receiver/parsers/MMSParserTest.kt @@ -1,4 +1,4 @@ -package me.capcom.smsgateway.modules.receiver.parsers +package pt.whatsms.gateway.modules.receiver.parsers import org.junit.Test