From a8b37cd0ac99e7380d4ecb740591284f5b0b1922 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Thu, 31 Jul 2014 01:31:56 +0200
Subject: [PATCH] Simplify group management

Conflicts:
	OsmAnd/res/values/strings.xml
---
 OsmAnd/res/values/strings.xml                          |  1 +
 .../src/net/osmand/plus/osmo/OsMoGroupsActivity.java   | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index b12a60173f..9f91ff5c5f 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -11,6 +11,7 @@
     -->
     <string name="map_preferred_locale_descr">Preferred lanaguage for labels on the map (if it is not available will switch to English or to local names)</string>
     <string name="map_preferred_locale">Map prefferred language</string>
+    <string name="osmo_invite">Invite...</string>
     <string name="osmo_leave_confirmation_msg">Do you want to leave group %1$s?</string>
     <string name="osmo_specify_tracker_id">Please specify id</string>
     <string name="continue_navigation">Continue Navigation</string>
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
index 6301a72559..e366eec226 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
@@ -504,7 +504,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 	
 	
 
-	protected void showGroupInfo(OsMoGroup group) {
+	protected void showGroupInfo(final OsMoGroup group) {
 		Builder bld = new AlertDialog.Builder(this);
 		bld.setTitle(R.string.osmo_group);
 		StringBuilder sb = new StringBuilder();
@@ -530,6 +530,13 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 		tv.setText(sb.toString());
 		bld.setView(sv);
 		bld.setPositiveButton(R.string.default_buttons_ok, null);
+		bld.setNegativeButton(R.string.osmo_invite, new OnClickListener() {
+			
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				shareOsMoGroup(group.getVisibleName(app), group.getGroupId());
+			}
+		});
 		bld.show();
 		
 	}
@@ -785,6 +792,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 				if(!checkOperationIsNotRunning()) {
 					return ;
 				}
+				joinGroup = true;
 				String op = osMoPlugin.getGroups().createGroup(name.getText().toString(), onlyByInvite.isChecked(),
 						description.getText().toString(), policy.getText().toString());
 				startLongRunningOperation(op);