Skip to content

Commit cc8e1c0

Browse files
author
David Gräff
committed
Move files around. Improve pluginRemote debug messages.
1 parent 44b1fe2 commit cc8e1c0

18 files changed

+143
-288
lines changed

‎.idea/workspace.xml‎

Lines changed: 85 additions & 235 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
<component name="FacetManager">
44
<facet type="android" name="Android">
55
<configuration>
6-
<option name="SELECTED_BUILD_VARIANT" value="release" />
7-
<option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
8-
<option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseJava" />
9-
<option name="SOURCE_GEN_TASK_NAME" value="generateReleaseSources" />
6+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
7+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
8+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
9+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
10+
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1011
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1112
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1213
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -21,21 +22,26 @@
2122
</facet>
2223
</component>
2324
<component name="NewModuleRootManager" inherit-compiler-output="false">
24-
<output url="file://$MODULE_DIR$/build/classes/release" />
25+
<output url="file://$MODULE_DIR$/build/classes/debug" />
2526
<exclude-output />
2627
<content url="file://$MODULE_DIR$">
27-
<sourceFolder url="file://$MODULE_DIR$/build/source/r/release" isTestSource="false" generated="true" />
28-
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/release" isTestSource="false" generated="true" />
29-
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/release" isTestSource="false" generated="true" />
30-
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/release" isTestSource="false" generated="true" />
31-
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/release" type="java-resource" />
32-
<sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
33-
<sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
34-
<sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
35-
<sourceFolder url="file://$MODULE_DIR$/src/release/assets" isTestSource="false" />
36-
<sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
37-
<sourceFolder url="file://$MODULE_DIR$/src/release/jni" isTestSource="false" />
38-
<sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
28+
<sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
29+
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
30+
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
39+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
41+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
42+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
3945
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
4046
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
4147
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
</receiver>
103103

104104
<service
105-
android:name="oly.netpowerctrl.network.NetpowerctrlService"
105+
android:name=".application_state.NetpowerctrlService"
106106
android:permission="android.permission.INTERNET" />
107107

108108
<service android:name="oly.netpowerctrl.widget.WidgetUpdateService" />

‎app/src/main/java/oly/netpowerctrl/anel/AnelPlugin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818

1919
import oly.netpowerctrl.R;
2020
import oly.netpowerctrl.application_state.NetpowerctrlApplication;
21+
import oly.netpowerctrl.application_state.PluginInterface;
2122
import oly.netpowerctrl.datastructure.DeviceInfo;
2223
import oly.netpowerctrl.datastructure.DevicePort;
23-
import oly.netpowerctrl.datastructure.ExecutionFinished;
24-
import oly.netpowerctrl.datastructure.PluginInterface;
2524
import oly.netpowerctrl.datastructure.Scene;
2625
import oly.netpowerctrl.network.DevicePortRenamed;
2726
import oly.netpowerctrl.network.DeviceSend;
27+
import oly.netpowerctrl.network.ExecutionFinished;
2828

2929
/**
3030
* For executing a name on a DevicePort or commands for multiple DevicePorts (bulk).

‎app/src/main/java/oly/netpowerctrl/anel/ConfigureDeviceFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import oly.netpowerctrl.R;
1919
import oly.netpowerctrl.application_state.NetpowerctrlApplication;
20+
import oly.netpowerctrl.application_state.PluginInterface;
2021
import oly.netpowerctrl.datastructure.DeviceInfo;
21-
import oly.netpowerctrl.datastructure.PluginInterface;
2222
import oly.netpowerctrl.network.DeviceQuery;
2323
import oly.netpowerctrl.network.DeviceQueryResult;
2424
import oly.netpowerctrl.network.DeviceUpdate;

‎app/src/main/java/oly/netpowerctrl/application_state/NetpowerctrlApplication.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import oly.netpowerctrl.network.DeviceQuery;
2222
import oly.netpowerctrl.network.DeviceQueryResult;
2323
import oly.netpowerctrl.network.DeviceSend;
24-
import oly.netpowerctrl.network.NetpowerctrlService;
25-
import oly.netpowerctrl.network.ServiceReady;
2624
import oly.netpowerctrl.preferences.SharedPrefs;
2725
import oly.netpowerctrl.utils.ShowToast;
2826

app/src/main/java/oly/netpowerctrl/network/NetpowerctrlService.java renamed to app/src/main/java/oly/netpowerctrl/application_state/NetpowerctrlService.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package oly.netpowerctrl.network;
1+
package oly.netpowerctrl.application_state;
22

33
import android.app.Service;
44
import android.content.BroadcastReceiver;
@@ -15,11 +15,9 @@
1515

1616
import oly.netpowerctrl.R;
1717
import oly.netpowerctrl.anel.AnelPlugin;
18-
import oly.netpowerctrl.application_state.NetpowerctrlApplication;
1918
import oly.netpowerctrl.datastructure.DeviceInfo;
20-
import oly.netpowerctrl.datastructure.PluginInterface;
21-
import oly.netpowerctrl.datastructure.PluginRemote;
2219
import oly.netpowerctrl.main.NetpowerctrlActivity;
20+
import oly.netpowerctrl.network.DeviceSend;
2321
import oly.netpowerctrl.preferences.SharedPrefs;
2422
import oly.netpowerctrl.utils.ShowToast;
2523

app/src/main/java/oly/netpowerctrl/datastructure/PluginInterface.java renamed to app/src/main/java/oly/netpowerctrl/application_state/PluginInterface.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
package oly.netpowerctrl.datastructure;
1+
package oly.netpowerctrl.application_state;
22

3+
import oly.netpowerctrl.datastructure.DeviceInfo;
4+
import oly.netpowerctrl.datastructure.DevicePort;
35
import oly.netpowerctrl.network.DevicePortRenamed;
6+
import oly.netpowerctrl.network.ExecutionFinished;
47

58
/**
69
* Created by david on 10.04.14.

app/src/main/java/oly/netpowerctrl/datastructure/PluginRemote.java renamed to app/src/main/java/oly/netpowerctrl/application_state/PluginRemote.java

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package oly.netpowerctrl.datastructure;
1+
package oly.netpowerctrl.application_state;
22

33
import android.content.ComponentName;
44
import android.content.Context;
@@ -14,9 +14,10 @@
1414
import java.util.TreeMap;
1515

1616
import oly.netpowerctrl.R;
17-
import oly.netpowerctrl.application_state.NetpowerctrlApplication;
17+
import oly.netpowerctrl.datastructure.DeviceInfo;
18+
import oly.netpowerctrl.datastructure.DevicePort;
1819
import oly.netpowerctrl.network.DevicePortRenamed;
19-
import oly.netpowerctrl.network.NetpowerctrlService;
20+
import oly.netpowerctrl.network.ExecutionFinished;
2021
import oly.netpowerctrl.plugins.INetPwrCtrlPlugin;
2122
import oly.netpowerctrl.plugins.INetPwrCtrlPluginResult;
2223
import oly.netpowerctrl.utils.ShowToast;
@@ -26,7 +27,7 @@
2627
* plugin service values.
2728
*/
2829
public class PluginRemote implements PluginInterface {
29-
private static final String TAG = "PluginRemote";
30+
private String TAG = "PluginRemote";
3031
private static final String INetPwrCtrlPlugin_NAME = "oly.netpowerctrl.plugins.INetPwrCtrlPlugin";
3132
private final Context context;
3233
public String serviceName;
@@ -78,7 +79,7 @@ public void onServiceDisconnected(ComponentName className) {
7879
*/
7980
private PluginRemote(Context context, String serviceName, String localized_name) {
8081
String UniqueDeviceID = "plugin" + serviceName;
81-
82+
TAG += " " + serviceName;
8283
this.context = context;
8384
this.localized_name = localized_name;
8485
this.serviceName = serviceName;
@@ -136,15 +137,15 @@ public void finish() {
136137
public void requestData() {
137138
try {
138139
if (service != null) {
139-
Log.w(TAG, "init: " + serviceName + " " + service.toString());
140+
Log.w(TAG, "init");
140141
service.init(callback);
141142
} else
142143
ShowToast.FromOtherThread(context, context.getString(R.string.error_plugin_failed, localized_name));
143144
} catch (RemoteException e) {
144145
ShowToast.FromOtherThread(context, context.getString(R.string.error_plugin_failed, localized_name) + " " + e.getMessage());
145146
} catch (Exception e) {
146147
ShowToast.FromOtherThread(context, context.getString(R.string.error_plugin_failed, localized_name) + "(g) " + e.getMessage());
147-
Log.w("PluginRemote,requestData", e.getMessage() == null ? "" : e.getMessage());
148+
Log.e(TAG, e.getMessage() == null ? "" : e.getMessage());
148149
e.printStackTrace();
149150
}
150151
}
@@ -165,7 +166,7 @@ public void rename(DevicePort port, String new_name, DevicePortRenamed callback)
165166
ShowToast.FromOtherThread(context, context.getString(R.string.error_plugin_failed, localized_name) + " " + e.getMessage());
166167
} catch (Exception e) {
167168
ShowToast.FromOtherThread(context, context.getString(R.string.error_plugin_failed, localized_name) + "(g) " + e.getMessage());
168-
Log.w("PluginRemote,rename", e.getMessage() == null ? "" : e.getMessage());
169+
Log.e(TAG, e.getMessage() == null ? "" : e.getMessage());
169170
e.printStackTrace();
170171
}
171172
}
@@ -244,7 +245,7 @@ public void pluginState(int state) {
244245
Handler h = new Handler(context.getMainLooper());
245246
h.post(new Runnable() {
246247
public void run() {
247-
Log.w("plugin:" + serviceName, "state: " + di.not_reachable_reason);
248+
Log.w(TAG, "new state: " + di.not_reachable_reason);
248249
NetpowerctrlApplication.getDataController().onDeviceUpdated(di);
249250
}
250251
});
@@ -256,7 +257,7 @@ public void run() {
256257
isRequesting = true;
257258
receiveFinished = false;
258259

259-
Log.w("plugin:" + serviceName, "requestValues");
260+
Log.w(TAG, "plugin ready. request data.");
260261

261262
try {
262263
service.requestValues();
@@ -351,12 +352,12 @@ public void finished() throws RemoteException {
351352
private void post() {
352353
if (!receiveFinished)
353354
return;
354-
Log.w("plugin:" + serviceName, "receiving done");
355+
Log.w(TAG, "receiving done");
355356
di.setReachable();
356357
Handler h = new Handler(context.getMainLooper());
357358
h.post(new Runnable() {
358359
public void run() {
359-
Log.w("plugin:" + serviceName, "receiving done main loop");
360+
Log.w(TAG, "receiving done main loop");
360361
NetpowerctrlApplication.getDataController().onDeviceUpdated(di);
361362
}
362363
});

‎app/src/main/java/oly/netpowerctrl/application_state/RuntimeDataController.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616
import oly.netpowerctrl.R;
1717
import oly.netpowerctrl.datastructure.DeviceInfo;
1818
import oly.netpowerctrl.datastructure.DevicePort;
19-
import oly.netpowerctrl.datastructure.ExecutionFinished;
2019
import oly.netpowerctrl.datastructure.Groups;
21-
import oly.netpowerctrl.datastructure.PluginInterface;
2220
import oly.netpowerctrl.datastructure.Scene;
2321
import oly.netpowerctrl.datastructure.SceneCollection;
2422
import oly.netpowerctrl.network.DevicePortRenamed;
2523
import oly.netpowerctrl.network.DeviceQuery;
2624
import oly.netpowerctrl.network.DeviceUpdate;
27-
import oly.netpowerctrl.network.RuntimeDataControllerStateChanged;
25+
import oly.netpowerctrl.network.ExecutionFinished;
2826
import oly.netpowerctrl.preferences.SharedPrefs;
2927
import oly.netpowerctrl.utils.Icons;
3028
import oly.netpowerctrl.utils.ShowToast;

0 commit comments

Comments
 (0)