From 4cd3302853431406fa4bb7dcedee5bbd43b88e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Katzer?= <katzer.sebastian@googlemail.com>
Date: Mon, 30 Jan 2017 12:05:25 +0100
Subject: [PATCH] More code refactoring

---
 plugin.xml                                    |  2 +-
 ...kgroundModeExt.java => BackgroundExt.java} | 45 +++++++++++++++----
 src/android/BackgroundMode.java               | 32 ++-----------
 3 files changed, 42 insertions(+), 37 deletions(-)
 rename src/android/{BackgroundModeExt.java => BackgroundExt.java} (79%)

diff --git a/plugin.xml b/plugin.xml
index e96c2bd..6075035 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -82,7 +82,7 @@
             target-dir="src/de/appplant/cordova/plugin/background" />
 
         <source-file
-            src="src/android/BackgroundModeExt.java"
+            src="src/android/BackgroundExt.java"
             target-dir="src/de/appplant/cordova/plugin/background" />
 
         <source-file
diff --git a/src/android/BackgroundModeExt.java b/src/android/BackgroundExt.java
similarity index 79%
rename from src/android/BackgroundModeExt.java
rename to src/android/BackgroundExt.java
index be9468c..bf2026a 100644
--- a/src/android/BackgroundModeExt.java
+++ b/src/android/BackgroundExt.java
@@ -35,7 +35,7 @@ import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
 import java.util.List;
 
-class BackgroundModeExt {
+class BackgroundExt {
 
     // Weak reference to the cordova interface passed by the plugin
     private final WeakReference<CordovaInterface> cordova;
@@ -49,15 +49,44 @@ class BackgroundModeExt {
      * @param cordova The cordova interface.
      * @param webView The cordova web view.
      */
-    BackgroundModeExt(CordovaInterface cordova, CordovaWebView webView) {
+    private BackgroundExt(CordovaInterface cordova, CordovaWebView webView) {
         this.cordova = new WeakReference<CordovaInterface>(cordova);
         this.webView = new WeakReference<CordovaWebView>(webView);
     }
 
+    /**
+     * Executes the request.
+     *
+     * @param action  The action to execute.
+     * @param cordova The cordova interface.
+     * @param webView The cordova web view.
+     */
+    static void execute(String action, CordovaInterface cordova,
+                        CordovaWebView webView) {
+
+        BackgroundExt ext = new BackgroundExt(cordova, webView);
+
+        if (action.equalsIgnoreCase("optimizations")) {
+            ext.disableWebViewOptimizations();
+        }
+
+        if (action.equalsIgnoreCase("background")) {
+            ext.moveToBackground();
+        }
+
+        if (action.equalsIgnoreCase("foreground")) {
+            ext.moveToForeground();
+        }
+
+        if (action.equalsIgnoreCase("tasklist")) {
+            ext.excludeFromTaskList();
+        }
+    }
+
     /**
      * Move app to background.
      */
-    void moveToBackground() {
+    private void moveToBackground() {
         Intent intent = new Intent(Intent.ACTION_MAIN);
 
         intent.addCategory(Intent.CATEGORY_HOME);
@@ -67,7 +96,7 @@ class BackgroundModeExt {
     /**
      * Move app to foreground.
      */
-    void moveToForeground() {
+    private void moveToForeground() {
         Activity    app = getActivity();
         String pkgName  = app.getPackageName();
 
@@ -75,8 +104,8 @@ class BackgroundModeExt {
                 .getPackageManager()
                 .getLaunchIntentForPackage(pkgName);
 
-        intent.addFlags(
-                Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        intent.addFlags(  Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
+                        | Intent.FLAG_ACTIVITY_SINGLE_TOP);
 
         app.startActivity(intent);
     }
@@ -84,7 +113,7 @@ class BackgroundModeExt {
     /**
      * Enable GPS position tracking while in background.
      */
-    void disableWebViewOptimizations() {
+    private void disableWebViewOptimizations() {
         Thread thread = new Thread(){
             public void run() {
                 try {
@@ -119,7 +148,7 @@ class BackgroundModeExt {
     /**
      * Exclude the app from the recent tasks list.
      */
-    void excludeFromTaskList() {
+    private void excludeFromTaskList() {
         ActivityManager am = (ActivityManager) getActivity()
                 .getSystemService(Context.ACTIVITY_SERVICE);
 
diff --git a/src/android/BackgroundMode.java b/src/android/BackgroundMode.java
index 5551ff7..aebb3ca 100644
--- a/src/android/BackgroundMode.java
+++ b/src/android/BackgroundMode.java
@@ -60,9 +60,6 @@ public class BackgroundMode extends CordovaPlugin {
     // Service that keeps the app awake
     private ForegroundService service;
 
-    // Plugin extensions
-    private BackgroundModeExt ext;
-
     // Used to (un)bind the service to with the activity
     private final ServiceConnection connection = new ServiceConnection() {
         @Override
@@ -79,14 +76,6 @@ public class BackgroundMode extends CordovaPlugin {
         }
     };
 
-    /**
-     * Called after plugin construction and fields have been initialized.
-     */
-    @Override
-    protected void pluginInitialize() {
-        ext = new BackgroundModeExt(cordova, webView);
-    }
-
     /**
      * Executes the request.
      *
@@ -109,29 +98,16 @@ public class BackgroundMode extends CordovaPlugin {
 
             configure(settings, update);
         }
-
+        else
         if (action.equalsIgnoreCase("enable")) {
             enableMode();
         }
-
+        else
         if (action.equalsIgnoreCase("disable")) {
             disableMode();
         }
-
-        if (action.equalsIgnoreCase("optimizations")) {
-            ext.disableWebViewOptimizations();
-        }
-
-        if (action.equalsIgnoreCase("background")) {
-            ext.moveToBackground();
-        }
-
-        if (action.equalsIgnoreCase("foreground")) {
-            ext.moveToForeground();
-        }
-
-        if (action.equalsIgnoreCase("tasklist")) {
-            ext.excludeFromTaskList();
+        else {
+            BackgroundExt.execute(action, cordova, webView);
         }
 
         callback.success();