refactor donate. refactor alarms. debug app has own application id now. remove gdrive+neighbour sync. refactor storage.

Author: David Gräff

.idea/dictionaries/david.xml

@@ -8,6 +8,7 @@
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -81,14 +82,13 @@
     <orderEntry type="jdk" jdkName="Android API 20 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="support-v13-20.0.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12-beta-1" level="project" />
-    <orderEntry type="library" exported="" name="library-0.9" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-20.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-20.0.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-5.0.89" level="project" />
     <orderEntry type="library" exported="" name="acra-4.5.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
     <orderEntry type="library" exported="" name="library-1.5.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit-4.11" level="project" />
+    <orderEntry type="module" module-name="Donations" exported="" />
   </component>
 </module>
 

.idea/gradle.xml

@@ -11,12 +11,14 @@ android {
 //        }
 //    }
 
+    def appID = "oly.netpowerctrl"
+
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 20
         versionCode 83
         versionName "5.7.2"
-        applicationId "oly.netpowerctrl"
+        applicationId appID
         testApplicationId "oly.netpowerctrl.tests"
     }
 
@@ -33,10 +35,15 @@ android {
         release {
             zipAlign true
             runProguard true
+            resValue "string", "authority", appID + ".utils.AssetDocumentProvider"
+            //buildConfigField "String", "AUTHORITY", appID + ".utils.AssetDocumentProvider"
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.txt'
             debuggable false
         }
         debug {
+            applicationIdSuffix ".debug"
+            resValue "string", "authority", appID + ".utils.AssetDocumentProvider.Debug"
+            //buildConfigField "String", "AUTHORITY", appID + ".utils.AssetDocumentProvider.Debug"
             zipAlign true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             runProguard false
@@ -46,11 +53,11 @@ android {
 }
 
 dependencies {
-    //compile fileTree(dir: 'libs', include: ['*.jar']) :5.2.08
-    compile 'com.google.android.gms:play-services:5.0.89'
+    compile project(':libraries:Donations')
+    //compile fileTree(dir: 'libs', include: ['*.jar']) :5.2.08 5.0.89
+    //compile 'com.google.android.gms:play-services:5.2.08'
     compile 'com.github.gabrielemariotti.changeloglib:library:1.5.1'
     compile 'ch.acra:acra:4.5.0'
     compile 'com.android.support:support-v13:20.0.0'
-    compile 'com.github.chrisbanes.actionbarpulltorefresh:library:0.9'
-    androidTestCompile 'junit:junit:4.+'
+    androidTestCompile 'junit:junit:4.11'
 }

.idea/inspectionProfiles/Project_Default.xml

@@ -13,6 +13,7 @@
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="com.android.vending.BILLING" />
@@ -25,7 +26,7 @@
     <uses-sdk tools:node="replace" />
 
     <application
-        android:name=".application_state.NetpowerctrlApplication"
+        android:name=".main.App"
         android:allowBackup="true"
         android:icon="@drawable/netpowerctrl"
         android:label="@string/app_name"
@@ -34,7 +35,7 @@
         <!--android:permission="android.permission.MANAGE_DOCUMENTS"-->
         <provider
             android:name=".utils.AssetDocumentProvider"
-            android:authorities="oly.netpowerctrl.utils.AssetDocumentProvider"
+            android:authorities="@string/authority"
             android:enabled="@bool/atLeastKitKat"
             android:exported="true"
             android:grantUriPermissions="true"
@@ -49,9 +50,9 @@
             </intent-filter>
         </provider>
 
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
+        <!--<meta-data-->
+        <!--android:name="com.google.android.gms.version"-->
+        <!--android:value="@integer/google_play_services_version" />-->
 
         <activity
             android:name=".main.MainActivity"
@@ -131,12 +132,10 @@
         </receiver>
 
         <service
-            android:name=".application_state.NetpowerctrlService"
+            android:name=".listen_service.ListenService"
             android:permission="android.permission.INTERNET" />
 
         <service android:name="oly.netpowerctrl.widget.WidgetUpdateService" />
-
-        <service android:name=".backup.neighbours.NeighbourDataReceiveService" />
     </application>
 
 

.idea/modules.xml

@@ -13,12 +13,12 @@
 import java.util.Set;
 
 import oly.netpowerctrl.R;
-import oly.netpowerctrl.application_state.NetpowerctrlApplication;
-import oly.netpowerctrl.application_state.NetpowerctrlService;
-import oly.netpowerctrl.application_state.PluginInterface;
-import oly.netpowerctrl.application_state.RuntimeDataController;
+import oly.netpowerctrl.data.AppData;
 import oly.netpowerctrl.devices.Device;
 import oly.netpowerctrl.devices.DeviceConnection;
+import oly.netpowerctrl.listen_service.ListenService;
+import oly.netpowerctrl.listen_service.PluginInterface;
+import oly.netpowerctrl.main.App;
 import oly.netpowerctrl.network.UDPSending;
 
 /**
@@ -44,11 +44,11 @@ private void sendPacket(Context context, UDPSending udpSending, InetAddress ip,
 
     @Override
     public void process(UDPSending UDPSending) {
-        Context context = NetpowerctrlService.getService();
+        Context context = ListenService.getService();
         if (context == null)
             return;
 
-        Set<Integer> ports = RuntimeDataController.getDataController().getAllSendPorts();
+        Set<Integer> ports = AppData.getInstance().getAllSendPorts();
         boolean foundBroadcastAddresses = false;
 
         Enumeration list;
@@ -85,12 +85,12 @@ public void process(UDPSending UDPSending) {
 
             // Query all existing anel devices directly
 
-            List<Device> devices = RuntimeDataController.getDataController().deviceCollection.devices;
+            List<Device> devices = AppData.getInstance().deviceCollection.getItems();
             for (Device device : devices) {
                 if (device.pluginID.equals(AnelPlugin.PLUGIN_ID)) {
                     PluginInterface i = device.getPluginInterface();
                     if (i == null) {
-                        device.setNotReachableAll(NetpowerctrlApplication.getAppString(R.string.error_plugin_not_installed));
+                        device.setNotReachableAll(App.getAppString(R.string.error_plugin_not_installed));
                         continue;
                     }
                     for (DeviceConnection ci : device.DeviceConnections) {

.idea/workspace.xml

@@ -5,17 +5,19 @@
 
 import java.util.List;
 
-import oly.netpowerctrl.application_state.PluginInterface;
+import oly.netpowerctrl.data.ObserverUpdateActions;
+import oly.netpowerctrl.data.onCollectionUpdated;
 import oly.netpowerctrl.device_ports.DevicePort;
 import oly.netpowerctrl.devices.Device;
+import oly.netpowerctrl.devices.DeviceCollection;
+import oly.netpowerctrl.listen_service.PluginInterface;
 import oly.netpowerctrl.network.DeviceObserverResult;
 import oly.netpowerctrl.network.DeviceQuery;
-import oly.netpowerctrl.network.onConfiguredDeviceUpdate;
 
 /**
  * Created by david on 20.08.14.
  */
-public class AnelCreateDevice implements DeviceObserverResult, onConfiguredDeviceUpdate {
+public class AnelCreateDevice implements DeviceObserverResult, onCollectionUpdated<DeviceCollection, Device> {
     public final Device device;
     public AnelCreateDeviceResult listener = null;
     TestStates test_state = TestStates.TEST_INIT;
@@ -49,15 +51,45 @@ public boolean wakeupPlugin(Context context) {
     }
 
     @Override
-    public void onDeviceUpdated(Device di) {
-        onConfiguredDeviceUpdated(di, false);
+    public void onObserverDeviceUpdated(Device di) {
+        updated(null, di, ObserverUpdateActions.UpdateAction);
     }
 
     @Override
-    public void onConfiguredDeviceUpdated(Device updated_device, boolean willBeRemoved) {
-        if (!updated_device.equalsByUniqueID(device))
+    public void onObserverJobFinished(List<Device> timeout_devices) {
+        if (test_state != TestStates.TEST_REACHABLE)
             return;
 
+        for (Device di : timeout_devices) {
+            if (!di.equalsByUniqueID(device))
+                continue;
+            test_state = TestStates.TEST_INIT;
+            if (listener != null)
+                listener.testFinished(false);
+            break;
+        }
+    }
+
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+    public boolean startTest(Context context) {
+        test_state = TestStates.TEST_REACHABLE;
+
+        if (wakeupPlugin(context))
+            deviceQuery = new DeviceQuery(context, this, device);
+        else
+            return false;
+        return true;
+    }
+
+    public boolean isTesting() {
+        return test_state != TestStates.TEST_INIT && test_state != TestStates.TEST_OK;
+    }
+
+    @Override
+    public boolean updated(DeviceCollection deviceCollection, Device updated_device, ObserverUpdateActions action) {
+        if (!updated_device.equalsByUniqueID(device))
+            return true;
+
         if (!updated_device.isReachable()) {
             test_state = TestStates.TEST_INIT;
             if (listener != null)
@@ -99,38 +131,10 @@ public void run() {
             device.copyValuesFromUpdated(updated_device);
             test_state = TestStates.TEST_OK;
         }
-    }
-
-    @Override
-    public void onObserverJobFinished(List<Device> timeout_devices) {
-        if (test_state != TestStates.TEST_REACHABLE)
-            return;
-
-        for (Device di : timeout_devices) {
-            if (!di.equalsByUniqueID(device))
-                continue;
-            test_state = TestStates.TEST_INIT;
-            if (listener != null)
-                listener.testFinished(false);
-            break;
-        }
-    }
-
-    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-    public boolean startTest(Context context) {
-        test_state = TestStates.TEST_REACHABLE;
 
-        if (wakeupPlugin(context))
-            deviceQuery = new DeviceQuery(context, this, device);
-        else
-            return false;
         return true;
     }
 
-    public boolean isTesting() {
-        return test_state != TestStates.TEST_INIT && test_state != TestStates.TEST_OK;
-    }
-
     enum TestStates {TEST_INIT, TEST_REACHABLE, TEST_ACCESS, TEST_OK}
 
     public interface AnelCreateDeviceResult {