Skip to content

armgit / haven

Public Imported from GitHub
0

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

Delete files using JobService working

Arka Prava Basu6be6b28912fb
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.java
index 43fdf8c..31d4114 100644
--- a/src/main/java/org/havenapp/main/ListActivity.java
+++ b/src/main/java/org/havenapp/main/ListActivity.java
@@ -56,6 +56,7 @@ import com.firebase.jobdispatcher.Job;
import com.firebase.jobdispatcher.Lifetime;
import com.firebase.jobdispatcher.RetryStrategy;
import com.firebase.jobdispatcher.Trigger;
+import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import com.mikepenz.aboutlibraries.Libs;
import com.mikepenz.aboutlibraries.LibsBuilder;
@@ -247,7 +248,7 @@ public class ListActivity extends AppCompatActivity {
}
private static void scheduleCleanupJob(Context context) {
- if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) == 0) {
+ if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) != ConnectionResult.SUCCESS) {
return;
}
@@ -265,7 +266,7 @@ public class ListActivity extends AppCompatActivity {
.setRecurring(true)
.setTrigger(Trigger.executionWindow(0, 24 * 60 * 60))
.setRetryStrategy(RetryStrategy.DEFAULT_LINEAR)
- .setConstraints(Constraint.ON_ANY_NETWORK, Constraint.DEVICE_CHARGING)
+ .setConstraints(Constraint.DEVICE_CHARGING)
.build();
}
diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.java
index d603013..683737f 100644
--- a/src/main/java/org/havenapp/main/PreferenceManager.java
+++ b/src/main/java/org/havenapp/main/PreferenceManager.java
@@ -304,6 +304,10 @@ public class PreferenceManager {
return 10;
}
+ public String getBaseStoragePath() {
+ return appSharedPrefs.getString(CONFIG_BASE_STORAGE,CONFIG_BASE_STORAGE_DEFAULT);
+ }
+
public String getDefaultMediaStoragePath() {
return appSharedPrefs.getString(CONFIG_BASE_STORAGE,CONFIG_BASE_STORAGE_DEFAULT) + File.separator + getCurrentSession(); //phoneypot is the old code name for Haven
}
diff --git a/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt b/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt
index 2a2a0bc..80eb1ff 100644
--- a/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt
+++ b/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt
@@ -16,6 +16,9 @@ interface EventTriggerDAO {
@Delete
fun delete(eventTrigger: EventTrigger)
+ @Delete
+ fun deleteAll(eventTriggerList: List<EventTrigger>)
+
@Update
fun update(eventTrigger: EventTrigger)
diff --git a/src/main/java/org/havenapp/main/service/RemoveDeletedFilesService.kt b/src/main/java/org/havenapp/main/service/RemoveDeletedFilesService.kt
index 16bf539..82e8abe 100644
--- a/src/main/java/org/havenapp/main/service/RemoveDeletedFilesService.kt
+++ b/src/main/java/org/havenapp/main/service/RemoveDeletedFilesService.kt
@@ -1,5 +1,6 @@
package org.havenapp.main.service
+import android.os.Environment
import android.util.Log
import com.firebase.jobdispatcher.JobParameters
import com.firebase.jobdispatcher.JobService
@@ -29,7 +30,7 @@ class RemoveDeletedFilesService: JobService() {
removeDeletedLogsFromDisk()
jobFinished(job, true)
Log.d(SERVICE_TAG, "Stopping Cleanup service")
- }
+ }.start()
return true
}
@@ -40,25 +41,81 @@ class RemoveDeletedFilesService: JobService() {
val eventList = database.getEventDAO().getAllEvent()
val eventTriggerList = database.getEventTriggerDAO().getAllEventTriggers()
- // keep a list of all invalid event triggers
+ // delete all invalid event triggers
val inValidEventTriggerList = mutableListOf<EventTrigger>()
eventTriggerList.filter { it.mEventId !in eventList.map { it.id } }.mapTo(inValidEventTriggerList) { it }
-
- val currentFileList = mutableListOf<File>()
- val storageDir = File(PreferenceManager(this).defaultMediaStoragePath)
- currentFileList.addAll(storageDir.listFiles())
+ database.getEventTriggerDAO().deleteAll(inValidEventTriggerList)
val targetFileList = mutableListOf<File>()
- currentFileList.filter { it.absolutePath in inValidEventTriggerList.map { it.mPath } }.mapTo(targetFileList) { it }
+ getAllFilesToBeDeleted(targetFileList)
+
+ Log.d(SERVICE_TAG, targetFileList.toString())
// delete these files from disk
- for (file in targetFileList) {
- file.delete()
+ targetFileList.filter { !it.isDirectory }.forEach { it.delete() }
+
+ // delete empty directories remaining in our storage directory
+ deleteEmptyDirs()
+ }
+
+ private fun getAllFilesToBeDeleted(targetFileList: MutableList<File>) {
+ val storageDir = File(Environment.getExternalStorageDirectory(),
+ PreferenceManager(this).baseStoragePath)
+
+ if (!storageDir.exists())
+ return
+
+ val allFilePaths = getAllFilePathInStorage(storageDir)
+ val eventTriggerPaths = getAllEventTriggerPath()
+
+ allFilePaths.filter { it !in eventTriggerPaths }.mapTo(targetFileList) { File(it) }
+ }
+
+ private fun deleteEmptyDirs() {
+ val storageDir = File(Environment.getExternalStorageDirectory(),
+ PreferenceManager(this).baseStoragePath)
+
+ if (!storageDir.exists())
+ return
+
+ val subDir = storageDir.list { dir, name -> File(dir, name).isDirectory }
+ subDir.filter { it != null }.forEach {
+ val dir = File(storageDir, it)
+ if (dir.exists() && dir.isDirectory && dir.list().isEmpty())
+ dir.delete()
}
+ }
+
+ private fun getAllFilePathInStorage(storageDir: File): List<String> {
+ val filePaths = mutableListOf<String>()
+
+ val currentFileList = mutableListOf<File>()
- // remove entry of all invalid event triggers from database
- for (inValidEventTrigger in inValidEventTriggerList) {
- database.getEventTriggerDAO().delete(inValidEventTrigger)
+ getAllFileInStorageDir(storageDir, currentFileList)
+ currentFileList.addAll(storageDir.listFiles())
+
+ currentFileList.mapTo(filePaths) {
+ it.absolutePath
}
+
+ return filePaths
+ }
+
+ private fun getAllFileInStorageDir(storageDir: File, currentFileList: MutableList<File>) {
+ if (!storageDir.exists() || !storageDir.isDirectory)
+ return
+
+ currentFileList.addAll(storageDir.listFiles())
+
+ val subDir = storageDir.list { dir, name -> File(dir, name).isDirectory }
+ subDir.filter { it != null }.forEach { getAllFileInStorageDir(File(storageDir, it), currentFileList) }
+ }
+
+ private fun getAllEventTriggerPath(): List<String> {
+ val database = HavenEventDB.getDatabase(this)
+ val eventTriggerPathList = mutableListOf<String>()
+ database.getEventTriggerDAO().getAllEventTriggers().filter { it.mPath != null }
+ .mapTo(eventTriggerPathList) { it.mPath!! }
+ return eventTriggerPathList
}
}