refactor: renomear package me.capcom.smsgateway → pt.whatsms.gateway
Build AAB — WhatSMS Gateway / build (push) Failing after 34s
Build AAB — WhatSMS Gateway / build (push) Failing after 34s
- namespace, applicationId, todos os ficheiros .kt/.xml/.gradle actualizados - directório me/capcom/smsgateway/ → pt/whatsms/gateway/ - zero referências a capcom no código fonte
This commit is contained in:
+1
-1
@@ -68,7 +68,7 @@ android {
|
|||||||
exclude 'META-INF/INDEX.LIST'
|
exclude 'META-INF/INDEX.LIST'
|
||||||
exclude 'META-INF/io.netty.versions.properties'
|
exclude 'META-INF/io.netty.versions.properties'
|
||||||
}
|
}
|
||||||
namespace 'me.capcom.smsgateway'
|
namespace 'pt.whatsms.gateway'
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
"type": "APK",
|
"type": "APK",
|
||||||
"kind": "Directory"
|
"kind": "Directory"
|
||||||
},
|
},
|
||||||
"applicationId": "me.capcom.smsgateway",
|
"applicationId": "pt.whatsms.gateway",
|
||||||
"variantName": "release",
|
"variantName": "release",
|
||||||
"elements": [
|
"elements": [
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway
|
package pt.whatsms.gateway
|
||||||
|
|
||||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||||
import androidx.test.platform.app.InstrumentationRegistry
|
import androidx.test.platform.app.InstrumentationRegistry
|
||||||
@@ -17,6 +17,6 @@ class ExampleInstrumentedTest {
|
|||||||
fun useAppContext() {
|
fun useAppContext() {
|
||||||
// Context of the app under test.
|
// Context of the app under test.
|
||||||
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
|
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
|
||||||
assertEquals("me.capcom.smsgateway", appContext.packageName)
|
assertEquals("pt.whatsms.gateway", appContext.packageName)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -56,8 +56,8 @@
|
|||||||
android:enabled="true"
|
android:enabled="true"
|
||||||
android:exported="true">
|
android:exported="true">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="me.capcom.smsgateway.ACTION_SENT" />
|
<action android:name="pt.whatsms.gateway.ACTION_SENT" />
|
||||||
<action android:name="me.capcom.smsgateway.ACTION_DELIVERED" />
|
<action android:name="pt.whatsms.gateway.ACTION_DELIVERED" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</receiver>
|
</receiver>
|
||||||
<receiver
|
<receiver
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
package me.capcom.smsgateway.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<MessageRecipient>,
|
|
||||||
@Relation(
|
|
||||||
parentColumn = "id",
|
|
||||||
entityColumn = "messageId",
|
|
||||||
)
|
|
||||||
val states: List<MessageState> = 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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-5
@@ -1,5 +0,0 @@
|
|||||||
package me.capcom.smsgateway.modules.localserver.domain.messages
|
|
||||||
|
|
||||||
data class HashedMessage(
|
|
||||||
val hash: String,
|
|
||||||
)
|
|
||||||
-5
@@ -1,5 +0,0 @@
|
|||||||
package me.capcom.smsgateway.modules.localserver.domain.messages
|
|
||||||
|
|
||||||
data class TextMessage(
|
|
||||||
val text: String,
|
|
||||||
)
|
|
||||||
@@ -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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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")
|
|
||||||
}
|
|
||||||
+19
-19
@@ -1,24 +1,24 @@
|
|||||||
package me.capcom.smsgateway
|
package pt.whatsms.gateway
|
||||||
|
|
||||||
import android.app.Application
|
import android.app.Application
|
||||||
import healthModule
|
import healthModule
|
||||||
import me.capcom.smsgateway.data.dbModule
|
import pt.whatsms.gateway.data.dbModule
|
||||||
import me.capcom.smsgateway.modules.connection.connectionModule
|
import pt.whatsms.gateway.modules.connection.connectionModule
|
||||||
import me.capcom.smsgateway.modules.encryption.encryptionModule
|
import pt.whatsms.gateway.modules.encryption.encryptionModule
|
||||||
import me.capcom.smsgateway.modules.events.eventBusModule
|
import pt.whatsms.gateway.modules.events.eventBusModule
|
||||||
import me.capcom.smsgateway.modules.gateway.GatewayService
|
import pt.whatsms.gateway.modules.gateway.GatewayService
|
||||||
import me.capcom.smsgateway.modules.incoming.incomingModule
|
import pt.whatsms.gateway.modules.incoming.incomingModule
|
||||||
import me.capcom.smsgateway.modules.localserver.localserverModule
|
import pt.whatsms.gateway.modules.localserver.localserverModule
|
||||||
import me.capcom.smsgateway.modules.logs.logsModule
|
import pt.whatsms.gateway.modules.logs.logsModule
|
||||||
import me.capcom.smsgateway.modules.messages.messagesModule
|
import pt.whatsms.gateway.modules.messages.messagesModule
|
||||||
import me.capcom.smsgateway.modules.notifications.notificationsModule
|
import pt.whatsms.gateway.modules.notifications.notificationsModule
|
||||||
import me.capcom.smsgateway.modules.orchestrator.OrchestratorService
|
import pt.whatsms.gateway.modules.orchestrator.OrchestratorService
|
||||||
import me.capcom.smsgateway.modules.orchestrator.orchestratorModule
|
import pt.whatsms.gateway.modules.orchestrator.orchestratorModule
|
||||||
import me.capcom.smsgateway.modules.ping.pingModule
|
import pt.whatsms.gateway.modules.ping.pingModule
|
||||||
import me.capcom.smsgateway.modules.receiver.receiverModule
|
import pt.whatsms.gateway.modules.receiver.receiverModule
|
||||||
import me.capcom.smsgateway.modules.settings.settingsModule
|
import pt.whatsms.gateway.modules.settings.settingsModule
|
||||||
import me.capcom.smsgateway.modules.webhooks.webhooksModule
|
import pt.whatsms.gateway.modules.webhooks.webhooksModule
|
||||||
import me.capcom.smsgateway.receivers.EventsReceiver
|
import pt.whatsms.gateway.receivers.EventsReceiver
|
||||||
import org.koin.android.ext.android.get
|
import org.koin.android.ext.android.get
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import org.koin.android.ext.koin.androidContext
|
import org.koin.android.ext.koin.androidContext
|
||||||
@@ -42,7 +42,7 @@ class App: Application() {
|
|||||||
incomingModule,
|
incomingModule,
|
||||||
receiverModule,
|
receiverModule,
|
||||||
encryptionModule,
|
encryptionModule,
|
||||||
me.capcom.smsgateway.modules.gateway.gatewayModule,
|
pt.whatsms.gateway.modules.gateway.gatewayModule,
|
||||||
healthModule,
|
healthModule,
|
||||||
webhooksModule,
|
webhooksModule,
|
||||||
localserverModule,
|
localserverModule,
|
||||||
+3
-3
@@ -1,8 +1,8 @@
|
|||||||
package me.capcom.smsgateway
|
package pt.whatsms.gateway
|
||||||
|
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import me.capcom.smsgateway.modules.logs.LogsService
|
import pt.whatsms.gateway.modules.logs.LogsService
|
||||||
import me.capcom.smsgateway.modules.logs.db.LogEntry
|
import pt.whatsms.gateway.modules.logs.db.LogEntry
|
||||||
import org.koin.core.component.KoinComponent
|
import org.koin.core.component.KoinComponent
|
||||||
import java.lang.Thread.UncaughtExceptionHandler
|
import java.lang.Thread.UncaughtExceptionHandler
|
||||||
|
|
||||||
+5
-5
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway
|
package pt.whatsms.gateway
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
@@ -6,10 +6,10 @@ import android.os.Bundle
|
|||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import com.google.android.material.tabs.TabLayoutMediator
|
import com.google.android.material.tabs.TabLayoutMediator
|
||||||
import me.capcom.smsgateway.databinding.ActivityMainBinding
|
import pt.whatsms.gateway.databinding.ActivityMainBinding
|
||||||
import me.capcom.smsgateway.ui.HolderFragment
|
import pt.whatsms.gateway.ui.HolderFragment
|
||||||
import me.capcom.smsgateway.ui.HomeFragment
|
import pt.whatsms.gateway.ui.HomeFragment
|
||||||
import me.capcom.smsgateway.ui.SettingsFragment
|
import pt.whatsms.gateway.ui.SettingsFragment
|
||||||
|
|
||||||
class MainActivity : AppCompatActivity() {
|
class MainActivity : AppCompatActivity() {
|
||||||
|
|
||||||
+16
-16
@@ -1,25 +1,25 @@
|
|||||||
package me.capcom.smsgateway.data
|
package pt.whatsms.gateway.data
|
||||||
|
|
||||||
import androidx.room.AutoMigration
|
import androidx.room.AutoMigration
|
||||||
import androidx.room.Database
|
import androidx.room.Database
|
||||||
import androidx.room.Room
|
import androidx.room.Room
|
||||||
import androidx.room.RoomDatabase
|
import androidx.room.RoomDatabase
|
||||||
import androidx.room.TypeConverters
|
import androidx.room.TypeConverters
|
||||||
import me.capcom.smsgateway.data.dao.MessagesDao
|
import pt.whatsms.gateway.data.dao.MessagesDao
|
||||||
import me.capcom.smsgateway.data.dao.TokensDao
|
import pt.whatsms.gateway.data.dao.TokensDao
|
||||||
import me.capcom.smsgateway.data.entities.Message
|
import pt.whatsms.gateway.data.entities.Message
|
||||||
import me.capcom.smsgateway.data.entities.MessageRecipient
|
import pt.whatsms.gateway.data.entities.MessageRecipient
|
||||||
import me.capcom.smsgateway.data.entities.MessageState
|
import pt.whatsms.gateway.data.entities.MessageState
|
||||||
import me.capcom.smsgateway.data.entities.RecipientState
|
import pt.whatsms.gateway.data.entities.RecipientState
|
||||||
import me.capcom.smsgateway.data.entities.Token
|
import pt.whatsms.gateway.data.entities.Token
|
||||||
import me.capcom.smsgateway.modules.incoming.db.IncomingMessage
|
import pt.whatsms.gateway.modules.incoming.db.IncomingMessage
|
||||||
import me.capcom.smsgateway.modules.incoming.db.IncomingMessagesDao
|
import pt.whatsms.gateway.modules.incoming.db.IncomingMessagesDao
|
||||||
import me.capcom.smsgateway.modules.logs.db.LogEntriesDao
|
import pt.whatsms.gateway.modules.logs.db.LogEntriesDao
|
||||||
import me.capcom.smsgateway.modules.logs.db.LogEntry
|
import pt.whatsms.gateway.modules.logs.db.LogEntry
|
||||||
import me.capcom.smsgateway.modules.webhooks.db.WebHook
|
import pt.whatsms.gateway.modules.webhooks.db.WebHook
|
||||||
import me.capcom.smsgateway.modules.webhooks.db.WebHooksDao
|
import pt.whatsms.gateway.modules.webhooks.db.WebHooksDao
|
||||||
import me.capcom.smsgateway.modules.webhooks.db.WebhookQueueDao
|
import pt.whatsms.gateway.modules.webhooks.db.WebhookQueueDao
|
||||||
import me.capcom.smsgateway.modules.webhooks.db.WebhookQueueEntity
|
import pt.whatsms.gateway.modules.webhooks.db.WebhookQueueEntity
|
||||||
|
|
||||||
@Database(
|
@Database(
|
||||||
entities = [
|
entities = [
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.data
|
package pt.whatsms.gateway.data
|
||||||
|
|
||||||
import androidx.room.TypeConverter
|
import androidx.room.TypeConverter
|
||||||
import com.google.gson.GsonBuilder
|
import com.google.gson.GsonBuilder
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.data
|
package pt.whatsms.gateway.data
|
||||||
|
|
||||||
import androidx.room.migration.Migration
|
import androidx.room.migration.Migration
|
||||||
import androidx.sqlite.db.SupportSQLiteDatabase
|
import androidx.sqlite.db.SupportSQLiteDatabase
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.data
|
package pt.whatsms.gateway.data
|
||||||
|
|
||||||
import org.koin.dsl.module
|
import org.koin.dsl.module
|
||||||
|
|
||||||
+18
-18
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.data.dao
|
package pt.whatsms.gateway.data.dao
|
||||||
|
|
||||||
import androidx.lifecycle.LiveData
|
import androidx.lifecycle.LiveData
|
||||||
import androidx.room.Dao
|
import androidx.room.Dao
|
||||||
@@ -6,15 +6,15 @@ import androidx.room.Insert
|
|||||||
import androidx.room.OnConflictStrategy
|
import androidx.room.OnConflictStrategy
|
||||||
import androidx.room.Query
|
import androidx.room.Query
|
||||||
import androidx.room.Transaction
|
import androidx.room.Transaction
|
||||||
import me.capcom.smsgateway.data.entities.Message
|
import pt.whatsms.gateway.data.entities.Message
|
||||||
import me.capcom.smsgateway.data.entities.MessageRecipient
|
import pt.whatsms.gateway.data.entities.MessageRecipient
|
||||||
import me.capcom.smsgateway.data.entities.MessageState
|
import pt.whatsms.gateway.data.entities.MessageState
|
||||||
import me.capcom.smsgateway.data.entities.MessageWithRecipients
|
import pt.whatsms.gateway.data.entities.MessageWithRecipients
|
||||||
import me.capcom.smsgateway.data.entities.MessagesStats
|
import pt.whatsms.gateway.data.entities.MessagesStats
|
||||||
import me.capcom.smsgateway.data.entities.MessagesTotals
|
import pt.whatsms.gateway.data.entities.MessagesTotals
|
||||||
import me.capcom.smsgateway.data.entities.RecipientState
|
import pt.whatsms.gateway.data.entities.RecipientState
|
||||||
import me.capcom.smsgateway.domain.EntitySource
|
import pt.whatsms.gateway.domain.EntitySource
|
||||||
import me.capcom.smsgateway.domain.ProcessingState
|
import pt.whatsms.gateway.domain.ProcessingState
|
||||||
|
|
||||||
@Dao
|
@Dao
|
||||||
interface MessagesDao {
|
interface MessagesDao {
|
||||||
@@ -100,7 +100,7 @@ interface MessagesDao {
|
|||||||
)
|
)
|
||||||
fun _insertRecipientStatesByMessage(
|
fun _insertRecipientStatesByMessage(
|
||||||
messageId: String,
|
messageId: String,
|
||||||
state: me.capcom.smsgateway.domain.ProcessingState
|
state: pt.whatsms.gateway.domain.ProcessingState
|
||||||
)
|
)
|
||||||
|
|
||||||
@Transaction
|
@Transaction
|
||||||
@@ -125,9 +125,9 @@ interface MessagesDao {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Query("UPDATE message SET state = :state WHERE id = :id AND state <> 'Failed'")
|
@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)
|
_updateMessageState(id, state)
|
||||||
_insertMessageState(
|
_insertMessageState(
|
||||||
MessageState(
|
MessageState(
|
||||||
@@ -145,7 +145,7 @@ interface MessagesDao {
|
|||||||
_insertMessageState(
|
_insertMessageState(
|
||||||
MessageState(
|
MessageState(
|
||||||
id,
|
id,
|
||||||
me.capcom.smsgateway.domain.ProcessingState.Processed,
|
pt.whatsms.gateway.domain.ProcessingState.Processed,
|
||||||
System.currentTimeMillis()
|
System.currentTimeMillis()
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -155,7 +155,7 @@ interface MessagesDao {
|
|||||||
fun _updateRecipientState(
|
fun _updateRecipientState(
|
||||||
id: String,
|
id: String,
|
||||||
phoneNumber: String,
|
phoneNumber: String,
|
||||||
state: me.capcom.smsgateway.domain.ProcessingState,
|
state: pt.whatsms.gateway.domain.ProcessingState,
|
||||||
error: String?
|
error: String?
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -163,7 +163,7 @@ interface MessagesDao {
|
|||||||
fun updateRecipientState(
|
fun updateRecipientState(
|
||||||
id: String,
|
id: String,
|
||||||
phoneNumber: String,
|
phoneNumber: String,
|
||||||
state: me.capcom.smsgateway.domain.ProcessingState,
|
state: pt.whatsms.gateway.domain.ProcessingState,
|
||||||
error: String?
|
error: String?
|
||||||
) {
|
) {
|
||||||
_updateRecipientState(id, phoneNumber, state, error)
|
_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'")
|
@Query("UPDATE messagerecipient SET state = :state, error = :error WHERE messageId = :id AND state <> 'Failed'")
|
||||||
fun _updateRecipientsState(
|
fun _updateRecipientsState(
|
||||||
id: String,
|
id: String,
|
||||||
state: me.capcom.smsgateway.domain.ProcessingState,
|
state: pt.whatsms.gateway.domain.ProcessingState,
|
||||||
error: String?
|
error: String?
|
||||||
)
|
)
|
||||||
|
|
||||||
@Transaction
|
@Transaction
|
||||||
fun updateRecipientsState(
|
fun updateRecipientsState(
|
||||||
id: String,
|
id: String,
|
||||||
state: me.capcom.smsgateway.domain.ProcessingState,
|
state: pt.whatsms.gateway.domain.ProcessingState,
|
||||||
error: String?
|
error: String?
|
||||||
) {
|
) {
|
||||||
_updateRecipientsState(id, state, error)
|
_updateRecipientsState(id, state, error)
|
||||||
+2
-2
@@ -1,10 +1,10 @@
|
|||||||
package me.capcom.smsgateway.data.dao
|
package pt.whatsms.gateway.data.dao
|
||||||
|
|
||||||
import androidx.room.Dao
|
import androidx.room.Dao
|
||||||
import androidx.room.Insert
|
import androidx.room.Insert
|
||||||
import androidx.room.OnConflictStrategy
|
import androidx.room.OnConflictStrategy
|
||||||
import androidx.room.Query
|
import androidx.room.Query
|
||||||
import me.capcom.smsgateway.data.entities.Token
|
import pt.whatsms.gateway.data.entities.Token
|
||||||
|
|
||||||
@Dao
|
@Dao
|
||||||
interface TokensDao {
|
interface TokensDao {
|
||||||
+4
-4
@@ -1,12 +1,12 @@
|
|||||||
package me.capcom.smsgateway.data.entities
|
package pt.whatsms.gateway.data.entities
|
||||||
|
|
||||||
import androidx.room.ColumnInfo
|
import androidx.room.ColumnInfo
|
||||||
import androidx.room.Entity
|
import androidx.room.Entity
|
||||||
import androidx.room.PrimaryKey
|
import androidx.room.PrimaryKey
|
||||||
import com.google.gson.Gson
|
import com.google.gson.Gson
|
||||||
import me.capcom.smsgateway.domain.EntitySource
|
import pt.whatsms.gateway.domain.EntitySource
|
||||||
import me.capcom.smsgateway.domain.MessageContent
|
import pt.whatsms.gateway.domain.MessageContent
|
||||||
import me.capcom.smsgateway.domain.ProcessingState
|
import pt.whatsms.gateway.domain.ProcessingState
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
|
|
||||||
enum class MessageType {
|
enum class MessageType {
|
||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.data.entities
|
package pt.whatsms.gateway.data.entities
|
||||||
|
|
||||||
import androidx.room.Entity
|
import androidx.room.Entity
|
||||||
import androidx.room.ForeignKey
|
import androidx.room.ForeignKey
|
||||||
@@ -12,6 +12,6 @@ import androidx.room.ForeignKey
|
|||||||
data class MessageRecipient(
|
data class MessageRecipient(
|
||||||
val messageId: String,
|
val messageId: String,
|
||||||
val phoneNumber: 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
|
val error: String? = null
|
||||||
)
|
)
|
||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.data.entities
|
package pt.whatsms.gateway.data.entities
|
||||||
|
|
||||||
import androidx.room.Entity
|
import androidx.room.Entity
|
||||||
import androidx.room.ForeignKey
|
import androidx.room.ForeignKey
|
||||||
@@ -16,6 +16,6 @@ import androidx.room.ForeignKey
|
|||||||
)
|
)
|
||||||
data class MessageState(
|
data class MessageState(
|
||||||
val messageId: String,
|
val messageId: String,
|
||||||
val state: me.capcom.smsgateway.domain.ProcessingState,
|
val state: pt.whatsms.gateway.domain.ProcessingState,
|
||||||
val updatedAt: Long
|
val updatedAt: Long
|
||||||
)
|
)
|
||||||
@@ -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<MessageRecipient>,
|
||||||
|
@Relation(
|
||||||
|
parentColumn = "id",
|
||||||
|
entityColumn = "messageId",
|
||||||
|
)
|
||||||
|
val states: List<MessageState> = 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
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.data.entities
|
package pt.whatsms.gateway.data.entities
|
||||||
|
|
||||||
data class MessagesStats(
|
data class MessagesStats(
|
||||||
val count: Int,
|
val count: Int,
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.data.entities
|
package pt.whatsms.gateway.data.entities
|
||||||
|
|
||||||
data class MessagesTotals(
|
data class MessagesTotals(
|
||||||
val total: Long,
|
val total: Long,
|
||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.data.entities
|
package pt.whatsms.gateway.data.entities
|
||||||
|
|
||||||
import androidx.room.Entity
|
import androidx.room.Entity
|
||||||
import androidx.room.ForeignKey
|
import androidx.room.ForeignKey
|
||||||
@@ -17,6 +17,6 @@ import androidx.room.ForeignKey
|
|||||||
data class RecipientState(
|
data class RecipientState(
|
||||||
val messageId: String,
|
val messageId: String,
|
||||||
val phoneNumber: String,
|
val phoneNumber: String,
|
||||||
val state: me.capcom.smsgateway.domain.ProcessingState,
|
val state: pt.whatsms.gateway.domain.ProcessingState,
|
||||||
val updatedAt: Long
|
val updatedAt: Long
|
||||||
)
|
)
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.data.entities
|
package pt.whatsms.gateway.data.entities
|
||||||
|
|
||||||
import androidx.room.Entity
|
import androidx.room.Entity
|
||||||
import androidx.room.Index
|
import androidx.room.Index
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.domain
|
package pt.whatsms.gateway.domain
|
||||||
|
|
||||||
enum class EntitySource {
|
enum class EntitySource {
|
||||||
Local,
|
Local,
|
||||||
+5
-5
@@ -1,9 +1,9 @@
|
|||||||
package me.capcom.smsgateway.domain
|
package pt.whatsms.gateway.domain
|
||||||
|
|
||||||
import me.capcom.smsgateway.BuildConfig
|
import pt.whatsms.gateway.BuildConfig
|
||||||
import me.capcom.smsgateway.modules.health.domain.CheckResult
|
import pt.whatsms.gateway.modules.health.domain.CheckResult
|
||||||
import me.capcom.smsgateway.modules.health.domain.HealthResult
|
import pt.whatsms.gateway.modules.health.domain.HealthResult
|
||||||
import me.capcom.smsgateway.modules.health.domain.Status
|
import pt.whatsms.gateway.modules.health.domain.Status
|
||||||
|
|
||||||
class HealthResponse(
|
class HealthResponse(
|
||||||
healthResult: HealthResult,
|
healthResult: HealthResult,
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.domain
|
package pt.whatsms.gateway.domain
|
||||||
|
|
||||||
sealed class MessageContent {
|
sealed class MessageContent {
|
||||||
data class Text(val text: String) : MessageContent() {
|
data class Text(val text: String) : MessageContent() {
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.domain
|
package pt.whatsms.gateway.domain
|
||||||
|
|
||||||
enum class ProcessingState {
|
enum class ProcessingState {
|
||||||
Pending,
|
Pending,
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.extensions
|
package pt.whatsms.gateway.extensions
|
||||||
|
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import com.google.gson.GsonBuilder
|
import com.google.gson.GsonBuilder
|
||||||
+2
-2
@@ -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 {
|
object BuildHelper {
|
||||||
val isInsecureVersion =
|
val isInsecureVersion =
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.helpers
|
package pt.whatsms.gateway.helpers
|
||||||
|
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import java.text.ParseException
|
import java.text.ParseException
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.helpers
|
package pt.whatsms.gateway.helpers
|
||||||
|
|
||||||
import com.google.i18n.phonenumbers.PhoneNumberUtil
|
import com.google.i18n.phonenumbers.PhoneNumberUtil
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.helpers
|
package pt.whatsms.gateway.helpers
|
||||||
|
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
+2
-2
@@ -1,11 +1,11 @@
|
|||||||
package me.capcom.smsgateway.helpers
|
package pt.whatsms.gateway.helpers
|
||||||
|
|
||||||
import android.content.ComponentName
|
import android.content.ComponentName
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.pm.PackageManager
|
import android.content.pm.PackageManager
|
||||||
import androidx.core.content.edit
|
import androidx.core.content.edit
|
||||||
import androidx.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import me.capcom.smsgateway.receivers.BootReceiver
|
import pt.whatsms.gateway.receivers.BootReceiver
|
||||||
|
|
||||||
class SettingsHelper(private val context: Context) {
|
class SettingsHelper(private val context: Context) {
|
||||||
private val settings = PreferenceManager.getDefaultSharedPreferences(context)
|
private val settings = PreferenceManager.getDefaultSharedPreferences(context)
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.helpers
|
package pt.whatsms.gateway.helpers
|
||||||
|
|
||||||
import android.Manifest
|
import android.Manifest
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.connection
|
package pt.whatsms.gateway.modules.connection
|
||||||
|
|
||||||
enum class CellularNetworkType {
|
enum class CellularNetworkType {
|
||||||
None,
|
None,
|
||||||
+5
-5
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.connection
|
package pt.whatsms.gateway.modules.connection
|
||||||
|
|
||||||
import android.Manifest
|
import android.Manifest
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
@@ -11,10 +11,10 @@ import android.telephony.TelephonyManager
|
|||||||
import androidx.core.app.ActivityCompat
|
import androidx.core.app.ActivityCompat
|
||||||
import androidx.lifecycle.LiveData
|
import androidx.lifecycle.LiveData
|
||||||
import androidx.lifecycle.MutableLiveData
|
import androidx.lifecycle.MutableLiveData
|
||||||
import me.capcom.smsgateway.modules.health.domain.CheckResult
|
import pt.whatsms.gateway.modules.health.domain.CheckResult
|
||||||
import me.capcom.smsgateway.modules.health.domain.Status
|
import pt.whatsms.gateway.modules.health.domain.Status
|
||||||
import me.capcom.smsgateway.modules.logs.LogsService
|
import pt.whatsms.gateway.modules.logs.LogsService
|
||||||
import me.capcom.smsgateway.modules.logs.db.LogEntry
|
import pt.whatsms.gateway.modules.logs.db.LogEntry
|
||||||
import org.koin.core.component.KoinComponent
|
import org.koin.core.component.KoinComponent
|
||||||
import org.koin.core.component.inject
|
import org.koin.core.component.inject
|
||||||
|
|
||||||
+1
-1
@@ -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.core.module.dsl.singleOf
|
||||||
import org.koin.dsl.module
|
import org.koin.dsl.module
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.connection
|
package pt.whatsms.gateway.modules.connection
|
||||||
|
|
||||||
enum class TransportType(
|
enum class TransportType(
|
||||||
val value: Int
|
val value: Int
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.encryption
|
package pt.whatsms.gateway.modules.encryption
|
||||||
|
|
||||||
import android.util.Base64
|
import android.util.Base64
|
||||||
import javax.crypto.Cipher
|
import javax.crypto.Cipher
|
||||||
+4
-4
@@ -1,8 +1,8 @@
|
|||||||
package me.capcom.smsgateway.modules.encryption
|
package pt.whatsms.gateway.modules.encryption
|
||||||
|
|
||||||
import me.capcom.smsgateway.modules.settings.Importer
|
import pt.whatsms.gateway.modules.settings.Importer
|
||||||
import me.capcom.smsgateway.modules.settings.KeyValueStorage
|
import pt.whatsms.gateway.modules.settings.KeyValueStorage
|
||||||
import me.capcom.smsgateway.modules.settings.get
|
import pt.whatsms.gateway.modules.settings.get
|
||||||
|
|
||||||
class EncryptionSettings(
|
class EncryptionSettings(
|
||||||
private val storage: KeyValueStorage,
|
private val storage: KeyValueStorage,
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.encryption
|
package pt.whatsms.gateway.modules.encryption
|
||||||
|
|
||||||
import org.koin.dsl.module
|
import org.koin.dsl.module
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.events
|
package pt.whatsms.gateway.modules.events
|
||||||
|
|
||||||
open class AppEvent(
|
open class AppEvent(
|
||||||
@Transient
|
@Transient
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.events
|
package pt.whatsms.gateway.modules.events
|
||||||
|
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import kotlinx.coroutines.flow.MutableSharedFlow
|
import kotlinx.coroutines.flow.MutableSharedFlow
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.events
|
package pt.whatsms.gateway.modules.events
|
||||||
|
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.events
|
package pt.whatsms.gateway.modules.events
|
||||||
|
|
||||||
data class ExternalEvent(
|
data class ExternalEvent(
|
||||||
val type: ExternalEventType,
|
val type: ExternalEventType,
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.events
|
package pt.whatsms.gateway.modules.events
|
||||||
|
|
||||||
import com.google.gson.annotations.SerializedName
|
import com.google.gson.annotations.SerializedName
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.events
|
package pt.whatsms.gateway.modules.events
|
||||||
|
|
||||||
import org.koin.dsl.module
|
import org.koin.dsl.module
|
||||||
|
|
||||||
+15
-15
@@ -1,22 +1,22 @@
|
|||||||
package me.capcom.smsgateway.modules.gateway
|
package pt.whatsms.gateway.modules.gateway
|
||||||
|
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import kotlinx.coroutines.coroutineScope
|
import kotlinx.coroutines.coroutineScope
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import me.capcom.smsgateway.domain.EntitySource
|
import pt.whatsms.gateway.domain.EntitySource
|
||||||
import me.capcom.smsgateway.modules.events.EventBus
|
import pt.whatsms.gateway.modules.events.EventBus
|
||||||
import me.capcom.smsgateway.modules.events.EventsReceiver
|
import pt.whatsms.gateway.modules.events.EventsReceiver
|
||||||
import me.capcom.smsgateway.modules.gateway.events.DeviceRegisteredEvent
|
import pt.whatsms.gateway.modules.gateway.events.DeviceRegisteredEvent
|
||||||
import me.capcom.smsgateway.modules.gateway.events.MessageEnqueuedEvent
|
import pt.whatsms.gateway.modules.gateway.events.MessageEnqueuedEvent
|
||||||
import me.capcom.smsgateway.modules.gateway.events.SettingsUpdatedEvent
|
import pt.whatsms.gateway.modules.gateway.events.SettingsUpdatedEvent
|
||||||
import me.capcom.smsgateway.modules.gateway.events.WebhooksUpdatedEvent
|
import pt.whatsms.gateway.modules.gateway.events.WebhooksUpdatedEvent
|
||||||
import me.capcom.smsgateway.modules.gateway.services.SSEForegroundService
|
import pt.whatsms.gateway.modules.gateway.services.SSEForegroundService
|
||||||
import me.capcom.smsgateway.modules.gateway.workers.PullMessagesWorker
|
import pt.whatsms.gateway.modules.gateway.workers.PullMessagesWorker
|
||||||
import me.capcom.smsgateway.modules.gateway.workers.SendStateWorker
|
import pt.whatsms.gateway.modules.gateway.workers.SendStateWorker
|
||||||
import me.capcom.smsgateway.modules.gateway.workers.SettingsUpdateWorker
|
import pt.whatsms.gateway.modules.gateway.workers.SettingsUpdateWorker
|
||||||
import me.capcom.smsgateway.modules.gateway.workers.WebhooksUpdateWorker
|
import pt.whatsms.gateway.modules.gateway.workers.WebhooksUpdateWorker
|
||||||
import me.capcom.smsgateway.modules.messages.events.MessageStateChangedEvent
|
import pt.whatsms.gateway.modules.messages.events.MessageStateChangedEvent
|
||||||
import me.capcom.smsgateway.modules.ping.events.PingEvent
|
import pt.whatsms.gateway.modules.ping.events.PingEvent
|
||||||
import org.koin.core.component.get
|
import org.koin.core.component.get
|
||||||
|
|
||||||
class EventsReceiver : EventsReceiver() {
|
class EventsReceiver : EventsReceiver() {
|
||||||
+6
-6
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.gateway
|
package pt.whatsms.gateway.modules.gateway
|
||||||
|
|
||||||
import com.google.gson.annotations.SerializedName
|
import com.google.gson.annotations.SerializedName
|
||||||
import io.ktor.client.HttpClient
|
import io.ktor.client.HttpClient
|
||||||
@@ -20,10 +20,10 @@ import io.ktor.http.contentType
|
|||||||
import io.ktor.http.hostWithPort
|
import io.ktor.http.hostWithPort
|
||||||
import io.ktor.serialization.gson.gson
|
import io.ktor.serialization.gson.gson
|
||||||
import io.ktor.util.encodeBase64
|
import io.ktor.util.encodeBase64
|
||||||
import me.capcom.smsgateway.BuildConfig
|
import pt.whatsms.gateway.BuildConfig
|
||||||
import me.capcom.smsgateway.domain.ProcessingState
|
import pt.whatsms.gateway.domain.ProcessingState
|
||||||
import me.capcom.smsgateway.extensions.configure
|
import pt.whatsms.gateway.extensions.configure
|
||||||
import me.capcom.smsgateway.modules.webhooks.domain.WebHookEvent
|
import pt.whatsms.gateway.modules.webhooks.domain.WebHookEvent
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
|
|
||||||
class GatewayApi(
|
class GatewayApi(
|
||||||
@@ -35,7 +35,7 @@ class GatewayApi(
|
|||||||
|
|
||||||
private val client = HttpClient(OkHttp) {
|
private val client = HttpClient(OkHttp) {
|
||||||
install(UserAgent) {
|
install(UserAgent) {
|
||||||
agent = "me.capcom.smsgateway/" + BuildConfig.VERSION_NAME
|
agent = "pt.whatsms.gateway/" + BuildConfig.VERSION_NAME
|
||||||
}
|
}
|
||||||
install(ContentNegotiation) {
|
install(ContentNegotiation) {
|
||||||
gson {
|
gson {
|
||||||
+19
-19
@@ -1,26 +1,26 @@
|
|||||||
package me.capcom.smsgateway.modules.gateway
|
package pt.whatsms.gateway.modules.gateway
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import io.ktor.client.plugins.ClientRequestException
|
import io.ktor.client.plugins.ClientRequestException
|
||||||
import io.ktor.http.HttpStatusCode
|
import io.ktor.http.HttpStatusCode
|
||||||
import me.capcom.smsgateway.data.entities.MessageWithRecipients
|
import pt.whatsms.gateway.data.entities.MessageWithRecipients
|
||||||
import me.capcom.smsgateway.domain.EntitySource
|
import pt.whatsms.gateway.domain.EntitySource
|
||||||
import me.capcom.smsgateway.domain.MessageContent
|
import pt.whatsms.gateway.domain.MessageContent
|
||||||
import me.capcom.smsgateway.modules.events.EventBus
|
import pt.whatsms.gateway.modules.events.EventBus
|
||||||
import me.capcom.smsgateway.modules.gateway.events.DeviceRegisteredEvent
|
import pt.whatsms.gateway.modules.gateway.events.DeviceRegisteredEvent
|
||||||
import me.capcom.smsgateway.modules.gateway.services.SSEForegroundService
|
import pt.whatsms.gateway.modules.gateway.services.SSEForegroundService
|
||||||
import me.capcom.smsgateway.modules.gateway.workers.PullMessagesWorker
|
import pt.whatsms.gateway.modules.gateway.workers.PullMessagesWorker
|
||||||
import me.capcom.smsgateway.modules.gateway.workers.SendStateWorker
|
import pt.whatsms.gateway.modules.gateway.workers.SendStateWorker
|
||||||
import me.capcom.smsgateway.modules.gateway.workers.SettingsUpdateWorker
|
import pt.whatsms.gateway.modules.gateway.workers.SettingsUpdateWorker
|
||||||
import me.capcom.smsgateway.modules.gateway.workers.WebhooksUpdateWorker
|
import pt.whatsms.gateway.modules.gateway.workers.WebhooksUpdateWorker
|
||||||
import me.capcom.smsgateway.modules.logs.LogsService
|
import pt.whatsms.gateway.modules.logs.LogsService
|
||||||
import me.capcom.smsgateway.modules.logs.db.LogEntry
|
import pt.whatsms.gateway.modules.logs.db.LogEntry
|
||||||
import me.capcom.smsgateway.modules.messages.MessagesService
|
import pt.whatsms.gateway.modules.messages.MessagesService
|
||||||
import me.capcom.smsgateway.modules.messages.MessagesSettings
|
import pt.whatsms.gateway.modules.messages.MessagesSettings
|
||||||
import me.capcom.smsgateway.modules.messages.data.SendParams
|
import pt.whatsms.gateway.modules.messages.data.SendParams
|
||||||
import me.capcom.smsgateway.modules.messages.data.SendRequest
|
import pt.whatsms.gateway.modules.messages.data.SendRequest
|
||||||
import me.capcom.smsgateway.services.PushService
|
import pt.whatsms.gateway.services.PushService
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
|
|
||||||
class GatewayService(
|
class GatewayService(
|
||||||
@@ -224,7 +224,7 @@ class GatewayService(
|
|||||||
|
|
||||||
val request = SendRequest(
|
val request = SendRequest(
|
||||||
EntitySource.Cloud,
|
EntitySource.Cloud,
|
||||||
me.capcom.smsgateway.modules.messages.data.Message(
|
pt.whatsms.gateway.modules.messages.data.Message(
|
||||||
message.id,
|
message.id,
|
||||||
when (val content = message.content) {
|
when (val content = message.content) {
|
||||||
is GatewayApi.MessageContent.Text -> MessageContent.Text(content.text)
|
is GatewayApi.MessageContent.Text -> MessageContent.Text(content.text)
|
||||||
+5
-5
@@ -1,9 +1,9 @@
|
|||||||
package me.capcom.smsgateway.modules.gateway
|
package pt.whatsms.gateway.modules.gateway
|
||||||
|
|
||||||
import me.capcom.smsgateway.modules.settings.Exporter
|
import pt.whatsms.gateway.modules.settings.Exporter
|
||||||
import me.capcom.smsgateway.modules.settings.Importer
|
import pt.whatsms.gateway.modules.settings.Importer
|
||||||
import me.capcom.smsgateway.modules.settings.KeyValueStorage
|
import pt.whatsms.gateway.modules.settings.KeyValueStorage
|
||||||
import me.capcom.smsgateway.modules.settings.get
|
import pt.whatsms.gateway.modules.settings.get
|
||||||
|
|
||||||
class GatewaySettings(
|
class GatewaySettings(
|
||||||
private val storage: KeyValueStorage,
|
private val storage: KeyValueStorage,
|
||||||
+1
-1
@@ -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.core.module.dsl.singleOf
|
||||||
import org.koin.dsl.module
|
import org.koin.dsl.module
|
||||||
+2
-2
@@ -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(
|
sealed class DeviceRegisteredEvent(
|
||||||
val server: String,
|
val server: String,
|
||||||
+2
-2
@@ -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) {
|
class MessageEnqueuedEvent : AppEvent(NAME) {
|
||||||
companion object {
|
companion object {
|
||||||
+2
-2
@@ -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) {
|
class SettingsUpdatedEvent : AppEvent(NAME) {
|
||||||
|
|
||||||
+2
-2
@@ -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) {
|
class WebhooksUpdatedEvent : AppEvent(NAME) {
|
||||||
companion object {
|
companion object {
|
||||||
+11
-11
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.gateway.services
|
package pt.whatsms.gateway.modules.gateway.services
|
||||||
|
|
||||||
import android.app.Service
|
import android.app.Service
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
@@ -8,16 +8,16 @@ import android.os.Build
|
|||||||
import android.os.IBinder
|
import android.os.IBinder
|
||||||
import android.os.PowerManager
|
import android.os.PowerManager
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import me.capcom.smsgateway.R
|
import pt.whatsms.gateway.R
|
||||||
import me.capcom.smsgateway.helpers.SSEManager
|
import pt.whatsms.gateway.helpers.SSEManager
|
||||||
import me.capcom.smsgateway.modules.events.ExternalEvent
|
import pt.whatsms.gateway.modules.events.ExternalEvent
|
||||||
import me.capcom.smsgateway.modules.events.ExternalEventType
|
import pt.whatsms.gateway.modules.events.ExternalEventType
|
||||||
import me.capcom.smsgateway.modules.gateway.GatewaySettings
|
import pt.whatsms.gateway.modules.gateway.GatewaySettings
|
||||||
import me.capcom.smsgateway.modules.gateway.workers.PullMessagesWorker
|
import pt.whatsms.gateway.modules.gateway.workers.PullMessagesWorker
|
||||||
import me.capcom.smsgateway.modules.logs.LogsService
|
import pt.whatsms.gateway.modules.logs.LogsService
|
||||||
import me.capcom.smsgateway.modules.logs.db.LogEntry
|
import pt.whatsms.gateway.modules.logs.db.LogEntry
|
||||||
import me.capcom.smsgateway.modules.notifications.NotificationsService
|
import pt.whatsms.gateway.modules.notifications.NotificationsService
|
||||||
import me.capcom.smsgateway.modules.orchestrator.EventsRouter
|
import pt.whatsms.gateway.modules.orchestrator.EventsRouter
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
|
|
||||||
class SSEForegroundService : Service() {
|
class SSEForegroundService : Service() {
|
||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.gateway.workers
|
package pt.whatsms.gateway.modules.gateway.workers
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import androidx.lifecycle.map
|
import androidx.lifecycle.map
|
||||||
@@ -15,7 +15,7 @@ import androidx.work.WorkRequest
|
|||||||
import androidx.work.WorkerParameters
|
import androidx.work.WorkerParameters
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import me.capcom.smsgateway.App
|
import pt.whatsms.gateway.App
|
||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
|
|
||||||
class PullMessagesWorker(
|
class PullMessagesWorker(
|
||||||
+5
-5
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.gateway.workers
|
package pt.whatsms.gateway.modules.gateway.workers
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import androidx.work.BackoffPolicy
|
import androidx.work.BackoffPolicy
|
||||||
@@ -11,10 +11,10 @@ import androidx.work.WorkManager
|
|||||||
import androidx.work.WorkRequest
|
import androidx.work.WorkRequest
|
||||||
import androidx.work.WorkerParameters
|
import androidx.work.WorkerParameters
|
||||||
import androidx.work.workDataOf
|
import androidx.work.workDataOf
|
||||||
import me.capcom.smsgateway.App
|
import pt.whatsms.gateway.App
|
||||||
import me.capcom.smsgateway.modules.gateway.GatewayService
|
import pt.whatsms.gateway.modules.gateway.GatewayService
|
||||||
import me.capcom.smsgateway.modules.logs.LogsService
|
import pt.whatsms.gateway.modules.logs.LogsService
|
||||||
import me.capcom.smsgateway.modules.logs.db.LogEntry
|
import pt.whatsms.gateway.modules.logs.db.LogEntry
|
||||||
import org.koin.core.component.KoinComponent
|
import org.koin.core.component.KoinComponent
|
||||||
import org.koin.core.component.inject
|
import org.koin.core.component.inject
|
||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
+3
-3
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.gateway.workers
|
package pt.whatsms.gateway.modules.gateway.workers
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import androidx.work.BackoffPolicy
|
import androidx.work.BackoffPolicy
|
||||||
@@ -12,8 +12,8 @@ import androidx.work.WorkerParameters
|
|||||||
import androidx.work.workDataOf
|
import androidx.work.workDataOf
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import me.capcom.smsgateway.modules.gateway.GatewayService
|
import pt.whatsms.gateway.modules.gateway.GatewayService
|
||||||
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.KoinComponent
|
||||||
import org.koin.core.component.inject
|
import org.koin.core.component.inject
|
||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
+3
-3
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.gateway.workers
|
package pt.whatsms.gateway.modules.gateway.workers
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import androidx.work.BackoffPolicy
|
import androidx.work.BackoffPolicy
|
||||||
@@ -10,8 +10,8 @@ import androidx.work.PeriodicWorkRequestBuilder
|
|||||||
import androidx.work.WorkManager
|
import androidx.work.WorkManager
|
||||||
import androidx.work.WorkRequest
|
import androidx.work.WorkRequest
|
||||||
import androidx.work.WorkerParameters
|
import androidx.work.WorkerParameters
|
||||||
import me.capcom.smsgateway.modules.gateway.GatewayService
|
import pt.whatsms.gateway.modules.gateway.GatewayService
|
||||||
import me.capcom.smsgateway.modules.settings.SettingsService
|
import pt.whatsms.gateway.modules.settings.SettingsService
|
||||||
import org.koin.core.component.KoinComponent
|
import org.koin.core.component.KoinComponent
|
||||||
import org.koin.core.component.get
|
import org.koin.core.component.get
|
||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
+6
-6
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.gateway.workers
|
package pt.whatsms.gateway.modules.gateway.workers
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import androidx.work.BackoffPolicy
|
import androidx.work.BackoffPolicy
|
||||||
@@ -10,11 +10,11 @@ import androidx.work.PeriodicWorkRequestBuilder
|
|||||||
import androidx.work.WorkManager
|
import androidx.work.WorkManager
|
||||||
import androidx.work.WorkRequest
|
import androidx.work.WorkRequest
|
||||||
import androidx.work.WorkerParameters
|
import androidx.work.WorkerParameters
|
||||||
import me.capcom.smsgateway.domain.EntitySource
|
import pt.whatsms.gateway.domain.EntitySource
|
||||||
import me.capcom.smsgateway.modules.gateway.GatewayApi
|
import pt.whatsms.gateway.modules.gateway.GatewayApi
|
||||||
import me.capcom.smsgateway.modules.gateway.GatewayService
|
import pt.whatsms.gateway.modules.gateway.GatewayService
|
||||||
import me.capcom.smsgateway.modules.webhooks.WebHooksService
|
import pt.whatsms.gateway.modules.webhooks.WebHooksService
|
||||||
import me.capcom.smsgateway.modules.webhooks.domain.WebHookDTO
|
import pt.whatsms.gateway.modules.webhooks.domain.WebHookDTO
|
||||||
import org.koin.core.component.KoinComponent
|
import org.koin.core.component.KoinComponent
|
||||||
import org.koin.core.component.get
|
import org.koin.core.component.get
|
||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
+6
-6
@@ -1,10 +1,10 @@
|
|||||||
package me.capcom.smsgateway.modules.health
|
package pt.whatsms.gateway.modules.health
|
||||||
|
|
||||||
import me.capcom.smsgateway.modules.connection.ConnectionService
|
import pt.whatsms.gateway.modules.connection.ConnectionService
|
||||||
import me.capcom.smsgateway.modules.health.domain.HealthResult
|
import pt.whatsms.gateway.modules.health.domain.HealthResult
|
||||||
import me.capcom.smsgateway.modules.health.domain.Status
|
import pt.whatsms.gateway.modules.health.domain.Status
|
||||||
import me.capcom.smsgateway.modules.health.monitors.BatteryMonitor
|
import pt.whatsms.gateway.modules.health.monitors.BatteryMonitor
|
||||||
import me.capcom.smsgateway.modules.messages.MessagesService
|
import pt.whatsms.gateway.modules.messages.MessagesService
|
||||||
|
|
||||||
class HealthService(
|
class HealthService(
|
||||||
private val messagesSvc: MessagesService,
|
private val messagesSvc: MessagesService,
|
||||||
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
import me.capcom.smsgateway.modules.health.HealthService
|
import pt.whatsms.gateway.modules.health.HealthService
|
||||||
import me.capcom.smsgateway.modules.health.monitors.BatteryMonitor
|
import pt.whatsms.gateway.modules.health.monitors.BatteryMonitor
|
||||||
import org.koin.core.module.dsl.singleOf
|
import org.koin.core.module.dsl.singleOf
|
||||||
import org.koin.dsl.module
|
import org.koin.dsl.module
|
||||||
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.health.domain
|
package pt.whatsms.gateway.modules.health.domain
|
||||||
|
|
||||||
data class CheckResult(
|
data class CheckResult(
|
||||||
val status: Status,
|
val status: Status,
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.health.domain
|
package pt.whatsms.gateway.modules.health.domain
|
||||||
|
|
||||||
data class HealthResult(
|
data class HealthResult(
|
||||||
val status: Status,
|
val status: Status,
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.health.domain
|
package pt.whatsms.gateway.modules.health.domain
|
||||||
|
|
||||||
import com.google.gson.annotations.SerializedName
|
import com.google.gson.annotations.SerializedName
|
||||||
|
|
||||||
+3
-3
@@ -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.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.IntentFilter
|
import android.content.IntentFilter
|
||||||
import android.os.BatteryManager
|
import android.os.BatteryManager
|
||||||
import me.capcom.smsgateway.modules.health.domain.CheckResult
|
import pt.whatsms.gateway.modules.health.domain.CheckResult
|
||||||
import me.capcom.smsgateway.modules.health.domain.Status
|
import pt.whatsms.gateway.modules.health.domain.Status
|
||||||
|
|
||||||
class BatteryMonitor(
|
class BatteryMonitor(
|
||||||
private val context: Context
|
private val context: Context
|
||||||
+5
-5
@@ -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 pt.whatsms.gateway.modules.incoming.db.IncomingMessage
|
||||||
import me.capcom.smsgateway.modules.incoming.db.IncomingMessageType
|
import pt.whatsms.gateway.modules.incoming.db.IncomingMessageType
|
||||||
import me.capcom.smsgateway.modules.incoming.repositories.IncomingMessagesRepository
|
import pt.whatsms.gateway.modules.incoming.repositories.IncomingMessagesRepository
|
||||||
import me.capcom.smsgateway.modules.receiver.data.InboxMessage
|
import pt.whatsms.gateway.modules.receiver.data.InboxMessage
|
||||||
import java.util.UUID
|
import java.util.UUID
|
||||||
|
|
||||||
class IncomingMessagesService(
|
class IncomingMessagesService(
|
||||||
+3
-3
@@ -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 pt.whatsms.gateway.modules.incoming.repositories.IncomingMessagesRepository
|
||||||
import me.capcom.smsgateway.modules.incoming.vm.IncomingMessagesListViewModel
|
import pt.whatsms.gateway.modules.incoming.vm.IncomingMessagesListViewModel
|
||||||
import org.koin.androidx.viewmodel.dsl.viewModelOf
|
import org.koin.androidx.viewmodel.dsl.viewModelOf
|
||||||
import org.koin.core.module.dsl.singleOf
|
import org.koin.core.module.dsl.singleOf
|
||||||
import org.koin.dsl.module
|
import org.koin.dsl.module
|
||||||
+1
-1
@@ -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.Entity
|
||||||
import androidx.room.Index
|
import androidx.room.Index
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.incoming.db
|
package pt.whatsms.gateway.modules.incoming.db
|
||||||
|
|
||||||
data class IncomingMessageTotals(
|
data class IncomingMessageTotals(
|
||||||
val total: Long,
|
val total: Long,
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.incoming.db
|
package pt.whatsms.gateway.modules.incoming.db
|
||||||
|
|
||||||
import androidx.lifecycle.LiveData
|
import androidx.lifecycle.LiveData
|
||||||
import androidx.room.Dao
|
import androidx.room.Dao
|
||||||
+5
-5
@@ -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.LiveData
|
||||||
import androidx.lifecycle.distinctUntilChanged
|
import androidx.lifecycle.distinctUntilChanged
|
||||||
import me.capcom.smsgateway.modules.incoming.db.IncomingMessage
|
import pt.whatsms.gateway.modules.incoming.db.IncomingMessage
|
||||||
import me.capcom.smsgateway.modules.incoming.db.IncomingMessageTotals
|
import pt.whatsms.gateway.modules.incoming.db.IncomingMessageTotals
|
||||||
import me.capcom.smsgateway.modules.incoming.db.IncomingMessageType
|
import pt.whatsms.gateway.modules.incoming.db.IncomingMessageType
|
||||||
import me.capcom.smsgateway.modules.incoming.db.IncomingMessagesDao
|
import pt.whatsms.gateway.modules.incoming.db.IncomingMessagesDao
|
||||||
|
|
||||||
class IncomingMessagesRepository(private val dao: IncomingMessagesDao) {
|
class IncomingMessagesRepository(private val dao: IncomingMessagesDao) {
|
||||||
fun selectLast(limit: Int): LiveData<List<IncomingMessage>> =
|
fun selectLast(limit: Int): LiveData<List<IncomingMessage>> =
|
||||||
+4
-4
@@ -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.LiveData
|
||||||
import androidx.lifecycle.MediatorLiveData
|
import androidx.lifecycle.MediatorLiveData
|
||||||
import androidx.lifecycle.MutableLiveData
|
import androidx.lifecycle.MutableLiveData
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
import androidx.lifecycle.switchMap
|
import androidx.lifecycle.switchMap
|
||||||
import me.capcom.smsgateway.modules.incoming.db.IncomingMessage
|
import pt.whatsms.gateway.modules.incoming.db.IncomingMessage
|
||||||
import me.capcom.smsgateway.modules.incoming.db.IncomingMessageTotals
|
import pt.whatsms.gateway.modules.incoming.db.IncomingMessageTotals
|
||||||
import me.capcom.smsgateway.modules.incoming.repositories.IncomingMessagesRepository
|
import pt.whatsms.gateway.modules.incoming.repositories.IncomingMessagesRepository
|
||||||
|
|
||||||
class IncomingMessagesListViewModel(
|
class IncomingMessagesListViewModel(
|
||||||
private val repository: IncomingMessagesRepository,
|
private val repository: IncomingMessagesRepository,
|
||||||
+5
-5
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.localserver
|
package pt.whatsms.gateway.modules.localserver
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
@@ -6,10 +6,10 @@ import kotlinx.coroutines.CoroutineScope
|
|||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.SupervisorJob
|
import kotlinx.coroutines.SupervisorJob
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import me.capcom.smsgateway.modules.events.EventBus
|
import pt.whatsms.gateway.modules.events.EventBus
|
||||||
import me.capcom.smsgateway.modules.localserver.events.IPReceivedEvent
|
import pt.whatsms.gateway.modules.localserver.events.IPReceivedEvent
|
||||||
import me.capcom.smsgateway.providers.LocalIPProvider
|
import pt.whatsms.gateway.providers.LocalIPProvider
|
||||||
import me.capcom.smsgateway.providers.PublicIPProvider
|
import pt.whatsms.gateway.providers.PublicIPProvider
|
||||||
|
|
||||||
class LocalServerService(
|
class LocalServerService(
|
||||||
private val settings: LocalServerSettings,
|
private val settings: LocalServerSettings,
|
||||||
+3
-3
@@ -1,8 +1,8 @@
|
|||||||
package me.capcom.smsgateway.modules.localserver
|
package pt.whatsms.gateway.modules.localserver
|
||||||
|
|
||||||
import com.aventrix.jnanoid.jnanoid.NanoIdUtils
|
import com.aventrix.jnanoid.jnanoid.NanoIdUtils
|
||||||
import me.capcom.smsgateway.modules.settings.KeyValueStorage
|
import pt.whatsms.gateway.modules.settings.KeyValueStorage
|
||||||
import me.capcom.smsgateway.modules.settings.get
|
import pt.whatsms.gateway.modules.settings.get
|
||||||
|
|
||||||
class LocalServerSettings(
|
class LocalServerSettings(
|
||||||
private val storage: KeyValueStorage,
|
private val storage: KeyValueStorage,
|
||||||
+1
-1
@@ -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.core.module.dsl.singleOf
|
||||||
import org.koin.dsl.module
|
import org.koin.dsl.module
|
||||||
+19
-19
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.localserver
|
package pt.whatsms.gateway.modules.localserver
|
||||||
|
|
||||||
import android.app.Service
|
import android.app.Service
|
||||||
import android.content.Context
|
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.route
|
||||||
import io.ktor.server.routing.routing
|
import io.ktor.server.routing.routing
|
||||||
import io.ktor.util.date.GMTDate
|
import io.ktor.util.date.GMTDate
|
||||||
import me.capcom.smsgateway.R
|
import pt.whatsms.gateway.R
|
||||||
import me.capcom.smsgateway.domain.HealthResponse
|
import pt.whatsms.gateway.domain.HealthResponse
|
||||||
import me.capcom.smsgateway.extensions.configure
|
import pt.whatsms.gateway.extensions.configure
|
||||||
import me.capcom.smsgateway.modules.health.HealthService
|
import pt.whatsms.gateway.modules.health.HealthService
|
||||||
import me.capcom.smsgateway.modules.health.domain.Status
|
import pt.whatsms.gateway.modules.health.domain.Status
|
||||||
import me.capcom.smsgateway.modules.localserver.auth.AuthScopes
|
import pt.whatsms.gateway.modules.localserver.auth.AuthScopes
|
||||||
import me.capcom.smsgateway.modules.localserver.auth.JwtService
|
import pt.whatsms.gateway.modules.localserver.auth.JwtService
|
||||||
import me.capcom.smsgateway.modules.localserver.auth.requireScope
|
import pt.whatsms.gateway.modules.localserver.auth.requireScope
|
||||||
import me.capcom.smsgateway.modules.localserver.domain.Device
|
import pt.whatsms.gateway.modules.localserver.domain.Device
|
||||||
import me.capcom.smsgateway.modules.localserver.routes.AuthRoutes
|
import pt.whatsms.gateway.modules.localserver.routes.AuthRoutes
|
||||||
import me.capcom.smsgateway.modules.localserver.routes.DocsRoutes
|
import pt.whatsms.gateway.modules.localserver.routes.DocsRoutes
|
||||||
import me.capcom.smsgateway.modules.localserver.routes.InboxRoutes
|
import pt.whatsms.gateway.modules.localserver.routes.InboxRoutes
|
||||||
import me.capcom.smsgateway.modules.localserver.routes.LogsRoutes
|
import pt.whatsms.gateway.modules.localserver.routes.LogsRoutes
|
||||||
import me.capcom.smsgateway.modules.localserver.routes.MessagesRoutes
|
import pt.whatsms.gateway.modules.localserver.routes.MessagesRoutes
|
||||||
import me.capcom.smsgateway.modules.localserver.routes.WebhooksRoutes
|
import pt.whatsms.gateway.modules.localserver.routes.WebhooksRoutes
|
||||||
import me.capcom.smsgateway.modules.notifications.NotificationsService
|
import pt.whatsms.gateway.modules.notifications.NotificationsService
|
||||||
import org.koin.android.ext.android.get
|
import org.koin.android.ext.android.get
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
@@ -108,7 +108,7 @@ class WebService : Service() {
|
|||||||
}
|
}
|
||||||
install(ContentNegotiation) {
|
install(ContentNegotiation) {
|
||||||
gson {
|
gson {
|
||||||
if (me.capcom.smsgateway.BuildConfig.DEBUG) {
|
if (pt.whatsms.gateway.BuildConfig.DEBUG) {
|
||||||
setPrettyPrinting()
|
setPrettyPrinting()
|
||||||
}
|
}
|
||||||
configure()
|
configure()
|
||||||
@@ -196,7 +196,7 @@ class WebService : Service() {
|
|||||||
LogsRoutes(get()).register(this)
|
LogsRoutes(get()).register(this)
|
||||||
}
|
}
|
||||||
route("/settings") {
|
route("/settings") {
|
||||||
me.capcom.smsgateway.modules.localserver.routes.SettingsRoutes(get())
|
pt.whatsms.gateway.modules.localserver.routes.SettingsRoutes(get())
|
||||||
.register(this)
|
.register(this)
|
||||||
}
|
}
|
||||||
route("/docs") {
|
route("/docs") {
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.localserver.auth
|
package pt.whatsms.gateway.modules.localserver.auth
|
||||||
|
|
||||||
enum class AuthScopes(val value: String) {
|
enum class AuthScopes(val value: String) {
|
||||||
AllAny("all:any"),
|
AllAny("all:any"),
|
||||||
+4
-4
@@ -1,12 +1,12 @@
|
|||||||
package me.capcom.smsgateway.modules.localserver.auth
|
package pt.whatsms.gateway.modules.localserver.auth
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import com.auth0.jwt.JWT
|
import com.auth0.jwt.JWT
|
||||||
import com.auth0.jwt.algorithms.Algorithm
|
import com.auth0.jwt.algorithms.Algorithm
|
||||||
import com.aventrix.jnanoid.jnanoid.NanoIdUtils
|
import com.aventrix.jnanoid.jnanoid.NanoIdUtils
|
||||||
import me.capcom.smsgateway.data.dao.TokensDao
|
import pt.whatsms.gateway.data.dao.TokensDao
|
||||||
import me.capcom.smsgateway.data.entities.Token
|
import pt.whatsms.gateway.data.entities.Token
|
||||||
import me.capcom.smsgateway.modules.localserver.LocalServerSettings
|
import pt.whatsms.gateway.modules.localserver.LocalServerSettings
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
|
|
||||||
data class GeneratedToken(
|
data class GeneratedToken(
|
||||||
+1
-1
@@ -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.http.HttpStatusCode
|
||||||
import io.ktor.server.application.ApplicationCall
|
import io.ktor.server.application.ApplicationCall
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.localserver.domain
|
package pt.whatsms.gateway.modules.localserver.domain
|
||||||
|
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
|
|
||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
package me.capcom.smsgateway.modules.localserver.domain
|
package pt.whatsms.gateway.modules.localserver.domain
|
||||||
|
|
||||||
import com.google.gson.JsonElement
|
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
|
import java.util.Date
|
||||||
|
|
||||||
data class GetLogsResponse(
|
data class GetLogsResponse(
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.localserver.domain
|
package pt.whatsms.gateway.modules.localserver.domain
|
||||||
|
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
|
|
||||||
+1
-1
@@ -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 com.google.gson.annotations.SerializedName
|
||||||
|
|
||||||
+1
-1
@@ -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 com.google.gson.annotations.SerializedName
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.localserver.domain.messages
|
package pt.whatsms.gateway.modules.localserver.domain.messages
|
||||||
|
|
||||||
data class DataMessage(
|
data class DataMessage(
|
||||||
val data: String, // Base64-encoded payload
|
val data: String, // Base64-encoded payload
|
||||||
+5
@@ -0,0 +1,5 @@
|
|||||||
|
package pt.whatsms.gateway.modules.localserver.domain.messages
|
||||||
|
|
||||||
|
data class HashedMessage(
|
||||||
|
val hash: String,
|
||||||
|
)
|
||||||
+2
-2
@@ -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
|
import java.util.Date
|
||||||
|
|
||||||
open class Message(
|
open class Message(
|
||||||
+1
-1
@@ -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 com.google.gson.annotations.SerializedName
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
+5
@@ -0,0 +1,5 @@
|
|||||||
|
package pt.whatsms.gateway.modules.localserver.domain.messages
|
||||||
|
|
||||||
|
data class TextMessage(
|
||||||
|
val text: String,
|
||||||
|
)
|
||||||
+2
-2
@@ -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(
|
class IPReceivedEvent(
|
||||||
val localIP: String?,
|
val localIP: String?,
|
||||||
+6
-6
@@ -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.http.HttpStatusCode
|
||||||
import io.ktor.server.application.call
|
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.delete
|
||||||
import io.ktor.server.routing.post
|
import io.ktor.server.routing.post
|
||||||
import io.ktor.server.routing.route
|
import io.ktor.server.routing.route
|
||||||
import me.capcom.smsgateway.modules.localserver.auth.AuthScopes
|
import pt.whatsms.gateway.modules.localserver.auth.AuthScopes
|
||||||
import me.capcom.smsgateway.modules.localserver.auth.JwtService
|
import pt.whatsms.gateway.modules.localserver.auth.JwtService
|
||||||
import me.capcom.smsgateway.modules.localserver.auth.requireScope
|
import pt.whatsms.gateway.modules.localserver.auth.requireScope
|
||||||
import me.capcom.smsgateway.modules.localserver.domain.TokenRequest
|
import pt.whatsms.gateway.modules.localserver.domain.TokenRequest
|
||||||
import me.capcom.smsgateway.modules.localserver.domain.TokenResponse
|
import pt.whatsms.gateway.modules.localserver.domain.TokenResponse
|
||||||
|
|
||||||
class AuthRoutes(
|
class AuthRoutes(
|
||||||
private val jwtService: JwtService,
|
private val jwtService: JwtService,
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.localserver.routes
|
package pt.whatsms.gateway.modules.localserver.routes
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import io.ktor.http.ContentType
|
import io.ktor.http.ContentType
|
||||||
+10
-10
@@ -1,4 +1,4 @@
|
|||||||
package me.capcom.smsgateway.modules.localserver.routes
|
package pt.whatsms.gateway.modules.localserver.routes
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import io.ktor.http.HttpStatusCode
|
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.get
|
||||||
import io.ktor.server.routing.post
|
import io.ktor.server.routing.post
|
||||||
import kotlinx.coroutines.CancellationException
|
import kotlinx.coroutines.CancellationException
|
||||||
import me.capcom.smsgateway.helpers.DateTimeParser
|
import pt.whatsms.gateway.helpers.DateTimeParser
|
||||||
import me.capcom.smsgateway.modules.incoming.IncomingMessagesService
|
import pt.whatsms.gateway.modules.incoming.IncomingMessagesService
|
||||||
import me.capcom.smsgateway.modules.incoming.db.IncomingMessage
|
import pt.whatsms.gateway.modules.incoming.db.IncomingMessage
|
||||||
import me.capcom.smsgateway.modules.incoming.db.IncomingMessageType
|
import pt.whatsms.gateway.modules.incoming.db.IncomingMessageType
|
||||||
import me.capcom.smsgateway.modules.localserver.LocalServerSettings
|
import pt.whatsms.gateway.modules.localserver.LocalServerSettings
|
||||||
import me.capcom.smsgateway.modules.localserver.auth.AuthScopes
|
import pt.whatsms.gateway.modules.localserver.auth.AuthScopes
|
||||||
import me.capcom.smsgateway.modules.localserver.auth.requireScope
|
import pt.whatsms.gateway.modules.localserver.auth.requireScope
|
||||||
import me.capcom.smsgateway.modules.localserver.domain.PostMessagesInboxExportRequest
|
import pt.whatsms.gateway.modules.localserver.domain.PostMessagesInboxExportRequest
|
||||||
import me.capcom.smsgateway.modules.receiver.ReceiverService
|
import pt.whatsms.gateway.modules.receiver.ReceiverService
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
|
|
||||||
class InboxRoutes(
|
class InboxRoutes(
|
||||||
+6
-6
@@ -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.http.HttpStatusCode
|
||||||
import io.ktor.server.application.call
|
import io.ktor.server.application.call
|
||||||
import io.ktor.server.response.respond
|
import io.ktor.server.response.respond
|
||||||
import io.ktor.server.routing.Route
|
import io.ktor.server.routing.Route
|
||||||
import io.ktor.server.routing.get
|
import io.ktor.server.routing.get
|
||||||
import me.capcom.smsgateway.helpers.DateTimeParser
|
import pt.whatsms.gateway.helpers.DateTimeParser
|
||||||
import me.capcom.smsgateway.modules.localserver.auth.AuthScopes
|
import pt.whatsms.gateway.modules.localserver.auth.AuthScopes
|
||||||
import me.capcom.smsgateway.modules.localserver.auth.requireScope
|
import pt.whatsms.gateway.modules.localserver.auth.requireScope
|
||||||
import me.capcom.smsgateway.modules.localserver.domain.GetLogsResponse
|
import pt.whatsms.gateway.modules.localserver.domain.GetLogsResponse
|
||||||
import me.capcom.smsgateway.modules.logs.LogsService
|
import pt.whatsms.gateway.modules.logs.LogsService
|
||||||
|
|
||||||
class LogsRoutes(
|
class LogsRoutes(
|
||||||
private val logsService: LogsService,
|
private val logsService: LogsService,
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user