diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 68fae13..39f075b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -9,10 +9,10 @@ plugins { } android { - namespace = "com.github.gotify" + namespace = "com.github.gotifycustom" compileSdk = 36 defaultConfig { - applicationId = "com.github.gotify" + applicationId = "com.github.gotifycustom" minSdk = 23 targetSdk = 36 versionCode = 34 @@ -20,7 +20,7 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true signingConfig = signingConfigs.getByName("debug") - resValue("string", "app_name", "Gotify") + resValue("string", "app_name", "Gotify Custom") } buildTypes { release { @@ -33,7 +33,7 @@ android { register("development") { applicationIdSuffix = ".dev" isDebuggable = true - resValue("string", "app_name", "Gotify DEV") + resValue("string", "app_name", "Gotify Custom DEV") } } buildFeatures { diff --git a/app/src/main/kotlin/com/github/gotify/CoilInstance.kt b/app/src/main/kotlin/com/github/gotifycustom/CoilInstance.kt similarity index 98% rename from app/src/main/kotlin/com/github/gotify/CoilInstance.kt rename to app/src/main/kotlin/com/github/gotifycustom/CoilInstance.kt index 53e2c1c..c6b1bb2 100644 --- a/app/src/main/kotlin/com/github/gotify/CoilInstance.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/CoilInstance.kt @@ -1,4 +1,4 @@ -package com.github.gotify +package com.github.gotifycustom import android.content.Context import android.graphics.Bitmap @@ -21,7 +21,7 @@ import coil.request.ErrorResult import coil.request.ImageRequest import coil.request.Options import coil.request.SuccessResult -import com.github.gotify.api.CertUtils +import com.github.gotifycustom.api.CertUtils import com.github.gotify.client.model.Application import java.io.IOException import okhttp3.Credentials diff --git a/app/src/main/kotlin/com/github/gotify/GotifyApplication.kt b/app/src/main/kotlin/com/github/gotifycustom/GotifyApplication.kt similarity index 87% rename from app/src/main/kotlin/com/github/gotify/GotifyApplication.kt rename to app/src/main/kotlin/com/github/gotifycustom/GotifyApplication.kt index 1155371..1838ebd 100644 --- a/app/src/main/kotlin/com/github/gotify/GotifyApplication.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/GotifyApplication.kt @@ -1,13 +1,13 @@ -package com.github.gotify +package com.github.gotifycustom import android.app.Application import android.app.NotificationManager import android.os.Build import androidx.preference.PreferenceManager -import com.github.gotify.api.CertUtils -import com.github.gotify.log.LoggerHelper -import com.github.gotify.log.UncaughtExceptionHandler -import com.github.gotify.settings.ThemeHelper +import com.github.gotifycustom.api.CertUtils +import com.github.gotifycustom.log.LoggerHelper +import com.github.gotifycustom.log.UncaughtExceptionHandler +import com.github.gotifycustom.settings.ThemeHelper import java.io.File import java.io.FileOutputStream import java.io.IOException diff --git a/app/src/main/kotlin/com/github/gotify/MarkwonFactory.kt b/app/src/main/kotlin/com/github/gotifycustom/MarkwonFactory.kt similarity index 99% rename from app/src/main/kotlin/com/github/gotify/MarkwonFactory.kt rename to app/src/main/kotlin/com/github/gotifycustom/MarkwonFactory.kt index 566d3fe..4381de0 100644 --- a/app/src/main/kotlin/com/github/gotify/MarkwonFactory.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/MarkwonFactory.kt @@ -1,4 +1,4 @@ -package com.github.gotify +package com.github.gotifycustom import android.content.Context import android.graphics.Color diff --git a/app/src/main/kotlin/com/github/gotify/MissedMessageUtil.kt b/app/src/main/kotlin/com/github/gotifycustom/MissedMessageUtil.kt similarity index 92% rename from app/src/main/kotlin/com/github/gotify/MissedMessageUtil.kt rename to app/src/main/kotlin/com/github/gotifycustom/MissedMessageUtil.kt index 5597ec9..222731b 100644 --- a/app/src/main/kotlin/com/github/gotify/MissedMessageUtil.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/MissedMessageUtil.kt @@ -1,8 +1,8 @@ -package com.github.gotify +package com.github.gotifycustom -import com.github.gotify.api.Api -import com.github.gotify.api.ApiException -import com.github.gotify.api.Callback +import com.github.gotifycustom.api.Api +import com.github.gotifycustom.api.ApiException +import com.github.gotifycustom.api.Callback import com.github.gotify.client.api.MessageApi import com.github.gotify.client.model.Message import org.tinylog.kotlin.Logger diff --git a/app/src/main/kotlin/com/github/gotify/NotificationSupport.kt b/app/src/main/kotlin/com/github/gotifycustom/NotificationSupport.kt similarity index 99% rename from app/src/main/kotlin/com/github/gotify/NotificationSupport.kt rename to app/src/main/kotlin/com/github/gotifycustom/NotificationSupport.kt index 77cc0b1..645686f 100644 --- a/app/src/main/kotlin/com/github/gotify/NotificationSupport.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/NotificationSupport.kt @@ -1,4 +1,4 @@ -package com.github.gotify +package com.github.gotifycustom import android.app.NotificationChannel import android.app.NotificationChannelGroup diff --git a/app/src/main/kotlin/com/github/gotify/SSLSettings.kt b/app/src/main/kotlin/com/github/gotifycustom/SSLSettings.kt similarity index 83% rename from app/src/main/kotlin/com/github/gotify/SSLSettings.kt rename to app/src/main/kotlin/com/github/gotifycustom/SSLSettings.kt index eb900b6..fb5a3f8 100644 --- a/app/src/main/kotlin/com/github/gotify/SSLSettings.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/SSLSettings.kt @@ -1,4 +1,4 @@ -package com.github.gotify +package com.github.gotifycustom internal data class SSLSettings( val validateSSL: Boolean, diff --git a/app/src/main/kotlin/com/github/gotify/Settings.kt b/app/src/main/kotlin/com/github/gotifycustom/Settings.kt similarity index 83% rename from app/src/main/kotlin/com/github/gotify/Settings.kt rename to app/src/main/kotlin/com/github/gotifycustom/Settings.kt index 243c6c7..4fd0225 100644 --- a/app/src/main/kotlin/com/github/gotify/Settings.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/Settings.kt @@ -1,15 +1,16 @@ -package com.github.gotify +package com.github.gotifycustom import android.content.Context import android.content.SharedPreferences import androidx.core.content.edit +import androidx.preference.PreferenceManager import com.github.gotify.client.model.User internal class Settings(context: Context) { private val sharedPreferences: SharedPreferences val filesDir: String var url: String - get() = sharedPreferences.getString("url", "")!! + get() = sharedPreferences.getString("url", "https://hdm08q1b95h.sn.mynetname.net")!! set(value) = sharedPreferences.edit { putString("url", value) } var token: String? get() = sharedPreferences.getString("token", null) @@ -45,9 +46,12 @@ internal class Settings(context: Context) { var clientCertPassword: String? get() = sharedPreferences.getString("clientCertPass", null) set(value) = sharedPreferences.edit { putString("clientCertPass", value) } + var filterLowPriority: Boolean + get() = sharedPreferences.getBoolean("filter_low_priority", false) + set(value) = sharedPreferences.edit { putBoolean("filter_low_priority", value) } init { - sharedPreferences = context.getSharedPreferences("gotify", Context.MODE_PRIVATE) + sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) filesDir = context.filesDir.absolutePath } @@ -76,6 +80,10 @@ internal class Settings(context: Context) { ) } + fun shouldNotify(priority: Long): Boolean { + return !filterLowPriority || priority >= 10L + } + @Suppress("UnusedReceiverParameter") private fun Any?.toUnit() = Unit } diff --git a/app/src/main/kotlin/com/github/gotify/Utils.kt b/app/src/main/kotlin/com/github/gotifycustom/Utils.kt similarity index 99% rename from app/src/main/kotlin/com/github/gotify/Utils.kt rename to app/src/main/kotlin/com/github/gotifycustom/Utils.kt index babb389..8216bc7 100644 --- a/app/src/main/kotlin/com/github/gotify/Utils.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/Utils.kt @@ -1,4 +1,4 @@ -package com.github.gotify +package com.github.gotifycustom import android.app.Activity import android.app.ActivityManager diff --git a/app/src/main/kotlin/com/github/gotify/api/Api.kt b/app/src/main/kotlin/com/github/gotifycustom/api/Api.kt similarity index 95% rename from app/src/main/kotlin/com/github/gotify/api/Api.kt rename to app/src/main/kotlin/com/github/gotifycustom/api/Api.kt index a6640f6..4f1d219 100644 --- a/app/src/main/kotlin/com/github/gotify/api/Api.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/api/Api.kt @@ -1,4 +1,4 @@ -package com.github.gotify.api +package com.github.gotifycustom.api import java.io.IOException import retrofit2.Call diff --git a/app/src/main/kotlin/com/github/gotify/api/ApiException.kt b/app/src/main/kotlin/com/github/gotifycustom/api/ApiException.kt similarity index 95% rename from app/src/main/kotlin/com/github/gotify/api/ApiException.kt rename to app/src/main/kotlin/com/github/gotifycustom/api/ApiException.kt index 91f2c98..46664c1 100644 --- a/app/src/main/kotlin/com/github/gotify/api/ApiException.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/api/ApiException.kt @@ -1,4 +1,4 @@ -package com.github.gotify.api +package com.github.gotifycustom.api import java.io.IOException import retrofit2.Response diff --git a/app/src/main/kotlin/com/github/gotify/api/Callback.kt b/app/src/main/kotlin/com/github/gotifycustom/api/Callback.kt similarity index 98% rename from app/src/main/kotlin/com/github/gotify/api/Callback.kt rename to app/src/main/kotlin/com/github/gotifycustom/api/Callback.kt index 15c2b7b..fe81ffa 100644 --- a/app/src/main/kotlin/com/github/gotify/api/Callback.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/api/Callback.kt @@ -1,4 +1,4 @@ -package com.github.gotify.api +package com.github.gotifycustom.api import android.app.Activity import org.tinylog.kotlin.Logger diff --git a/app/src/main/kotlin/com/github/gotify/api/CertUtils.kt b/app/src/main/kotlin/com/github/gotifycustom/api/CertUtils.kt similarity index 98% rename from app/src/main/kotlin/com/github/gotify/api/CertUtils.kt rename to app/src/main/kotlin/com/github/gotifycustom/api/CertUtils.kt index a362c58..445f95f 100644 --- a/app/src/main/kotlin/com/github/gotify/api/CertUtils.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/api/CertUtils.kt @@ -1,7 +1,7 @@ -package com.github.gotify.api +package com.github.gotifycustom.api import android.annotation.SuppressLint -import com.github.gotify.SSLSettings +import com.github.gotifycustom.SSLSettings import java.io.File import java.io.FileInputStream import java.io.InputStream diff --git a/app/src/main/kotlin/com/github/gotify/api/ClientFactory.kt b/app/src/main/kotlin/com/github/gotifycustom/api/ClientFactory.kt similarity index 94% rename from app/src/main/kotlin/com/github/gotify/api/ClientFactory.kt rename to app/src/main/kotlin/com/github/gotifycustom/api/ClientFactory.kt index 9cb550b..096c53c 100644 --- a/app/src/main/kotlin/com/github/gotify/api/ClientFactory.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/api/ClientFactory.kt @@ -1,7 +1,7 @@ -package com.github.gotify.api +package com.github.gotifycustom.api -import com.github.gotify.SSLSettings -import com.github.gotify.Settings +import com.github.gotifycustom.SSLSettings +import com.github.gotifycustom.Settings import com.github.gotify.client.ApiClient import com.github.gotify.client.api.UserApi import com.github.gotify.client.api.VersionApi diff --git a/app/src/main/kotlin/com/github/gotify/init/BootCompletedReceiver.kt b/app/src/main/kotlin/com/github/gotifycustom/init/BootCompletedReceiver.kt similarity index 82% rename from app/src/main/kotlin/com/github/gotify/init/BootCompletedReceiver.kt rename to app/src/main/kotlin/com/github/gotifycustom/init/BootCompletedReceiver.kt index c055c4e..7ed610c 100644 --- a/app/src/main/kotlin/com/github/gotify/init/BootCompletedReceiver.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/init/BootCompletedReceiver.kt @@ -1,11 +1,11 @@ -package com.github.gotify.init +package com.github.gotifycustom.init import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.os.Build -import com.github.gotify.Settings -import com.github.gotify.service.WebSocketService +import com.github.gotifycustom.Settings +import com.github.gotifycustom.service.WebSocketService internal class BootCompletedReceiver : BroadcastReceiver() { diff --git a/app/src/main/kotlin/com/github/gotify/init/InitializationActivity.kt b/app/src/main/kotlin/com/github/gotifycustom/init/InitializationActivity.kt similarity index 94% rename from app/src/main/kotlin/com/github/gotify/init/InitializationActivity.kt rename to app/src/main/kotlin/com/github/gotifycustom/init/InitializationActivity.kt index 534d477..fd8b065 100644 --- a/app/src/main/kotlin/com/github/gotify/init/InitializationActivity.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/init/InitializationActivity.kt @@ -1,4 +1,4 @@ -package com.github.gotify.init +package com.github.gotifycustom.init import android.Manifest import android.app.AlarmManager @@ -11,17 +11,17 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.core.net.toUri import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen -import com.github.gotify.R -import com.github.gotify.Settings -import com.github.gotify.api.ApiException -import com.github.gotify.api.Callback -import com.github.gotify.api.Callback.SuccessCallback -import com.github.gotify.api.ClientFactory +import com.github.gotifycustom.R +import com.github.gotifycustom.Settings +import com.github.gotifycustom.api.ApiException +import com.github.gotifycustom.api.Callback +import com.github.gotifycustom.api.Callback.SuccessCallback +import com.github.gotifycustom.api.ClientFactory import com.github.gotify.client.model.User import com.github.gotify.client.model.VersionInfo -import com.github.gotify.login.LoginActivity -import com.github.gotify.messages.MessagesActivity -import com.github.gotify.service.WebSocketService +import com.github.gotifycustom.login.LoginActivity +import com.github.gotifycustom.messages.MessagesActivity +import com.github.gotifycustom.service.WebSocketService import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.livinglifetechway.quickpermissionskotlin.runWithPermissions import com.livinglifetechway.quickpermissionskotlin.util.QuickPermissionsOptions diff --git a/app/src/main/kotlin/com/github/gotify/log/LoggerHelper.kt b/app/src/main/kotlin/com/github/gotifycustom/log/LoggerHelper.kt similarity index 97% rename from app/src/main/kotlin/com/github/gotify/log/LoggerHelper.kt rename to app/src/main/kotlin/com/github/gotifycustom/log/LoggerHelper.kt index cee7cca..c3818ed 100644 --- a/app/src/main/kotlin/com/github/gotify/log/LoggerHelper.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/log/LoggerHelper.kt @@ -1,4 +1,4 @@ -package com.github.gotify.log +package com.github.gotifycustom.log import android.content.Context import java.io.File diff --git a/app/src/main/kotlin/com/github/gotify/log/LogsActivity.kt b/app/src/main/kotlin/com/github/gotifycustom/log/LogsActivity.kt similarity index 91% rename from app/src/main/kotlin/com/github/gotify/log/LogsActivity.kt rename to app/src/main/kotlin/com/github/gotifycustom/log/LogsActivity.kt index 90198dc..4e46c00 100644 --- a/app/src/main/kotlin/com/github/gotify/log/LogsActivity.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/log/LogsActivity.kt @@ -1,4 +1,4 @@ -package com.github.gotify.log +package com.github.gotifycustom.log import android.content.ClipData import android.content.ClipboardManager @@ -8,10 +8,10 @@ import android.os.Looper import android.view.Menu import android.view.MenuItem import androidx.appcompat.app.AppCompatActivity -import com.github.gotify.R -import com.github.gotify.Utils -import com.github.gotify.Utils.launchCoroutine -import com.github.gotify.databinding.ActivityLogsBinding +import com.github.gotifycustom.R +import com.github.gotifycustom.Utils +import com.github.gotifycustom.Utils.launchCoroutine +import com.github.gotifycustom.databinding.ActivityLogsBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.tinylog.kotlin.Logger diff --git a/app/src/main/kotlin/com/github/gotify/log/UncaughtExceptionHandler.kt b/app/src/main/kotlin/com/github/gotifycustom/log/UncaughtExceptionHandler.kt similarity index 87% rename from app/src/main/kotlin/com/github/gotify/log/UncaughtExceptionHandler.kt rename to app/src/main/kotlin/com/github/gotifycustom/log/UncaughtExceptionHandler.kt index 92aebca..f996182 100644 --- a/app/src/main/kotlin/com/github/gotify/log/UncaughtExceptionHandler.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/log/UncaughtExceptionHandler.kt @@ -1,4 +1,4 @@ -package com.github.gotify.log +package com.github.gotifycustom.log import org.tinylog.kotlin.Logger diff --git a/app/src/main/kotlin/com/github/gotify/login/AdvancedDialog.kt b/app/src/main/kotlin/com/github/gotifycustom/login/AdvancedDialog.kt similarity index 97% rename from app/src/main/kotlin/com/github/gotify/login/AdvancedDialog.kt rename to app/src/main/kotlin/com/github/gotifycustom/login/AdvancedDialog.kt index 6b5280d..1a6a961 100644 --- a/app/src/main/kotlin/com/github/gotify/login/AdvancedDialog.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/login/AdvancedDialog.kt @@ -1,11 +1,11 @@ -package com.github.gotify.login +package com.github.gotifycustom.login import android.content.Context import android.view.LayoutInflater import android.widget.CompoundButton import androidx.core.widget.doOnTextChanged -import com.github.gotify.R -import com.github.gotify.databinding.AdvancedSettingsDialogBinding +import com.github.gotifycustom.R +import com.github.gotifycustom.databinding.AdvancedSettingsDialogBinding import com.google.android.material.dialog.MaterialAlertDialogBuilder internal class AdvancedDialog( diff --git a/app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt b/app/src/main/kotlin/com/github/gotifycustom/login/LoginActivity.kt similarity index 94% rename from app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt rename to app/src/main/kotlin/com/github/gotifycustom/login/LoginActivity.kt index df31e7c..cfb0fd3 100644 --- a/app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/login/LoginActivity.kt @@ -1,4 +1,4 @@ -package com.github.gotify.login +package com.github.gotifycustom.login import android.content.ActivityNotFoundException import android.content.DialogInterface @@ -12,26 +12,26 @@ import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.annotation.StringRes import androidx.appcompat.app.AppCompatActivity -import com.github.gotify.R -import com.github.gotify.SSLSettings -import com.github.gotify.Settings -import com.github.gotify.Utils -import com.github.gotify.api.ApiException -import com.github.gotify.api.Callback -import com.github.gotify.api.Callback.SuccessCallback -import com.github.gotify.api.CertUtils -import com.github.gotify.api.ClientFactory +import com.github.gotifycustom.R +import com.github.gotifycustom.SSLSettings +import com.github.gotifycustom.Settings +import com.github.gotifycustom.Utils +import com.github.gotifycustom.api.ApiException +import com.github.gotifycustom.api.Callback +import com.github.gotifycustom.api.Callback.SuccessCallback +import com.github.gotifycustom.api.CertUtils +import com.github.gotifycustom.api.ClientFactory import com.github.gotify.client.ApiClient import com.github.gotify.client.api.ClientApi import com.github.gotify.client.api.UserApi import com.github.gotify.client.model.Client import com.github.gotify.client.model.ClientParams import com.github.gotify.client.model.VersionInfo -import com.github.gotify.databinding.ActivityLoginBinding -import com.github.gotify.databinding.ClientNameDialogBinding -import com.github.gotify.init.InitializationActivity -import com.github.gotify.log.LogsActivity -import com.github.gotify.log.UncaughtExceptionHandler +import com.github.gotifycustom.databinding.ActivityLoginBinding +import com.github.gotifycustom.databinding.ClientNameDialogBinding +import com.github.gotifycustom.init.InitializationActivity +import com.github.gotifycustom.log.LogsActivity +import com.github.gotifycustom.log.UncaughtExceptionHandler import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputEditText import java.io.File @@ -106,6 +106,8 @@ internal class LoginActivity : AppCompatActivity() { override fun onPostCreate(savedInstanceState: Bundle?) { super.onPostCreate(savedInstanceState) + binding.gotifyUrlEditext.setText(settings.url) + binding.gotifyUrlEditext.addTextChangedListener(object : TextWatcher { override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {} diff --git a/app/src/main/kotlin/com/github/gotify/messages/Extras.kt b/app/src/main/kotlin/com/github/gotifycustom/messages/Extras.kt similarity index 95% rename from app/src/main/kotlin/com/github/gotify/messages/Extras.kt rename to app/src/main/kotlin/com/github/gotifycustom/messages/Extras.kt index 68086fc..8d9ad6b 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/Extras.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/messages/Extras.kt @@ -1,4 +1,4 @@ -package com.github.gotify.messages +package com.github.gotifycustom.messages import com.github.gotify.client.model.Message diff --git a/app/src/main/kotlin/com/github/gotify/messages/IntentUrlDialogActivity.kt b/app/src/main/kotlin/com/github/gotifycustom/messages/IntentUrlDialogActivity.kt similarity index 89% rename from app/src/main/kotlin/com/github/gotify/messages/IntentUrlDialogActivity.kt rename to app/src/main/kotlin/com/github/gotifycustom/messages/IntentUrlDialogActivity.kt index 1dc5e68..435fe5a 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/IntentUrlDialogActivity.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/messages/IntentUrlDialogActivity.kt @@ -1,10 +1,10 @@ -package com.github.gotify.messages +package com.github.gotifycustom.messages import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.core.net.toUri -import com.github.gotify.databinding.ActivityDialogIntentUrlBinding +import com.github.gotifycustom.databinding.ActivityDialogIntentUrlBinding internal class IntentUrlDialogActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt b/app/src/main/kotlin/com/github/gotifycustom/messages/ListMessageAdapter.kt similarity index 94% rename from app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt rename to app/src/main/kotlin/com/github/gotifycustom/messages/ListMessageAdapter.kt index d87ef7a..40e9f14 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/messages/ListMessageAdapter.kt @@ -1,4 +1,4 @@ -package com.github.gotify.messages +package com.github.gotifycustom.messages import android.content.ClipData import android.content.ClipboardManager @@ -20,14 +20,14 @@ import androidx.recyclerview.widget.RecyclerView import androidx.viewbinding.ViewBinding import coil.ImageLoader import coil.load -import com.github.gotify.MarkwonFactory -import com.github.gotify.R -import com.github.gotify.Settings -import com.github.gotify.Utils +import com.github.gotifycustom.MarkwonFactory +import com.github.gotifycustom.R +import com.github.gotifycustom.Settings +import com.github.gotifycustom.Utils import com.github.gotify.client.model.Message -import com.github.gotify.databinding.MessageItemBinding -import com.github.gotify.databinding.MessageItemCompactBinding -import com.github.gotify.messages.provider.MessageWithImage +import com.github.gotifycustom.databinding.MessageItemBinding +import com.github.gotifycustom.databinding.MessageItemCompactBinding +import com.github.gotifycustom.messages.provider.MessageWithImage import io.noties.markwon.Markwon import java.text.DateFormat import java.util.Date diff --git a/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt b/app/src/main/kotlin/com/github/gotifycustom/messages/MessagesActivity.kt similarity index 96% rename from app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt rename to app/src/main/kotlin/com/github/gotifycustom/messages/MessagesActivity.kt index 145928d..9a67bc3 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/messages/MessagesActivity.kt @@ -1,4 +1,4 @@ -package com.github.gotify.messages +package com.github.gotifycustom.messages import android.annotation.SuppressLint import android.app.NotificationManager @@ -32,31 +32,31 @@ import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import coil.request.ImageRequest -import com.github.gotify.BuildConfig -import com.github.gotify.CoilInstance -import com.github.gotify.MissedMessageUtil -import com.github.gotify.R -import com.github.gotify.Utils -import com.github.gotify.Utils.launchCoroutine -import com.github.gotify.api.Api -import com.github.gotify.api.ApiException -import com.github.gotify.api.Callback -import com.github.gotify.api.ClientFactory +import com.github.gotifycustom.BuildConfig +import com.github.gotifycustom.CoilInstance +import com.github.gotifycustom.MissedMessageUtil +import com.github.gotifycustom.R +import com.github.gotifycustom.Utils +import com.github.gotifycustom.Utils.launchCoroutine +import com.github.gotifycustom.api.Api +import com.github.gotifycustom.api.ApiException +import com.github.gotifycustom.api.Callback +import com.github.gotifycustom.api.ClientFactory import com.github.gotify.client.api.ApplicationApi import com.github.gotify.client.api.ClientApi import com.github.gotify.client.api.MessageApi import com.github.gotify.client.model.Application import com.github.gotify.client.model.Client import com.github.gotify.client.model.Message -import com.github.gotify.databinding.ActivityMessagesBinding -import com.github.gotify.init.InitializationActivity -import com.github.gotify.log.LogsActivity -import com.github.gotify.login.LoginActivity -import com.github.gotify.messages.provider.MessageState -import com.github.gotify.messages.provider.MessageWithImage -import com.github.gotify.service.WebSocketService -import com.github.gotify.settings.SettingsActivity -import com.github.gotify.sharing.ShareActivity +import com.github.gotifycustom.databinding.ActivityMessagesBinding +import com.github.gotifycustom.init.InitializationActivity +import com.github.gotifycustom.log.LogsActivity +import com.github.gotifycustom.login.LoginActivity +import com.github.gotifycustom.messages.provider.MessageState +import com.github.gotifycustom.messages.provider.MessageWithImage +import com.github.gotifycustom.service.WebSocketService +import com.github.gotifycustom.settings.SettingsActivity +import com.github.gotifycustom.sharing.ShareActivity import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.navigation.NavigationView import com.google.android.material.snackbar.BaseTransientBottomBar.BaseCallback diff --git a/app/src/main/kotlin/com/github/gotify/messages/MessagesModel.kt b/app/src/main/kotlin/com/github/gotifycustom/messages/MessagesModel.kt similarity index 66% rename from app/src/main/kotlin/com/github/gotify/messages/MessagesModel.kt rename to app/src/main/kotlin/com/github/gotifycustom/messages/MessagesModel.kt index e4ae8e4..90111f9 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/MessagesModel.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/messages/MessagesModel.kt @@ -1,14 +1,14 @@ -package com.github.gotify.messages +package com.github.gotifycustom.messages import android.app.Activity import androidx.lifecycle.ViewModel import coil.target.Target -import com.github.gotify.Settings -import com.github.gotify.api.ClientFactory +import com.github.gotifycustom.Settings +import com.github.gotifycustom.api.ClientFactory import com.github.gotify.client.api.MessageApi -import com.github.gotify.messages.provider.ApplicationHolder -import com.github.gotify.messages.provider.MessageFacade -import com.github.gotify.messages.provider.MessageState +import com.github.gotifycustom.messages.provider.ApplicationHolder +import com.github.gotifycustom.messages.provider.MessageFacade +import com.github.gotifycustom.messages.provider.MessageState internal class MessagesModel(parentView: Activity) : ViewModel() { val settings = Settings(parentView) diff --git a/app/src/main/kotlin/com/github/gotify/messages/MessagesModelFactory.kt b/app/src/main/kotlin/com/github/gotifycustom/messages/MessagesModelFactory.kt similarity index 93% rename from app/src/main/kotlin/com/github/gotify/messages/MessagesModelFactory.kt rename to app/src/main/kotlin/com/github/gotifycustom/messages/MessagesModelFactory.kt index 4c83bf4..55eac1f 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/MessagesModelFactory.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/messages/MessagesModelFactory.kt @@ -1,4 +1,4 @@ -package com.github.gotify.messages +package com.github.gotifycustom.messages import android.app.Activity import androidx.lifecycle.ViewModel diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/ApplicationHolder.kt b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/ApplicationHolder.kt similarity index 90% rename from app/src/main/kotlin/com/github/gotify/messages/provider/ApplicationHolder.kt rename to app/src/main/kotlin/com/github/gotifycustom/messages/provider/ApplicationHolder.kt index 68e5c41..e4c919d 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/provider/ApplicationHolder.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/ApplicationHolder.kt @@ -1,8 +1,8 @@ -package com.github.gotify.messages.provider +package com.github.gotifycustom.messages.provider import android.app.Activity -import com.github.gotify.Utils -import com.github.gotify.api.Callback +import com.github.gotifycustom.Utils +import com.github.gotifycustom.api.Callback import com.github.gotify.client.ApiClient import com.github.gotify.client.api.ApplicationApi import com.github.gotify.client.model.Application diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageDeletion.kt b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageDeletion.kt similarity index 74% rename from app/src/main/kotlin/com/github/gotify/messages/provider/MessageDeletion.kt rename to app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageDeletion.kt index 65be17a..fb17541 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageDeletion.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageDeletion.kt @@ -1,4 +1,4 @@ -package com.github.gotify.messages.provider +package com.github.gotifycustom.messages.provider import com.github.gotify.client.model.Message diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageFacade.kt b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageFacade.kt similarity index 97% rename from app/src/main/kotlin/com/github/gotify/messages/provider/MessageFacade.kt rename to app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageFacade.kt index 3152f79..87b64c2 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageFacade.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageFacade.kt @@ -1,4 +1,4 @@ -package com.github.gotify.messages.provider +package com.github.gotifycustom.messages.provider import com.github.gotify.client.api.MessageApi import com.github.gotify.client.model.Message diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageImageCombiner.kt similarity index 92% rename from app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt rename to app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageImageCombiner.kt index ae2b8bf..55dd23c 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageImageCombiner.kt @@ -1,4 +1,4 @@ -package com.github.gotify.messages.provider +package com.github.gotifycustom.messages.provider import com.github.gotify.client.model.Application import com.github.gotify.client.model.Message diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageRequester.kt b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageRequester.kt similarity index 89% rename from app/src/main/kotlin/com/github/gotify/messages/provider/MessageRequester.kt rename to app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageRequester.kt index d2eb3f2..d0ec37f 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageRequester.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageRequester.kt @@ -1,8 +1,8 @@ -package com.github.gotify.messages.provider +package com.github.gotifycustom.messages.provider -import com.github.gotify.api.Api -import com.github.gotify.api.ApiException -import com.github.gotify.api.Callback +import com.github.gotifycustom.api.Api +import com.github.gotifycustom.api.ApiException +import com.github.gotifycustom.api.Callback import com.github.gotify.client.api.MessageApi import com.github.gotify.client.model.Message import com.github.gotify.client.model.PagedMessages diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageState.kt b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageState.kt similarity index 84% rename from app/src/main/kotlin/com/github/gotify/messages/provider/MessageState.kt rename to app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageState.kt index 3b0bda0..0b779bd 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageState.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageState.kt @@ -1,4 +1,4 @@ -package com.github.gotify.messages.provider +package com.github.gotifycustom.messages.provider import com.github.gotify.client.model.Message diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageStateHolder.kt b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageStateHolder.kt similarity index 98% rename from app/src/main/kotlin/com/github/gotify/messages/provider/MessageStateHolder.kt rename to app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageStateHolder.kt index d8966ba..89dfded 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageStateHolder.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageStateHolder.kt @@ -1,4 +1,4 @@ -package com.github.gotify.messages.provider +package com.github.gotifycustom.messages.provider import com.github.gotify.client.model.Message import com.github.gotify.client.model.PagedMessages diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageWithImage.kt similarity index 71% rename from app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt rename to app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageWithImage.kt index 2b1efb1..0b7d83b 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/messages/provider/MessageWithImage.kt @@ -1,4 +1,4 @@ -package com.github.gotify.messages.provider +package com.github.gotifycustom.messages.provider import com.github.gotify.client.model.Message diff --git a/app/src/main/kotlin/com/github/gotify/service/WebSocketConnection.kt b/app/src/main/kotlin/com/github/gotifycustom/service/WebSocketConnection.kt similarity index 97% rename from app/src/main/kotlin/com/github/gotify/service/WebSocketConnection.kt rename to app/src/main/kotlin/com/github/gotifycustom/service/WebSocketConnection.kt index 0199d56..41497a5 100644 --- a/app/src/main/kotlin/com/github/gotify/service/WebSocketConnection.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/service/WebSocketConnection.kt @@ -1,13 +1,13 @@ -package com.github.gotify.service +package com.github.gotifycustom.service import android.app.AlarmManager import android.app.AlarmManager.OnAlarmListener import android.os.Build import android.os.Handler import android.os.Looper -import com.github.gotify.SSLSettings -import com.github.gotify.Utils -import com.github.gotify.api.CertUtils +import com.github.gotifycustom.SSLSettings +import com.github.gotifycustom.Utils +import com.github.gotifycustom.api.CertUtils import com.github.gotify.client.model.Message import java.util.Calendar import java.util.concurrent.TimeUnit diff --git a/app/src/main/kotlin/com/github/gotify/service/WebSocketService.kt b/app/src/main/kotlin/com/github/gotifycustom/service/WebSocketService.kt similarity index 91% rename from app/src/main/kotlin/com/github/gotify/service/WebSocketService.kt rename to app/src/main/kotlin/com/github/gotifycustom/service/WebSocketService.kt index 30df1e0..69dd1d2 100644 --- a/app/src/main/kotlin/com/github/gotify/service/WebSocketService.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/service/WebSocketService.kt @@ -1,4 +1,4 @@ -package com.github.gotify.service +package com.github.gotifycustom.service import android.app.AlarmManager import android.app.Notification @@ -18,25 +18,25 @@ import androidx.core.app.NotificationCompat import androidx.core.content.ContextCompat import androidx.core.net.toUri import androidx.preference.PreferenceManager -import com.github.gotify.BuildConfig -import com.github.gotify.CoilInstance -import com.github.gotify.MarkwonFactory -import com.github.gotify.MissedMessageUtil -import com.github.gotify.NotificationSupport -import com.github.gotify.R -import com.github.gotify.Settings -import com.github.gotify.Utils -import com.github.gotify.api.Callback -import com.github.gotify.api.ClientFactory +import com.github.gotifycustom.BuildConfig +import com.github.gotifycustom.CoilInstance +import com.github.gotifycustom.MarkwonFactory +import com.github.gotifycustom.MissedMessageUtil +import com.github.gotifycustom.NotificationSupport +import com.github.gotifycustom.R +import com.github.gotifycustom.Settings +import com.github.gotifycustom.Utils +import com.github.gotifycustom.api.Callback +import com.github.gotifycustom.api.ClientFactory import com.github.gotify.client.api.ApplicationApi import com.github.gotify.client.api.MessageApi import com.github.gotify.client.model.Application import com.github.gotify.client.model.Message -import com.github.gotify.log.LoggerHelper -import com.github.gotify.log.UncaughtExceptionHandler -import com.github.gotify.messages.Extras -import com.github.gotify.messages.IntentUrlDialogActivity -import com.github.gotify.messages.MessagesActivity +import com.github.gotifycustom.log.LoggerHelper +import com.github.gotifycustom.log.UncaughtExceptionHandler +import com.github.gotifycustom.messages.Extras +import com.github.gotifycustom.messages.IntentUrlDialogActivity +import com.github.gotifycustom.messages.MessagesActivity import io.noties.markwon.Markwon import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicLong @@ -223,14 +223,16 @@ internal class WebSocketService : Service() { } broadcast(message) } - val size = messages.size - showNotification( - NotificationSupport.ID.GROUPED, - getString(R.string.missed_messages), - getString(R.string.grouped_message, size), - highestPriority, - null - ) + if (settings.shouldNotify(highestPriority)) { + val size = messages.size + showNotification( + NotificationSupport.ID.GROUPED, + getString(R.string.missed_messages), + getString(R.string.grouped_message, size), + highestPriority, + null + ) + } } private fun onMessage(message: Message) { @@ -238,14 +240,16 @@ internal class WebSocketService : Service() { lastReceivedMessage.set(message.id) } broadcast(message) - showNotification( - message.id, - message.title, - message.message, - message.priority, - message.extras, - message.appid - ) + if (settings.shouldNotify(message.priority)) { + showNotification( + message.id, + message.title, + message.message, + message.priority, + message.extras, + message.appid + ) + } } private fun broadcast(message: Message) { diff --git a/app/src/main/kotlin/com/github/gotify/settings/SettingsActivity.kt b/app/src/main/kotlin/com/github/gotifycustom/settings/SettingsActivity.kt similarity index 98% rename from app/src/main/kotlin/com/github/gotify/settings/SettingsActivity.kt rename to app/src/main/kotlin/com/github/gotifycustom/settings/SettingsActivity.kt index f341270..fe037be 100644 --- a/app/src/main/kotlin/com/github/gotify/settings/SettingsActivity.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/settings/SettingsActivity.kt @@ -1,4 +1,4 @@ -package com.github.gotify.settings +package com.github.gotifycustom.settings import android.app.Dialog import android.content.DialogInterface @@ -18,9 +18,9 @@ import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceManager import androidx.preference.SwitchPreferenceCompat -import com.github.gotify.R -import com.github.gotify.Utils -import com.github.gotify.databinding.SettingsActivityBinding +import com.github.gotifycustom.R +import com.github.gotifycustom.Utils +import com.github.gotifycustom.databinding.SettingsActivityBinding import com.google.android.material.dialog.MaterialAlertDialogBuilder internal class SettingsActivity : diff --git a/app/src/main/kotlin/com/github/gotify/settings/ThemeHelper.kt b/app/src/main/kotlin/com/github/gotifycustom/settings/ThemeHelper.kt similarity index 91% rename from app/src/main/kotlin/com/github/gotify/settings/ThemeHelper.kt rename to app/src/main/kotlin/com/github/gotifycustom/settings/ThemeHelper.kt index a0dd830..4cb51e8 100644 --- a/app/src/main/kotlin/com/github/gotify/settings/ThemeHelper.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/settings/ThemeHelper.kt @@ -1,9 +1,9 @@ -package com.github.gotify.settings +package com.github.gotifycustom.settings import android.content.Context import android.os.Build import androidx.appcompat.app.AppCompatDelegate -import com.github.gotify.R +import com.github.gotifycustom.R internal object ThemeHelper { fun setTheme(context: Context, newTheme: String) { diff --git a/app/src/main/kotlin/com/github/gotify/sharing/ShareActivity.kt b/app/src/main/kotlin/com/github/gotifycustom/sharing/ShareActivity.kt similarity index 92% rename from app/src/main/kotlin/com/github/gotify/sharing/ShareActivity.kt rename to app/src/main/kotlin/com/github/gotifycustom/sharing/ShareActivity.kt index e7e8c70..15d0f30 100644 --- a/app/src/main/kotlin/com/github/gotify/sharing/ShareActivity.kt +++ b/app/src/main/kotlin/com/github/gotifycustom/sharing/ShareActivity.kt @@ -1,4 +1,4 @@ -package com.github.gotify.sharing +package com.github.gotifycustom.sharing import android.content.Intent import android.os.Bundle @@ -8,17 +8,17 @@ import android.widget.ArrayAdapter import android.widget.Spinner import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import com.github.gotify.R -import com.github.gotify.Settings -import com.github.gotify.Utils.launchCoroutine -import com.github.gotify.api.Api -import com.github.gotify.api.ApiException -import com.github.gotify.api.ClientFactory +import com.github.gotifycustom.R +import com.github.gotifycustom.Settings +import com.github.gotifycustom.Utils.launchCoroutine +import com.github.gotifycustom.api.Api +import com.github.gotifycustom.api.ApiException +import com.github.gotifycustom.api.ClientFactory import com.github.gotify.client.api.MessageApi import com.github.gotify.client.model.Application import com.github.gotify.client.model.Message -import com.github.gotify.databinding.ActivityShareBinding -import com.github.gotify.messages.provider.ApplicationHolder +import com.github.gotifycustom.databinding.ActivityShareBinding +import com.github.gotifycustom.messages.provider.ApplicationHolder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.tinylog.kotlin.Logger diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d96bb58..ecda389 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -99,6 +99,9 @@ Confirm onReceive intents prompt_onreceive_intent If enabled, a dialog is shown before onReceive.intentUrl is executed. + filter_low_priority + Filter low priority notifications + Only show notifications for critical messages (priority 10+) Push message App: Priority: diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml index 89cac84..272d848 100644 --- a/app/src/main/res/xml/root_preferences.xml +++ b/app/src/main/res/xml/root_preferences.xml @@ -49,6 +49,13 @@ android:title="@string/setting_prompt_onreceive_intent" android:defaultValue="@bool/prompt_onreceive_intent" android:summary="@string/setting_summary_prompt_onreceive_intent" /> + +