From 23ded3a85190628a0fe58979c42b74b41678b641 Mon Sep 17 00:00:00 2001 From: jens Date: Tue, 8 Jun 2021 20:04:02 +0200 Subject: [PATCH] Minor corrections. --- app/build.gradle | 1 + .../jens/automation2/ActivityMaintenance.java | 17 +++++++++++++---- .../com/jens/automation2/AutomationService.java | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6a6b600..f47c884 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,6 +72,7 @@ dependencies { implementation 'com.linkedin.dexmaker:dexmaker:2.25.0' + implementation 'org.apache.commons:commons-lang3:3.0' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'com.google.android.material:material:1.3.0' diff --git a/app/src/main/java/com/jens/automation2/ActivityMaintenance.java b/app/src/main/java/com/jens/automation2/ActivityMaintenance.java index d4abf8a..e5056c7 100644 --- a/app/src/main/java/com/jens/automation2/ActivityMaintenance.java +++ b/app/src/main/java/com/jens/automation2/ActivityMaintenance.java @@ -16,6 +16,8 @@ import android.widget.Toast; import androidx.annotation.Nullable; import androidx.documentfile.provider.DocumentFile; +import org.apache.commons.lang3.StringUtils; + import java.io.File; import java.util.ArrayList; @@ -221,10 +223,17 @@ public class ActivityMaintenance extends Activity // Clean up for(DocumentFile file : directory.listFiles()) { - if(file.getName().equals(XmlFileInterface.settingsFileName) && file.canWrite()) - file.delete(); - else if(file.getName().equals(prefsFileName) && file.canWrite()) - file.delete(); + /* + On some few users' devices it seems this caused a crash because file.getName() was null. + The reason for that remains unknown, but we don't want the export to crash because of it. + */ + if(!StringUtils.isEmpty(file.getName())) + { + if (file.getName().equals(XmlFileInterface.settingsFileName) && file.canWrite()) + file.delete(); + else if (file.getName().equals(prefsFileName) && file.canWrite()) + file.delete(); + } } DocumentFile dstRules = directory.createFile("text/xml", XmlFileInterface.settingsFileName); diff --git a/app/src/main/java/com/jens/automation2/AutomationService.java b/app/src/main/java/com/jens/automation2/AutomationService.java index 25b6557..33a4100 100644 --- a/app/src/main/java/com/jens/automation2/AutomationService.java +++ b/app/src/main/java/com/jens/automation2/AutomationService.java @@ -197,7 +197,7 @@ public class AutomationService extends Service implements OnInitListener if (checkStartupRequirements(this, startAtBoot)) { - Miscellaneous.logEvent("i", "Service", this.getResources().getString(R.string.logServiceStarting), 1); + Miscellaneous.logEvent("i", "Service", this.getResources().getString(R.string.logServiceStarting) + " VERSION_CODE: " + BuildConfig.VERSION_CODE + ", VERSION_NAME: " + BuildConfig.VERSION_NAME + ", flavor: " + BuildConfig.FLAVOR, 1); startUpRoutine();