caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev

Browse source
This commit is contained in:
Milos Kozak 2018-04-01 11:10:24 +02:00
parent 0a03798de9 3fe7d9a43e
commit 5fa56b22c9
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/info/nightscout/androidaps/plugins/Wear/WearPlugin.java
View file

@ -31,8 +31,6 @@ import info.nightscout.utils.SP;
public class WearPlugin extends PluginBase { public class WearPlugin extends PluginBase {
private static boolean fragmentEnabled = false;
private boolean fragmentVisible = false;
private static WatchUpdaterService watchUS; private static WatchUpdaterService watchUS;
private final Context ctx; private final Context ctx;
@ -196,10 +194,6 @@ public class WearPlugin extends PluginBase {
ctx.startService(intent); ctx.startService(intent);
} }
public static boolean isEnabled() {
return fragmentEnabled;
}
public static void registerWatchUpdaterService(WatchUpdaterService wus) { public static void registerWatchUpdaterService(WatchUpdaterService wus) {
watchUS = wus; watchUS = wus;
} }

2
app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
View file

@ -108,7 +108,7 @@ public class WatchUpdaterService extends WearableListenerService implements
} }
public void setSettings() { public void setSettings() {
wear_integration = WearPlugin.isEnabled(); wear_integration = WearPlugin.getPlugin().isEnabled(PluginType.GENERAL);
if (wear_integration) { if (wear_integration) {
googleApiConnect(); googleApiConnect();
} }