4 files changed, 130 insertions, 59 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/context/App.kt b/app/src/main/java/org/pacien/tincapp/context/App.kt
index 4d8d5d0..35e6d09 100644
--- a/app/src/main/java/org/pacien/tincapp/context/App.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/App.kt
@@ -28,6 +28,7 @@ import android.os.Handler
 import androidx.annotation.StringRes
 import org.pacien.tincapp.BuildConfig
 import org.pacien.tincapp.R
+import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
 /**
@@ -39,15 +40,17 @@ class App : Application() {
     appContext = applicationContext
     handler = Handler()
     AppLogger.configure()
-    setupCrashHandler()
 
     val logger = LoggerFactory.getLogger(this.javaClass)
+    setupCrashHandler(logger)
+
     logger.info("Starting tinc app {} ({} build), running on {} ({})",
       BuildConfig.VERSION_NAME, BuildConfig.BUILD_TYPE, Build.VERSION.CODENAME, Build.VERSION.RELEASE)
+
+    StorageMigrator().migrate()
   }
 
-  private fun setupCrashHandler() {
-    val logger = LoggerFactory.getLogger(this.javaClass)
+  private fun setupCrashHandler(logger: Logger) {
     val systemCrashHandler = Thread.getDefaultUncaughtExceptionHandler()!!
     val crashRecorder = CrashRecorder(logger, systemCrashHandler)
     Thread.setDefaultUncaughtExceptionHandler(crashRecorder)
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppNotificationManager.kt b/app/src/main/java/org/pacien/tincapp/context/AppNotificationManager.kt
index 38bf6e4..29f72de 100644
--- a/app/src/main/java/org/pacien/tincapp/context/AppNotificationManager.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/AppNotificationManager.kt
@@ -1,6 +1,6 @@
 /*
  * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2019 Pacien TRAN-GIRARD
+ * Copyright (C) 2017-2023 Pacien TRAN-GIRARD
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,67 +18,59 @@
 
 package org.pacien.tincapp.context
 
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
 import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import androidx.annotation.RequiresApi
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import org.pacien.tincapp.R
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 
 /**
  * @author pacien
  */
 class AppNotificationManager(private val context: Context) {
+  data class ErrorNotification(
+    val title: String,
+    val message: String,
+    val manualLink: String?
+  )
+
   companion object {
-    private const val CHANNEL_ID = "org.pacien.tincapp.notification.channels.error"
-    private const val ERROR_NOTIFICATION_ID = 0
+    private val STORE_NAME = this::class.java.`package`!!.name
+    private const val STORE_KEY_TITLE = "title"
+    private const val STORE_KEY_MESSAGE = "message"
+    private const val STORE_KEY_MANUAL_LINK = "manual_link"
   }
 
-  init {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) registerChannel()
-  }
+  private val store by lazy { context.getSharedPreferences(STORE_NAME, Context.MODE_PRIVATE)!! }
 
-  fun notifyError(title: String, message: String, manualLink: String? = null) {
-    val notification = NotificationCompat.Builder(context, CHANNEL_ID)
-      .setSmallIcon(R.drawable.ic_warning_primary_24dp)
-      .setContentTitle(title)
-      .setContentText(message)
-      .setStyle(NotificationCompat.BigTextStyle().bigText(message))
-      .setHighPriority()
-      .setAutoCancel(true)
-      .apply { if (manualLink != null) setManualLink(manualLink) }
-      .build()
+  fun getError(): ErrorNotification? {
+    if (!store.contains(STORE_KEY_TITLE)) return null;
 
-    NotificationManagerCompat.from(context)
-      .notify(ERROR_NOTIFICATION_ID, notification)
+    return ErrorNotification(
+      store.getString(STORE_KEY_TITLE, null)!!,
+      store.getString(STORE_KEY_MESSAGE, null)!!,
+      store.getString(STORE_KEY_MANUAL_LINK, null)
+    )
   }
 
-  fun dismissAll() {
-    NotificationManagerCompat.from(context).cancelAll()
+  fun notifyError(title: String, message: String, manualLink: String? = null) {
+    store
+      .edit()
+      .putString(STORE_KEY_TITLE, title)
+      .putString(STORE_KEY_MESSAGE, message)
+      .putString(STORE_KEY_MANUAL_LINK, manualLink)
+      .apply()
   }
 
-  @RequiresApi(Build.VERSION_CODES.O)
-  private fun registerChannel() {
-    val name = context.getString(R.string.notification_error_channel_name)
-    val importance = NotificationManager.IMPORTANCE_HIGH
-    val channel = NotificationChannel(CHANNEL_ID, name, importance)
-    val notificationManager = context.getSystemService(NotificationManager::class.java)
-    notificationManager.createNotificationChannel(channel)
+  fun dismissAll() {
+    store
+      .edit()
+      .clear()
+      .apply()
   }
 
-  private fun NotificationCompat.Builder.setHighPriority() = apply {
-    priority = NotificationCompat.PRIORITY_MAX
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) setDefaults(NotificationCompat.DEFAULT_SOUND) // force heads-up notification
+  fun registerListener(listener: OnSharedPreferenceChangeListener) {
+    store.registerOnSharedPreferenceChangeListener(listener)
   }
 
-  private fun NotificationCompat.Builder.setManualLink(manualLink: String) = apply {
-    val intent = Intent(Intent.ACTION_VIEW, Uri.parse(manualLink))
-    val pendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
-    addAction(R.drawable.ic_help_primary_24dp, context.getString(R.string.notification_error_action_open_manual), pendingIntent)
+  fun unregisterListener(listener: OnSharedPreferenceChangeListener) {
+    store.unregisterOnSharedPreferenceChangeListener(listener)
   }
 }
diff --git a/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt b/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt
index bd8316a..9e69790 100644
--- a/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/AppPaths.kt
@@ -1,6 +1,6 @@
 /*
  * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2020 Pacien TRAN-GIRARD
+ * Copyright (C) 2017-2023 Pacien TRAN-GIRARD
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,6 @@
 
 package org.pacien.tincapp.context
 
-import android.os.Environment
 import java.io.File
 import java.io.FileNotFoundException
 
@@ -28,6 +27,10 @@ import java.io.FileNotFoundException
  * @implNote Logs and PID files are stored in the cache directory for automatic collection.
  */
 object AppPaths {
+  private const val APP_LOG_DIR = "log"
+  private const val APP_TINC_RUNTIME_DIR = "run"
+  private const val APP_TINC_NETWORKS_DIR = "networks"
+
   private const val TINCD_BIN = "libtincd.so"
   private const val TINC_BIN = "libtinc.so"
 
@@ -46,25 +49,27 @@ object AppPaths {
 
   private val context by lazy { App.getContext() }
 
-  fun storageAvailable() =
+  private fun privateCacheDir() = context.cacheDir!!