From f4a5448e6bd6a1072e08002a414e19759826274f Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 2 Jun 2014 00:07:12 +0200
Subject: [PATCH] Small fixes

---
 OsmAnd/res/layout-v14/check_item_rel.xml        | 4 ++--
 OsmAnd/res/layout/check_item_rel.xml            | 4 ++--
 OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java | 9 +++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/res/layout-v14/check_item_rel.xml b/OsmAnd/res/layout-v14/check_item_rel.xml
index 26b81c2788..4bdff116d6 100644
--- a/OsmAnd/res/layout-v14/check_item_rel.xml
+++ b/OsmAnd/res/layout-v14/check_item_rel.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout  xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="fill_parent"
+    android:layout_height="wrap_content"
     android:layout_gravity="center_vertical" >
 
     <Switch
         android:id="@+id/check_item"
         android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
+        android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
         android:focusable="false"
diff --git a/OsmAnd/res/layout/check_item_rel.xml b/OsmAnd/res/layout/check_item_rel.xml
index 549ee64c09..963005c60f 100644
--- a/OsmAnd/res/layout/check_item_rel.xml
+++ b/OsmAnd/res/layout/check_item_rel.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="fill_parent"
+    android:layout_height="wrap_content"
     android:layout_gravity="center_vertical" >
 
     <CheckBox
         android:id="@+id/check_item"
         android:text="@string/osmo_connect_menu"
         android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
+        android:layout_height="wrap_content"
         android:layout_marginLeft="3dp"
         android:layout_marginRight="3dp"
         android:layout_marginTop="3dp"
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
index 3aac6a2f35..5b9f7f9039 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
@@ -123,12 +123,12 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 	}
 	
 	public void disconnectDevice(OsMoDevice model) {
+		model.enabled = false;
 		disconnectImpl(model);
 		storage.save();
 	}
 
 	private void disconnectImpl(OsMoDevice model) {
-		model.enabled = false;
 		model.active = false;
 		tracker.stopTrackingId(model);
 	}
@@ -192,12 +192,13 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 		} else if(command.equalsIgnoreCase("GROUP_CONNECT")) {
 			group = storage.getGroup(gid);
 			if(group != null) {
-				group.users.clear();
 				mergeGroup(group, obj, true);
 				group.active = true;
-				// connect to all devices in group
+				// connect to enabled devices in group
 				for(OsMoDevice d : group.getGroupUsers(null)) {
-					connectDeviceImpl(d);
+					if(d.isEnabled()) {
+						connectDeviceImpl(d);
+					}
 				}
 				storage.save();
 			}