Refactor App

zHd4 · Jan 4, 2025 · 17b6223 · 17b6223
1 parent 02d9453
commit 17b6223
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/app/src/main/java/app/notesr/App.java b/app/src/main/java/app/notesr/App.java
@@ -25,7 +25,7 @@ public static boolean onAndroid() {
         return context != null;
     }
 
-    public boolean serviceRunning(Class<?> serviceClass) {
+    public boolean isServiceRunning(Class<?> serviceClass) {
         String serviceName = serviceClass.getName();
         ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
 

diff --git a/app/src/main/java/app/notesr/activity/MainActivity.java b/app/src/main/java/app/notesr/activity/MainActivity.java
@@ -27,9 +27,9 @@ protected void onCreate(Bundle savedInstanceState) {
             intent = new Intent(this, StartActivity.class);
         } else if (cryptoManager.isBlocked()) {
             intent = new Intent(this, KeyRecoveryActivity.class);
-        } else if (App.getContext().serviceRunning(ExportService.class)) {
+        } else if (App.getContext().isServiceRunning(ExportService.class)) {
             intent = new Intent(this, ExportActivity.class);
-        } else if (App.getContext().serviceRunning(ImportService.class)) {
+        } else if (App.getContext().isServiceRunning(ImportService.class)) {
             intent = new Intent(this, ImportActivity.class);
         } else if (!cryptoManager.ready()) {
             intent = new Intent(this, AuthActivity.class);

diff --git a/app/src/main/java/app/notesr/activity/data/ExportActivity.java b/app/src/main/java/app/notesr/activity/data/ExportActivity.java
@@ -143,7 +143,7 @@ private void makeViewVisible(View view) {
     }
 
     private boolean exportRunning() {
-        return App.getContext().serviceRunning(ExportService.class);
+        return App.getContext().isServiceRunning(ExportService.class);
     }
 
     private void cancelExport() {

diff --git a/app/src/main/java/app/notesr/activity/data/ImportActivity.java b/app/src/main/java/app/notesr/activity/data/ImportActivity.java
@@ -220,6 +220,6 @@ private void startImport() {
     }
 
     private boolean isImportRunning() {
-        return App.getContext().serviceRunning(ImportService.class);
+        return App.getContext().isServiceRunning(ImportService.class);
     }
 }