Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed URL processing in OsMo

Browse source
This commit is contained in:
GaidamakUA 2016-01-25 16:11:34 +02:00
parent 0409a057ad
commit 16fc9a481a
2 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
View file

@ -1,13 +1,6 @@
package net.osmand.plus.osmo;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.gson.Gson;
import net.osmand.Location;
import net.osmand.plus.GPXUtilities.WptPt;
@ -24,6 +17,15 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
private static final String GROUP_NAME = "name";
@ -47,6 +49,8 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
private ArrayList<OsMoGroupsUIListener> uiListeners = new ArrayList<>();
private OsMoPlugin plugin;
private OsmandApplication app;
private Gson gson = new Gson();
public interface OsMoGroupsUIListener {
@ -423,17 +427,10 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
public String createGroup(String groupName, boolean onlyByInvite, String description, String policy) {
JSONObject obj = new JSONObject();
try {
obj.put("name", groupName);
obj.put("onlyByInvite", onlyByInvite);
obj.put("description", description);
obj.put("policy", policy);
service.pushCommand("GROUP_CREATE|" + obj.toString());
return "GROUP_CREATE";
} catch (JSONException e) {
throw new RuntimeException(e);
}
Protocol.CreateGroupData obj = new Protocol.CreateGroupData(groupName,
onlyByInvite, description, policy);
service.pushCommand("GROUP_CREATE|" + gson.toJson(obj));
return "GROUP_CREATE";
}

17
OsmAnd/src/net/osmand/plus/osmo/Protocol.java Normal file
View file

@ -0,0 +1,17 @@
package net.osmand.plus.osmo;
public class Protocol {
public static class CreateGroupData {
public final String name;
public final boolean onlyByInvite;
public final String description;
public final String policy;
public CreateGroupData(String name, boolean onlyByInvite, String description, String policy) {
this.name = name;
this.onlyByInvite = onlyByInvite;
this.description = description;
this.policy = policy;
}
}
}