Skip to content

Commit ad89ae2

Browse files
author
davidgraeff
committed
Version 1.9b
* Fix crash if listen service unbind is called while the service is not bound * Recreate plugin menu
1 parent 3382754 commit ad89ae2

File tree

6 files changed

+233
-230
lines changed

6 files changed

+233
-230
lines changed

‎.idea/workspace.xml‎

Lines changed: 192 additions & 209 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/aidl" isTestSource="false" />
33-
<sourceFolder url="file://$MODULE_DIR$/src/release/assets" isTestSource="false" />
34-
<sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
35-
<sourceFolder url="file://$MODULE_DIR$/src/release/jni" isTestSource="false" />
36-
<sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
37-
<sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
38-
<sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
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" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
39+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
40+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
41+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
42+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
3945
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
4046
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
4147
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />

‎app/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="oly.netpowerctrl"
4-
android:versionCode="15"
5-
android:versionName="1.9a">
4+
android:versionCode="16"
5+
android:versionName="1.9b">
66

7-
<!-- Api level 14: Android 4.0 15. Dezember 2011 -->
7+
<!-- Api level 14: Android 4.0 15. Dezember 2011 -->
88
<!-- Api level 16: Android 4.1 27. Juni 2012 -->
99
<!--<uses-sdk
1010
android:minSdkVersion="14"

‎app/src/main/java/oly/netpowerctrl/main/NetpowerctrlActivity.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ protected void onCreate(Bundle savedInstanceState) {
173173
// Plugins
174174
if (NetpowerctrlApplication.instance.pluginController == null)
175175
NetpowerctrlApplication.instance.pluginController = new PluginController(this, mDrawerAdapter);
176+
else
177+
NetpowerctrlApplication.instance.pluginController.recreate();
176178

177179
// enable ActionBar app icon to behave as action to toggle nav drawer
178180
//noinspection ConstantConditions

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,10 @@ public void stopListener() {
187187
mDiscoverServiceRefCount--;
188188
}
189189
if (mDiscoverServiceRefCount == 0) {
190-
unbindService(mConnection);
190+
try {
191+
unbindService(mConnection);
192+
} catch (IllegalArgumentException ignored) {
193+
}
191194
}
192195
}
193196

‎app/src/main/java/oly/netpowerctrl/plugins/PluginController.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,13 @@ private void initialPluginData(String serviceName,
109109
plugins.add(plugin);
110110
mDrawerAdapter.addPluginItem(localized_name, "", plugin.pluginId);
111111
}
112+
113+
public void recreate() {
114+
if (plugins.isEmpty()) {
115+
mDrawerAdapter.addPluginHeader(context.getString(R.string.plugin_drawer_title));
116+
}
117+
for (PluginRemote r : plugins) {
118+
mDrawerAdapter.addPluginItem(r.localized_name, "", r.pluginId);
119+
}
120+
}
112121
}

0 commit comments

Comments
 (0)