diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 719a77d..8f19c4e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -34,11 +34,11 @@ if (releaseBuildRequested && !hasReleaseSigning) { } android { - namespace = "se.ajpanton.notificationlog" + namespace = "se.ajpanton.notificationsmaster" compileSdk = 36 defaultConfig { - applicationId = "se.ajpanton.notificationlog" + applicationId = "se.ajpanton.notificationsmaster" minSdk = 34 targetSdk = 36 versionCode = project.findProperty("notificationLogVersionCode")?.toString()?.toIntOrNull() ?: 1 diff --git a/app/src/main/java/se/ajpanton/notificationlog/EventSettingsFragment.kt b/app/src/main/java/se/ajpanton/notificationsmaster/EventSettingsFragment.kt similarity index 95% rename from app/src/main/java/se/ajpanton/notificationlog/EventSettingsFragment.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/EventSettingsFragment.kt index 95f11cd..df44c27 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/EventSettingsFragment.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/EventSettingsFragment.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog +package se.ajpanton.notificationsmaster import android.os.Bundle import android.content.res.ColorStateList @@ -20,17 +20,17 @@ import androidx.recyclerview.widget.RecyclerView import androidx.lifecycle.lifecycleScope import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.switchmaterial.SwitchMaterial -import se.ajpanton.notificationlog.capture.SeenApps -import se.ajpanton.notificationlog.databinding.FragmentEventSettingsBinding -import se.ajpanton.notificationlog.settings.AppListItem -import se.ajpanton.notificationlog.settings.AppListOrdering -import se.ajpanton.notificationlog.settings.AppRuleMode -import se.ajpanton.notificationlog.settings.ListedApp -import se.ajpanton.notificationlog.settings.AppFilterSettings -import se.ajpanton.notificationlog.settings.AppFilterSettingsStore -import se.ajpanton.notificationlog.settings.LoggingRuleStore -import se.ajpanton.notificationlog.settings.LoggingType -import se.ajpanton.notificationlog.settings.PerAppEventSettingsStore +import se.ajpanton.notificationsmaster.capture.SeenApps +import se.ajpanton.notificationsmaster.databinding.FragmentEventSettingsBinding +import se.ajpanton.notificationsmaster.settings.AppListItem +import se.ajpanton.notificationsmaster.settings.AppListOrdering +import se.ajpanton.notificationsmaster.settings.AppRuleMode +import se.ajpanton.notificationsmaster.settings.ListedApp +import se.ajpanton.notificationsmaster.settings.AppFilterSettings +import se.ajpanton.notificationsmaster.settings.AppFilterSettingsStore +import se.ajpanton.notificationsmaster.settings.LoggingRuleStore +import se.ajpanton.notificationsmaster.settings.LoggingType +import se.ajpanton.notificationsmaster.settings.PerAppEventSettingsStore import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/se/ajpanton/notificationlog/FilterLoggingFragment.kt b/app/src/main/java/se/ajpanton/notificationsmaster/FilterLoggingFragment.kt similarity index 87% rename from app/src/main/java/se/ajpanton/notificationlog/FilterLoggingFragment.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/FilterLoggingFragment.kt index 2ae7479..6bcd171 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/FilterLoggingFragment.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/FilterLoggingFragment.kt @@ -1,13 +1,13 @@ -package se.ajpanton.notificationlog +package se.ajpanton.notificationsmaster import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import com.google.android.material.switchmaterial.SwitchMaterial -import se.ajpanton.notificationlog.databinding.FragmentFilterLoggingBinding -import se.ajpanton.notificationlog.settings.CaptureSettingsStore -import se.ajpanton.notificationlog.settings.LoggingRuleStore -import se.ajpanton.notificationlog.settings.LoggingType +import se.ajpanton.notificationsmaster.databinding.FragmentFilterLoggingBinding +import se.ajpanton.notificationsmaster.settings.CaptureSettingsStore +import se.ajpanton.notificationsmaster.settings.LoggingRuleStore +import se.ajpanton.notificationsmaster.settings.LoggingType class FilterLoggingFragment : Fragment(R.layout.fragment_filter_logging) { private var binding: FragmentFilterLoggingBinding? = null diff --git a/app/src/main/java/se/ajpanton/notificationlog/ImageViewerDialogFragment.kt b/app/src/main/java/se/ajpanton/notificationsmaster/ImageViewerDialogFragment.kt similarity index 98% rename from app/src/main/java/se/ajpanton/notificationlog/ImageViewerDialogFragment.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/ImageViewerDialogFragment.kt index 5b31b9a..cc15e8b 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/ImageViewerDialogFragment.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/ImageViewerDialogFragment.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog +package se.ajpanton.notificationsmaster import android.app.Dialog import android.graphics.Bitmap @@ -19,7 +19,7 @@ import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsControllerCompat import androidx.fragment.app.DialogFragment import androidx.lifecycle.lifecycleScope -import se.ajpanton.notificationlog.data.EncryptedImageStore +import se.ajpanton.notificationsmaster.data.EncryptedImageStore import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/se/ajpanton/notificationlog/LogDisplayFragment.kt b/app/src/main/java/se/ajpanton/notificationsmaster/LogDisplayFragment.kt similarity index 92% rename from app/src/main/java/se/ajpanton/notificationlog/LogDisplayFragment.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/LogDisplayFragment.kt index 8519ce9..b9c850b 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/LogDisplayFragment.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/LogDisplayFragment.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog +package se.ajpanton.notificationsmaster import android.content.ClipData import android.os.Bundle @@ -9,14 +9,14 @@ import android.widget.Spinner import android.widget.TextView import androidx.fragment.app.Fragment import com.google.android.material.switchmaterial.SwitchMaterial -import se.ajpanton.notificationlog.databinding.FragmentLogDisplayBinding -import se.ajpanton.notificationlog.settings.DisplayEvent -import se.ajpanton.notificationlog.settings.LogField -import se.ajpanton.notificationlog.settings.LogViewSettings -import se.ajpanton.notificationlog.settings.LogViewSettingsStore -import se.ajpanton.notificationlog.settings.TimestampClockFormat -import se.ajpanton.notificationlog.settings.TimestampDateFormat -import se.ajpanton.notificationlog.settings.TimestampZone +import se.ajpanton.notificationsmaster.databinding.FragmentLogDisplayBinding +import se.ajpanton.notificationsmaster.settings.DisplayEvent +import se.ajpanton.notificationsmaster.settings.LogField +import se.ajpanton.notificationsmaster.settings.LogViewSettings +import se.ajpanton.notificationsmaster.settings.LogViewSettingsStore +import se.ajpanton.notificationsmaster.settings.TimestampClockFormat +import se.ajpanton.notificationsmaster.settings.TimestampDateFormat +import se.ajpanton.notificationsmaster.settings.TimestampZone class LogDisplayFragment : Fragment(R.layout.fragment_log_display) { private var binding: FragmentLogDisplayBinding? = null diff --git a/app/src/main/java/se/ajpanton/notificationlog/MainActivity.kt b/app/src/main/java/se/ajpanton/notificationsmaster/MainActivity.kt similarity index 98% rename from app/src/main/java/se/ajpanton/notificationlog/MainActivity.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/MainActivity.kt index e966719..455145b 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/MainActivity.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/MainActivity.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog +package se.ajpanton.notificationsmaster import android.os.Bundle import android.hardware.biometrics.BiometricPrompt @@ -22,9 +22,9 @@ import androidx.core.view.forEach import androidx.drawerlayout.widget.DrawerLayout import androidx.fragment.app.commit import com.google.android.material.navigation.NavigationView -import se.ajpanton.notificationlog.databinding.ActivityMainBinding -import se.ajpanton.notificationlog.settings.AppLockStore -import se.ajpanton.notificationlog.settings.LogAppFilterStore +import se.ajpanton.notificationsmaster.databinding.ActivityMainBinding +import se.ajpanton.notificationsmaster.settings.AppLockStore +import se.ajpanton.notificationsmaster.settings.LogAppFilterStore class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener { private lateinit var binding: ActivityMainBinding diff --git a/app/src/main/java/se/ajpanton/notificationlog/NotificationLogApplication.kt b/app/src/main/java/se/ajpanton/notificationsmaster/NotificationLogApplication.kt similarity index 73% rename from app/src/main/java/se/ajpanton/notificationlog/NotificationLogApplication.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/NotificationLogApplication.kt index 4906146..9df00a0 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/NotificationLogApplication.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/NotificationLogApplication.kt @@ -1,13 +1,13 @@ -package se.ajpanton.notificationlog +package se.ajpanton.notificationsmaster import android.app.Application import android.content.pm.PackageManager -import se.ajpanton.notificationlog.data.EncryptedNotificationLogStore -import se.ajpanton.notificationlog.settings.AppFilterSettingsStore -import se.ajpanton.notificationlog.settings.LoggingRuleStore -import se.ajpanton.notificationlog.settings.LoggingType -import se.ajpanton.notificationlog.settings.NotificationListenerComponentController -import se.ajpanton.notificationlog.settings.PerAppEventSettingsStore +import se.ajpanton.notificationsmaster.data.EncryptedNotificationLogStore +import se.ajpanton.notificationsmaster.settings.AppFilterSettingsStore +import se.ajpanton.notificationsmaster.settings.LoggingRuleStore +import se.ajpanton.notificationsmaster.settings.LoggingType +import se.ajpanton.notificationsmaster.settings.NotificationListenerComponentController +import se.ajpanton.notificationsmaster.settings.PerAppEventSettingsStore class NotificationLogApplication : Application() { override fun onCreate() { diff --git a/app/src/main/java/se/ajpanton/notificationlog/PageFragment.kt b/app/src/main/java/se/ajpanton/notificationsmaster/PageFragment.kt similarity index 89% rename from app/src/main/java/se/ajpanton/notificationlog/PageFragment.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/PageFragment.kt index ab8e121..5dad8f2 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/PageFragment.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/PageFragment.kt @@ -1,10 +1,10 @@ -package se.ajpanton.notificationlog +package se.ajpanton.notificationsmaster import android.os.Bundle import android.view.View import androidx.annotation.StringRes import androidx.fragment.app.Fragment -import se.ajpanton.notificationlog.databinding.FragmentPageBinding +import se.ajpanton.notificationsmaster.databinding.FragmentPageBinding class PageFragment : Fragment(R.layout.fragment_page) { private var binding: FragmentPageBinding? = null diff --git a/app/src/main/java/se/ajpanton/notificationlog/SafeInsetDrawerLayout.kt b/app/src/main/java/se/ajpanton/notificationsmaster/SafeInsetDrawerLayout.kt similarity index 96% rename from app/src/main/java/se/ajpanton/notificationlog/SafeInsetDrawerLayout.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/SafeInsetDrawerLayout.kt index 08fdc35..e01e794 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/SafeInsetDrawerLayout.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/SafeInsetDrawerLayout.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog +package se.ajpanton.notificationsmaster import android.content.Context import android.graphics.Canvas diff --git a/app/src/main/java/se/ajpanton/notificationlog/SettingsFragment.kt b/app/src/main/java/se/ajpanton/notificationsmaster/SettingsFragment.kt similarity index 90% rename from app/src/main/java/se/ajpanton/notificationlog/SettingsFragment.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/SettingsFragment.kt index e528742..0f2cca8 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/SettingsFragment.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/SettingsFragment.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog +package se.ajpanton.notificationsmaster import android.os.Bundle import android.net.Uri @@ -9,17 +9,17 @@ import android.view.View import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope import com.google.android.material.dialog.MaterialAlertDialogBuilder -import se.ajpanton.notificationlog.databinding.FragmentSettingsBinding -import se.ajpanton.notificationlog.settings.LogField -import se.ajpanton.notificationlog.settings.LogViewSettingsStore -import se.ajpanton.notificationlog.settings.AppLockStore -import se.ajpanton.notificationlog.data.EncryptedNotificationLogStore -import se.ajpanton.notificationlog.data.EncryptedImageStore -import se.ajpanton.notificationlog.capture.NotificationCaptureService -import se.ajpanton.notificationlog.export.LogExporter -import se.ajpanton.notificationlog.settings.StorageLimits -import se.ajpanton.notificationlog.settings.StorageLimitsStore -import se.ajpanton.notificationlog.settings.LogAppFilterStore +import se.ajpanton.notificationsmaster.databinding.FragmentSettingsBinding +import se.ajpanton.notificationsmaster.settings.LogField +import se.ajpanton.notificationsmaster.settings.LogViewSettingsStore +import se.ajpanton.notificationsmaster.settings.AppLockStore +import se.ajpanton.notificationsmaster.data.EncryptedNotificationLogStore +import se.ajpanton.notificationsmaster.data.EncryptedImageStore +import se.ajpanton.notificationsmaster.capture.NotificationCaptureService +import se.ajpanton.notificationsmaster.export.LogExporter +import se.ajpanton.notificationsmaster.settings.StorageLimits +import se.ajpanton.notificationsmaster.settings.StorageLimitsStore +import se.ajpanton.notificationsmaster.settings.LogAppFilterStore import java.util.zip.ZipOutputStream import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -148,7 +148,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) { private fun writeCsv( writer: java.io.BufferedWriter, logStore: EncryptedNotificationLogStore, - settings: se.ajpanton.notificationlog.settings.LogViewSettings, + settings: se.ajpanton.notificationsmaster.settings.LogViewSettings, context: android.content.Context, ) = writer.use { it.write(LogExporter.csvHeader(settings)) @@ -161,7 +161,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) { private fun writeFormatted( writer: java.io.BufferedWriter, logStore: EncryptedNotificationLogStore, - settings: se.ajpanton.notificationlog.settings.LogViewSettings, + settings: se.ajpanton.notificationsmaster.settings.LogViewSettings, context: android.content.Context, ) = writer.use { val headers = LogExporter.headers(settings) @@ -181,7 +181,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings) { private fun writeHtmlZip( zip: ZipOutputStream, logStore: EncryptedNotificationLogStore, - settings: se.ajpanton.notificationlog.settings.LogViewSettings, + settings: se.ajpanton.notificationsmaster.settings.LogViewSettings, context: android.content.Context, ) = zip.use { zipOutput -> val imageStore = EncryptedImageStore(context) diff --git a/app/src/main/java/se/ajpanton/notificationlog/ViewLogsFragment.kt b/app/src/main/java/se/ajpanton/notificationsmaster/ViewLogsFragment.kt similarity index 96% rename from app/src/main/java/se/ajpanton/notificationlog/ViewLogsFragment.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/ViewLogsFragment.kt index 2e8ef6e..afaf36c 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/ViewLogsFragment.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/ViewLogsFragment.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog +package se.ajpanton.notificationsmaster import android.animation.Animator import android.animation.AnimatorListenerAdapter @@ -18,19 +18,19 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView import com.google.android.material.dialog.MaterialAlertDialogBuilder -import se.ajpanton.notificationlog.data.EncryptedImageStore -import se.ajpanton.notificationlog.data.EncryptedNotificationLogStore -import se.ajpanton.notificationlog.data.NewestLogCursor -import se.ajpanton.notificationlog.databinding.FragmentViewLogsBinding -import se.ajpanton.notificationlog.model.NotificationAction -import se.ajpanton.notificationlog.model.NotificationLogEntry -import se.ajpanton.notificationlog.settings.LogField -import se.ajpanton.notificationlog.settings.LogViewSettings -import se.ajpanton.notificationlog.settings.LogViewSettingsStore -import se.ajpanton.notificationlog.settings.LogAppFilterStore -import se.ajpanton.notificationlog.settings.TimestampFormatter -import se.ajpanton.notificationlog.settings.DisplayEvent -import se.ajpanton.notificationlog.capture.NotificationCaptureService +import se.ajpanton.notificationsmaster.data.EncryptedImageStore +import se.ajpanton.notificationsmaster.data.EncryptedNotificationLogStore +import se.ajpanton.notificationsmaster.data.NewestLogCursor +import se.ajpanton.notificationsmaster.databinding.FragmentViewLogsBinding +import se.ajpanton.notificationsmaster.model.NotificationAction +import se.ajpanton.notificationsmaster.model.NotificationLogEntry +import se.ajpanton.notificationsmaster.settings.LogField +import se.ajpanton.notificationsmaster.settings.LogViewSettings +import se.ajpanton.notificationsmaster.settings.LogViewSettingsStore +import se.ajpanton.notificationsmaster.settings.LogAppFilterStore +import se.ajpanton.notificationsmaster.settings.TimestampFormatter +import se.ajpanton.notificationsmaster.settings.DisplayEvent +import se.ajpanton.notificationsmaster.capture.NotificationCaptureService import androidx.fragment.app.Fragment import androidx.core.content.ContextCompat import androidx.core.view.doOnPreDraw diff --git a/app/src/main/java/se/ajpanton/notificationlog/ZoomImageView.kt b/app/src/main/java/se/ajpanton/notificationsmaster/ZoomImageView.kt similarity index 99% rename from app/src/main/java/se/ajpanton/notificationlog/ZoomImageView.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/ZoomImageView.kt index c82f2e2..bedc674 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/ZoomImageView.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/ZoomImageView.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog +package se.ajpanton.notificationsmaster import android.content.Context import android.graphics.Bitmap diff --git a/app/src/main/java/se/ajpanton/notificationlog/capture/GroupSummaryPolicy.kt b/app/src/main/java/se/ajpanton/notificationsmaster/capture/GroupSummaryPolicy.kt similarity index 83% rename from app/src/main/java/se/ajpanton/notificationlog/capture/GroupSummaryPolicy.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/capture/GroupSummaryPolicy.kt index e7168e8..2c89a0d 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/capture/GroupSummaryPolicy.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/capture/GroupSummaryPolicy.kt @@ -1,6 +1,6 @@ -package se.ajpanton.notificationlog.capture +package se.ajpanton.notificationsmaster.capture -import se.ajpanton.notificationlog.model.NotificationAction +import se.ajpanton.notificationsmaster.model.NotificationAction /** Applies the global, Android-provided group-summary classification without inspecting text. */ object GroupSummaryPolicy { diff --git a/app/src/main/java/se/ajpanton/notificationlog/capture/NotificationCaptureService.kt b/app/src/main/java/se/ajpanton/notificationsmaster/capture/NotificationCaptureService.kt similarity index 92% rename from app/src/main/java/se/ajpanton/notificationlog/capture/NotificationCaptureService.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/capture/NotificationCaptureService.kt index 53a9ab3..a1518ae 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/capture/NotificationCaptureService.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/capture/NotificationCaptureService.kt @@ -1,20 +1,20 @@ -package se.ajpanton.notificationlog.capture +package se.ajpanton.notificationsmaster.capture import android.app.Notification import android.content.pm.PackageManager import android.service.notification.NotificationListenerService import android.service.notification.StatusBarNotification import android.util.Log -import se.ajpanton.notificationlog.data.EncryptedNotificationLogStore -import se.ajpanton.notificationlog.data.EncryptedImageStore -import se.ajpanton.notificationlog.model.NotificationAction -import se.ajpanton.notificationlog.model.NotificationLogEntry -import se.ajpanton.notificationlog.settings.LoggingRuleStore -import se.ajpanton.notificationlog.settings.LoggingType -import se.ajpanton.notificationlog.settings.NotificationRuleEvaluator -import se.ajpanton.notificationlog.settings.CaptureSettingsStore -import se.ajpanton.notificationlog.settings.AppFilterSettingsStore -import se.ajpanton.notificationlog.settings.PerAppEventSettingsStore +import se.ajpanton.notificationsmaster.data.EncryptedNotificationLogStore +import se.ajpanton.notificationsmaster.data.EncryptedImageStore +import se.ajpanton.notificationsmaster.model.NotificationAction +import se.ajpanton.notificationsmaster.model.NotificationLogEntry +import se.ajpanton.notificationsmaster.settings.LoggingRuleStore +import se.ajpanton.notificationsmaster.settings.LoggingType +import se.ajpanton.notificationsmaster.settings.NotificationRuleEvaluator +import se.ajpanton.notificationsmaster.settings.CaptureSettingsStore +import se.ajpanton.notificationsmaster.settings.AppFilterSettingsStore +import se.ajpanton.notificationsmaster.settings.PerAppEventSettingsStore import java.util.concurrent.ExecutorService import java.util.concurrent.Executors diff --git a/app/src/main/java/se/ajpanton/notificationlog/capture/NotificationChangeClassifier.kt b/app/src/main/java/se/ajpanton/notificationsmaster/capture/NotificationChangeClassifier.kt similarity index 91% rename from app/src/main/java/se/ajpanton/notificationlog/capture/NotificationChangeClassifier.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/capture/NotificationChangeClassifier.kt index ffd1022..ce54948 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/capture/NotificationChangeClassifier.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/capture/NotificationChangeClassifier.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.capture +package se.ajpanton.notificationsmaster.capture /** Keeps update classification deterministic and independently testable. */ object NotificationChangeClassifier { diff --git a/app/src/main/java/se/ajpanton/notificationlog/capture/NotificationSnapshot.kt b/app/src/main/java/se/ajpanton/notificationsmaster/capture/NotificationSnapshot.kt similarity index 99% rename from app/src/main/java/se/ajpanton/notificationlog/capture/NotificationSnapshot.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/capture/NotificationSnapshot.kt index 50a1c89..ecc56e1 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/capture/NotificationSnapshot.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/capture/NotificationSnapshot.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.capture +package se.ajpanton.notificationsmaster.capture import android.app.Notification import android.content.Context diff --git a/app/src/main/java/se/ajpanton/notificationlog/capture/SeenApps.kt b/app/src/main/java/se/ajpanton/notificationsmaster/capture/SeenApps.kt similarity index 86% rename from app/src/main/java/se/ajpanton/notificationlog/capture/SeenApps.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/capture/SeenApps.kt index d377b69..be40fe8 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/capture/SeenApps.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/capture/SeenApps.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.capture +package se.ajpanton.notificationsmaster.capture import java.util.concurrent.ConcurrentHashMap diff --git a/app/src/main/java/se/ajpanton/notificationlog/data/AesGcmCipher.kt b/app/src/main/java/se/ajpanton/notificationsmaster/data/AesGcmCipher.kt similarity index 96% rename from app/src/main/java/se/ajpanton/notificationlog/data/AesGcmCipher.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/data/AesGcmCipher.kt index 4c5a922..74701a0 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/data/AesGcmCipher.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/data/AesGcmCipher.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.data +package se.ajpanton.notificationsmaster.data import javax.crypto.Cipher import javax.crypto.SecretKey diff --git a/app/src/main/java/se/ajpanton/notificationlog/data/EncryptedImageStore.kt b/app/src/main/java/se/ajpanton/notificationsmaster/data/EncryptedImageStore.kt similarity index 98% rename from app/src/main/java/se/ajpanton/notificationlog/data/EncryptedImageStore.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/data/EncryptedImageStore.kt index 1af8d8d..368658b 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/data/EncryptedImageStore.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/data/EncryptedImageStore.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.data +package se.ajpanton.notificationsmaster.data import android.content.Context import android.util.AtomicFile diff --git a/app/src/main/java/se/ajpanton/notificationlog/data/EncryptedNotificationLogStore.kt b/app/src/main/java/se/ajpanton/notificationsmaster/data/EncryptedNotificationLogStore.kt similarity index 98% rename from app/src/main/java/se/ajpanton/notificationlog/data/EncryptedNotificationLogStore.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/data/EncryptedNotificationLogStore.kt index 3a8e1a4..5bd9e64 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/data/EncryptedNotificationLogStore.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/data/EncryptedNotificationLogStore.kt @@ -1,9 +1,9 @@ -package se.ajpanton.notificationlog.data +package se.ajpanton.notificationsmaster.data import android.content.Context import android.util.AtomicFile -import se.ajpanton.notificationlog.model.NotificationLogEntry -import se.ajpanton.notificationlog.settings.StorageLimitsStore +import se.ajpanton.notificationsmaster.model.NotificationLogEntry +import se.ajpanton.notificationsmaster.settings.StorageLimitsStore import java.io.BufferedInputStream import java.io.BufferedOutputStream import java.io.DataInputStream diff --git a/app/src/main/java/se/ajpanton/notificationlog/data/LogEncryptionKeyProvider.kt b/app/src/main/java/se/ajpanton/notificationsmaster/data/LogEncryptionKeyProvider.kt similarity index 96% rename from app/src/main/java/se/ajpanton/notificationlog/data/LogEncryptionKeyProvider.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/data/LogEncryptionKeyProvider.kt index 4e6ebfa..d8cfec4 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/data/LogEncryptionKeyProvider.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/data/LogEncryptionKeyProvider.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.data +package se.ajpanton.notificationsmaster.data import android.security.keystore.KeyGenParameterSpec import android.security.keystore.KeyProperties diff --git a/app/src/main/java/se/ajpanton/notificationlog/data/NotificationLogEntryJson.kt b/app/src/main/java/se/ajpanton/notificationsmaster/data/NotificationLogEntryJson.kt similarity index 91% rename from app/src/main/java/se/ajpanton/notificationlog/data/NotificationLogEntryJson.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/data/NotificationLogEntryJson.kt index ed72900..74b38a5 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/data/NotificationLogEntryJson.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/data/NotificationLogEntryJson.kt @@ -1,9 +1,9 @@ -package se.ajpanton.notificationlog.data +package se.ajpanton.notificationsmaster.data import org.json.JSONArray import org.json.JSONObject -import se.ajpanton.notificationlog.model.NotificationAction -import se.ajpanton.notificationlog.model.NotificationLogEntry +import se.ajpanton.notificationsmaster.model.NotificationAction +import se.ajpanton.notificationsmaster.model.NotificationLogEntry /** Versioned, private plaintext representation which is encrypted before it reaches disk. */ object NotificationLogEntryJson { diff --git a/app/src/main/java/se/ajpanton/notificationlog/export/LogExporter.kt b/app/src/main/java/se/ajpanton/notificationsmaster/export/LogExporter.kt similarity index 93% rename from app/src/main/java/se/ajpanton/notificationlog/export/LogExporter.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/export/LogExporter.kt index f2f9f46..45c64f1 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/export/LogExporter.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/export/LogExporter.kt @@ -1,10 +1,10 @@ -package se.ajpanton.notificationlog.export +package se.ajpanton.notificationsmaster.export import android.content.Context -import se.ajpanton.notificationlog.model.NotificationLogEntry -import se.ajpanton.notificationlog.settings.LogField -import se.ajpanton.notificationlog.settings.LogViewSettings -import se.ajpanton.notificationlog.settings.TimestampFormatter +import se.ajpanton.notificationsmaster.model.NotificationLogEntry +import se.ajpanton.notificationsmaster.settings.LogField +import se.ajpanton.notificationsmaster.settings.LogViewSettings +import se.ajpanton.notificationsmaster.settings.TimestampFormatter object LogExporter { fun csv(entries: List, settings: LogViewSettings, context: Context? = null): String = ( diff --git a/app/src/main/java/se/ajpanton/notificationlog/model/NotificationLogEntry.kt b/app/src/main/java/se/ajpanton/notificationsmaster/model/NotificationLogEntry.kt similarity index 96% rename from app/src/main/java/se/ajpanton/notificationlog/model/NotificationLogEntry.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/model/NotificationLogEntry.kt index c79e30f..1aa9ec1 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/model/NotificationLogEntry.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/model/NotificationLogEntry.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.model +package se.ajpanton.notificationsmaster.model import java.util.UUID diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/AppFilterSettings.kt b/app/src/main/java/se/ajpanton/notificationsmaster/settings/AppFilterSettings.kt similarity index 97% rename from app/src/main/java/se/ajpanton/notificationlog/settings/AppFilterSettings.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/settings/AppFilterSettings.kt index 7eef048..59e038f 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/settings/AppFilterSettings.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/settings/AppFilterSettings.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.settings +package se.ajpanton.notificationsmaster.settings import android.content.Context import androidx.core.content.edit diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/AppListOrdering.kt b/app/src/main/java/se/ajpanton/notificationsmaster/settings/AppListOrdering.kt similarity index 97% rename from app/src/main/java/se/ajpanton/notificationlog/settings/AppListOrdering.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/settings/AppListOrdering.kt index fcc170d..219e56d 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/settings/AppListOrdering.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/settings/AppListOrdering.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.settings +package se.ajpanton.notificationsmaster.settings data class ListedApp( val label: String, diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/AppLockStore.kt b/app/src/main/java/se/ajpanton/notificationsmaster/settings/AppLockStore.kt similarity index 87% rename from app/src/main/java/se/ajpanton/notificationlog/settings/AppLockStore.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/settings/AppLockStore.kt index 732f25f..de1447c 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/settings/AppLockStore.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/settings/AppLockStore.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.settings +package se.ajpanton.notificationsmaster.settings import android.content.Context import androidx.core.content.edit diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/CaptureSettingsStore.kt b/app/src/main/java/se/ajpanton/notificationsmaster/settings/CaptureSettingsStore.kt similarity index 92% rename from app/src/main/java/se/ajpanton/notificationlog/settings/CaptureSettingsStore.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/settings/CaptureSettingsStore.kt index 095c337..f659f57 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/settings/CaptureSettingsStore.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/settings/CaptureSettingsStore.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.settings +package se.ajpanton.notificationsmaster.settings import android.content.Context import androidx.core.content.edit diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/LogAppFilterStore.kt b/app/src/main/java/se/ajpanton/notificationsmaster/settings/LogAppFilterStore.kt similarity index 95% rename from app/src/main/java/se/ajpanton/notificationlog/settings/LogAppFilterStore.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/settings/LogAppFilterStore.kt index d78bd2e..bf035c9 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/settings/LogAppFilterStore.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/settings/LogAppFilterStore.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.settings +package se.ajpanton.notificationsmaster.settings import android.content.Context import androidx.core.content.edit diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/LogViewSettings.kt b/app/src/main/java/se/ajpanton/notificationsmaster/settings/LogViewSettings.kt similarity index 94% rename from app/src/main/java/se/ajpanton/notificationlog/settings/LogViewSettings.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/settings/LogViewSettings.kt index 1784abf..52b8bbc 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/settings/LogViewSettings.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/settings/LogViewSettings.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.settings +package se.ajpanton.notificationsmaster.settings enum class LogField { TIMESTAMP, APP_NAME, PACKAGE_NAME, ACTION, CONTENTS } enum class TimestampZone { EVENT_LOCAL, LOCAL_NOW, UTC } diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/LogViewSettingsStore.kt b/app/src/main/java/se/ajpanton/notificationsmaster/settings/LogViewSettingsStore.kt similarity index 96% rename from app/src/main/java/se/ajpanton/notificationlog/settings/LogViewSettingsStore.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/settings/LogViewSettingsStore.kt index ecc20fe..80e4efc 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/settings/LogViewSettingsStore.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/settings/LogViewSettingsStore.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.settings +package se.ajpanton.notificationsmaster.settings import android.content.Context import androidx.core.content.edit diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/LoggingRuleStore.kt b/app/src/main/java/se/ajpanton/notificationsmaster/settings/LoggingRuleStore.kt similarity index 96% rename from app/src/main/java/se/ajpanton/notificationlog/settings/LoggingRuleStore.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/settings/LoggingRuleStore.kt index 887f696..4fc286e 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/settings/LoggingRuleStore.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/settings/LoggingRuleStore.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.settings +package se.ajpanton.notificationsmaster.settings import android.content.Context import androidx.core.content.edit diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/LoggingType.kt b/app/src/main/java/se/ajpanton/notificationsmaster/settings/LoggingType.kt similarity index 89% rename from app/src/main/java/se/ajpanton/notificationlog/settings/LoggingType.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/settings/LoggingType.kt index 636f165..4aff992 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/settings/LoggingType.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/settings/LoggingType.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.settings +package se.ajpanton.notificationsmaster.settings enum class LoggingType { APPEARING, diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/NotificationListenerComponentController.kt b/app/src/main/java/se/ajpanton/notificationsmaster/settings/NotificationListenerComponentController.kt similarity index 94% rename from app/src/main/java/se/ajpanton/notificationlog/settings/NotificationListenerComponentController.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/settings/NotificationListenerComponentController.kt index 06efbad..9bedb96 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/settings/NotificationListenerComponentController.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/settings/NotificationListenerComponentController.kt @@ -1,11 +1,11 @@ -package se.ajpanton.notificationlog.settings +package se.ajpanton.notificationsmaster.settings import android.content.ComponentName import android.content.Context import android.content.pm.PackageManager import android.service.notification.NotificationListenerService import android.util.Log -import se.ajpanton.notificationlog.capture.NotificationCaptureService +import se.ajpanton.notificationsmaster.capture.NotificationCaptureService /** * Notification listeners are re-bound by Android after boot when their component diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/NotificationListenerPolicy.kt b/app/src/main/java/se/ajpanton/notificationsmaster/settings/NotificationListenerPolicy.kt similarity index 87% rename from app/src/main/java/se/ajpanton/notificationlog/settings/NotificationListenerPolicy.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/settings/NotificationListenerPolicy.kt index 262673c..1d85777 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/settings/NotificationListenerPolicy.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/settings/NotificationListenerPolicy.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.settings +package se.ajpanton.notificationsmaster.settings /** The listener is useful only when at least one event type is enabled. */ object NotificationListenerPolicy { diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/NotificationRuleEvaluator.kt b/app/src/main/java/se/ajpanton/notificationsmaster/settings/NotificationRuleEvaluator.kt similarity index 86% rename from app/src/main/java/se/ajpanton/notificationlog/settings/NotificationRuleEvaluator.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/settings/NotificationRuleEvaluator.kt index 0ed426f..88a1335 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/settings/NotificationRuleEvaluator.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/settings/NotificationRuleEvaluator.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.settings +package se.ajpanton.notificationsmaster.settings object NotificationRuleEvaluator { fun allows(filter: AppFilterSettings, packageName: String): Boolean { diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/PerAppEventSettingsStore.kt b/app/src/main/java/se/ajpanton/notificationsmaster/settings/PerAppEventSettingsStore.kt similarity index 98% rename from app/src/main/java/se/ajpanton/notificationlog/settings/PerAppEventSettingsStore.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/settings/PerAppEventSettingsStore.kt index 8332d42..479b312 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/settings/PerAppEventSettingsStore.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/settings/PerAppEventSettingsStore.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.settings +package se.ajpanton.notificationsmaster.settings import android.content.Context import androidx.core.content.edit diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/StorageLimitsStore.kt b/app/src/main/java/se/ajpanton/notificationsmaster/settings/StorageLimitsStore.kt similarity index 94% rename from app/src/main/java/se/ajpanton/notificationlog/settings/StorageLimitsStore.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/settings/StorageLimitsStore.kt index 79a8a67..f900557 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/settings/StorageLimitsStore.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/settings/StorageLimitsStore.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.settings +package se.ajpanton.notificationsmaster.settings import android.content.Context import androidx.core.content.edit diff --git a/app/src/main/java/se/ajpanton/notificationlog/settings/TimestampFormatter.kt b/app/src/main/java/se/ajpanton/notificationsmaster/settings/TimestampFormatter.kt similarity index 97% rename from app/src/main/java/se/ajpanton/notificationlog/settings/TimestampFormatter.kt rename to app/src/main/java/se/ajpanton/notificationsmaster/settings/TimestampFormatter.kt index c4e0ba3..fa7b2ba 100644 --- a/app/src/main/java/se/ajpanton/notificationlog/settings/TimestampFormatter.kt +++ b/app/src/main/java/se/ajpanton/notificationsmaster/settings/TimestampFormatter.kt @@ -1,4 +1,4 @@ -package se.ajpanton.notificationlog.settings +package se.ajpanton.notificationsmaster.settings import android.content.Context import android.text.format.DateFormat as AndroidDateFormat diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0c16642..fd4008f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - +