From f541e7a7d71aac02098157fa53e927884e940f26 Mon Sep 17 00:00:00 2001
From: pacien
Date: Sat, 29 Jul 2023 23:36:12 +0200
Subject: storage: rename ConfigurationDirectoryMigrator -> StorageMigrator
---
.../main/java/org/pacien/tincapp/context/App.kt | 2 +-
.../context/ConfigurationDirectoryMigrator.kt | 70 ----------------------
.../org/pacien/tincapp/context/StorageMigrator.kt | 70 ++++++++++++++++++++++
3 files changed, 71 insertions(+), 71 deletions(-)
delete mode 100644 app/src/main/java/org/pacien/tincapp/context/ConfigurationDirectoryMigrator.kt
create mode 100644 app/src/main/java/org/pacien/tincapp/context/StorageMigrator.kt
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 d825d78..35e6d09 100644
--- a/app/src/main/java/org/pacien/tincapp/context/App.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/App.kt
@@ -47,7 +47,7 @@ class App : Application() {
logger.info("Starting tinc app {} ({} build), running on {} ({})",
BuildConfig.VERSION_NAME, BuildConfig.BUILD_TYPE, Build.VERSION.CODENAME, Build.VERSION.RELEASE)
- ConfigurationDirectoryMigrator().migrate()
+ StorageMigrator().migrate()
}
private fun setupCrashHandler(logger: Logger) {
diff --git a/app/src/main/java/org/pacien/tincapp/context/ConfigurationDirectoryMigrator.kt b/app/src/main/java/org/pacien/tincapp/context/ConfigurationDirectoryMigrator.kt
deleted file mode 100644
index ea0b7d8..0000000
--- a/app/src/main/java/org/pacien/tincapp/context/ConfigurationDirectoryMigrator.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package org.pacien.tincapp.context
-
-import org.pacien.tincapp.extensions.Java.defaultMessage
-import org.slf4j.LoggerFactory
-import java.io.IOException
-
-/**
- * Migrates the configuration from the external storage (used before version 0.32) to the internal storage.
- *
- * @author pacien
- */
-class ConfigurationDirectoryMigrator {
- private val log by lazy { LoggerFactory.getLogger(this.javaClass)!! }
- private val context by lazy { App.getContext() }
- private val paths = AppPaths
-
- fun migrate() {
- migrateConfigurationDirectory()
- migrateLogDirectory()
- }
-
- private fun migrateConfigurationDirectory() {
- val oldConfigDir = context.getExternalFilesDir(null)
- if (oldConfigDir == null || oldConfigDir.listFiles().isNullOrEmpty()) return // nothing to do
-
- try {
- log.info(
- "Migrating files present in old configuration directory at {} to {}",
- oldConfigDir.absolutePath,
- paths.confDir()
- )
-
- oldConfigDir.copyRecursively(paths.confDir(), overwrite = false)
- oldConfigDir.deleteRecursively()
- } catch (e: IOException) {
- log.warn("Could not complete configuration directory migration: {}", e.defaultMessage())
- }
- }
-
- private fun migrateLogDirectory() {
- val oldLogDir = context.cacheDir
- if (oldLogDir == null || oldLogDir.listFiles().isNullOrEmpty()) return // nothing to do
-
- try {
- // There's no point moving the log files. Let's delete those instead.
- log.info("Clearing old cache directory at {}", oldLogDir.absolutePath)
- oldLogDir.deleteRecursively()
- } catch (e: IOException) {
- log.warn("Could not remove old cache directory: {}", e.defaultMessage())
- }
- }
-}
diff --git a/app/src/main/java/org/pacien/tincapp/context/StorageMigrator.kt b/app/src/main/java/org/pacien/tincapp/context/StorageMigrator.kt
new file mode 100644
index 0000000..de8009c
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/context/StorageMigrator.kt
@@ -0,0 +1,70 @@
+/*
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package org.pacien.tincapp.context
+
+import org.pacien.tincapp.extensions.Java.defaultMessage
+import org.slf4j.LoggerFactory
+import java.io.IOException
+
+/**
+ * Migrates the configuration from the external storage (used before version 0.32) to the internal storage.
+ *
+ * @author pacien
+ */
+class StorageMigrator {
+ private val log by lazy { LoggerFactory.getLogger(this.javaClass)!! }
+ private val context by lazy { App.getContext() }
+ private val paths = AppPaths
+
+ fun migrate() {
+ migrateConfigurationDirectory()
+ migrateLogDirectory()
+ }
+
+ private fun migrateConfigurationDirectory() {
+ val oldConfigDir = context.getExternalFilesDir(null)
+ if (oldConfigDir == null || oldConfigDir.listFiles().isNullOrEmpty()) return // nothing to do
+
+ try {
+ log.info(
+ "Migrating files present in old configuration directory at {} to {}",
+ oldConfigDir.absolutePath,
+ paths.confDir()
+ )
+
+ oldConfigDir.copyRecursively(paths.confDir(), overwrite = false)
+ oldConfigDir.deleteRecursively()
+ } catch (e: IOException) {
+ log.warn("Could not complete configuration directory migration: {}", e.defaultMessage())
+ }
+ }
+
+ private fun migrateLogDirectory() {
+ val oldLogDir = context.cacheDir
+ if (oldLogDir == null || oldLogDir.listFiles().isNullOrEmpty()) return // nothing to do
+
+ try {
+ // There's no point moving the log files. Let's delete those instead.
+ log.info("Clearing old cache directory at {}", oldLogDir.absolutePath)
+ oldLogDir.deleteRecursively()
+ } catch (e: IOException) {
+ log.warn("Could not remove old cache directory: {}", e.defaultMessage())
+ }
+ }
+}
--
cgit v1.2.3