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

Fixed formatting OsMoGroups.

Browse source
This commit is contained in:
GaidamakUA 2016-01-25 16:12:33 +02:00
parent 16fc9a481a
commit 7ea1955b8c
1 changed files with 75 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,7 +73,7 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
}
public void addUiListeners(OsMoGroupsUIListener uiListener) {
if (!uiListeners.contains(uiListener)){
if (!uiListeners.contains(uiListener)) {
uiListeners.add(uiListener);
}
}
@ -83,12 +83,12 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
}
private void connectDeviceImpl(OsMoDevice d) {
d.enabled = true;
d.enabled = true;
d.active = true;
String mid = service.getMyTrackerId();
String mgid = service.getMyGroupTrackerId();
if ((mid == null || !mid.equals(d.getTrackerId()))
&& (mgid == null || !mgid.equals(d.getTrackerId()))) {
&& (mgid == null || !mgid.equals(d.getTrackerId()))) {
tracker.startTrackingId(d);
}
}
@ -119,9 +119,9 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
public String disconnectGroup(OsMoGroup model) {
model.enabled = false;
String operation = "GROUP_DISCONNECT:"+model.groupId;
String operation = "GROUP_DISCONNECT:" + model.groupId;
service.pushCommand(operation);
for(OsMoDevice d : model.getGroupUsers(null)) {
for (OsMoDevice d : model.getGroupUsers(null)) {
tracker.stopTrackingId(d);
}
storage.save();
@ -148,7 +148,7 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
for (OsMoGroup g : getGroups()) {
OsMoDevice d = g.updateLastLocation(trackerId, location);
if (d != null && uiListeners != null) {
for(OsMoGroupsUIListener listener : uiListeners) {
for (OsMoGroupsUIListener listener : uiListeners) {
listener.deviceLocationChanged(d);
}
}
@ -161,47 +161,47 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
boolean processed = false;
String operation = command + ":" + gid;
OsMoGroup group = null;
if(command.equalsIgnoreCase("GP")) {
if (command.equalsIgnoreCase("GP")) {
group = storage.getGroup(gid);
if(group != null && gid.length() > 0) {
if (group != null && gid.length() > 0) {
List<OsMoDevice> delta = mergeGroup(group, obj, false);
String mygid = service.getMyGroupTrackerId();
StringBuilder b = new StringBuilder();
for(OsMoDevice d : delta) {
if(d.getDeletedTimestamp() != 0 && d.isEnabled()) {
if(group.name != null && !d.getTrackerId().equals(mygid)) {
for (OsMoDevice d : delta) {
if (d.getDeletedTimestamp() != 0 && d.isEnabled()) {
if (group.name != null && !d.getTrackerId().equals(mygid)) {
b.append(app.getString(R.string.osmo_user_left, d.getVisibleName(), group.getVisibleName(app))).append("\n");
}
disconnectImpl(d);
} else if(!d.isActive()) {
if(group.name != null && !d.getTrackerId().equals(mygid)) {
} else if (!d.isActive()) {
if (group.name != null && !d.getTrackerId().equals(mygid)) {
b.append(app.getString(R.string.osmo_user_joined, d.getVisibleName(), group.getVisibleName(app))).append("\n");
}
connectDeviceImpl(d);
}
}
if(b.length() > 0 && app.getSettings().OSMO_SHOW_GROUP_NOTIFICATIONS.get()){
if (b.length() > 0 && app.getSettings().OSMO_SHOW_GROUP_NOTIFICATIONS.get()) {
app.showToastMessage(b.toString().trim());
}
storage.save();
}
processed = true;
} else if(command.equalsIgnoreCase("GROUP_DISCONNECT")) {
} else if (command.equalsIgnoreCase("GROUP_DISCONNECT")) {
group = storage.getGroup(gid);
if(group != null) {
if (group != null) {
disconnectAllGroupUsers(group);
disableGroupTracks(group, group.groupTracks);
disableGroupTracks(group, Collections.singleton(group.name + " points.gpx"));
}
processed = true;
} else if(command.equalsIgnoreCase("GROUP_CONNECT")) {
} else if (command.equalsIgnoreCase("GROUP_CONNECT")) {
group = storage.getGroup(gid);
if(group != null) {
if (group != null) {
mergeGroup(group, obj, true);
group.active = true;
// connect to enabled devices in group
for(OsMoDevice d : group.getGroupUsers(null)) {
if(d.isEnabled()) {
for (OsMoDevice d : group.getGroupUsers(null)) {
if (d.isEnabled()) {
d.active = false;
connectDeviceImpl(d);
}
@ -209,8 +209,8 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
storage.save();
}
processed = true;
} else if(command.equalsIgnoreCase("GROUP_CREATE") || command.equalsIgnoreCase("GROUP_JOIN") ) {
if(command.equalsIgnoreCase("GROUP_CREATE")) {
} else if (command.equalsIgnoreCase("GROUP_CREATE") || command.equalsIgnoreCase("GROUP_JOIN")) {
if (command.equalsIgnoreCase("GROUP_CREATE")) {
operation = command;
try {
gid = obj.getString(GROUP_ID);
@ -221,7 +221,7 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
}
}
group = storage.getGroup(gid);
if(group == null) {
if (group == null) {
group = new OsMoGroup();
group.groupId = gid;
storage.addGroup(group);
@ -229,9 +229,9 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
connectGroupImpl(group);
storage.save();
processed = true;
} else if(command.equals("GROUP_LEAVE")) {
} else if (command.equals("GROUP_LEAVE")) {
group = storage.getGroup(gid);
if(group != null) {
if (group != null) {
storage.deleteGroup(group);
}
storage.save();
@ -252,8 +252,8 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
storage.save();
}
processed = true;
for(OsMoGroup g : storage.getGroups()) {
if(!g.isMainGroup() && g.isEnabled()) {
for (OsMoGroup g : storage.getGroups()) {
if (!g.isMainGroup() && g.isEnabled()) {
connectGroupImpl(g);
}
}
@ -263,8 +263,8 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
return processed;
}
}
if(processed && uiListeners != null) {
for(OsMoGroupsUIListener listener : uiListeners){
if (processed && uiListeners != null) {
for (OsMoGroupsUIListener listener : uiListeners) {
listener.groupsListChange(operation, group);
}
@ -273,11 +273,11 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
}
private void disableGroupTracks(OsMoGroup group, Collection<String> tracks) {
if(!tracks.isEmpty()) {
if (!tracks.isEmpty()) {
GpxSelectionHelper helper = app.getSelectedGpxHelper();
for(String t : tracks) {
SelectedGpxFile sg = helper.getSelectedFileByName("osmo/"+t);
if(sg != null && sg.getGpxFile() != null) {
for (String t : tracks) {
SelectedGpxFile sg = helper.getSelectedFileByName("osmo/" + t);
if (sg != null && sg.getGpxFile() != null) {
helper.selectGpxFile(sg.getGpxFile(), false, false);
}
}
@ -299,16 +299,16 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
private void parseGroup(JSONObject obj, OsMoGroup gr) {
try {
if(obj.has(GROUP_NAME)) {
if (obj.has(GROUP_NAME)) {
gr.name = obj.getString(GROUP_NAME);
}
if(obj.has(DESCRIPTION)) {
if (obj.has(DESCRIPTION)) {
gr.description = obj.getString(DESCRIPTION);
}
if(obj.has(POLICY)) {
if (obj.has(POLICY)) {
gr.policy = obj.getString(POLICY);
}
if(obj.has(EXPIRE_TIME)) {
if (obj.has(EXPIRE_TIME)) {
gr.expireTime = obj.getLong(EXPIRE_TIME);
}
} catch (JSONException e) {
@ -320,7 +320,7 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
private void disconnectAllGroupUsers(OsMoGroup gr) {
gr.active = false;
for(OsMoDevice d : gr.getGroupUsers(null)) {
for (OsMoDevice d : gr.getGroupUsers(null)) {
disconnectImpl(d);
}
}
@ -329,7 +329,7 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
private List<OsMoDevice> mergeGroup(OsMoGroup gr, JSONObject obj, boolean deleteUsers) {
List<OsMoDevice> delta = new ArrayList<OsMoDevice>();
try {
if(obj.has("group")) {
if (obj.has("group")) {
parseGroup(obj.getJSONObject("group"), gr);
}
Map<String, OsMoDevice> toDelete = new HashMap<String, OsMoDevice>(gr.users);
@ -408,12 +408,12 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
}
points.add(pt);
}
if(points.size() > 0) {
if (points.size() > 0) {
plugin.getSaveGpxTask(gr.name + " points", modify, false).execute(points.toArray(new WptPt[points.size()]));
}
}
if(deleteUsers) {
for(OsMoDevice s : toDelete.values()) {
if (deleteUsers) {
for (OsMoDevice s : toDelete.values()) {
s.deleted = System.currentTimeMillis();
delta.add(s);
}
@ -440,24 +440,24 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
}
public String joinGroup(String groupId, String userName, String nick) {
final String op = "GROUP_JOIN:"+groupId+"|"+nick;
final String op = "GROUP_JOIN:" + groupId + "|" + nick;
OsMoGroup g = storage.getGroup(groupId);
if(g == null){
if (g == null) {
g = new OsMoGroup();
g.groupId = groupId;
storage.addGroup(g);
}
g.userName = userName;
service.pushCommand(op);
return "GROUP_JOIN:"+groupId;
return "GROUP_JOIN:" + groupId;
}
public String leaveGroup(OsMoGroup group) {
final String op = "GROUP_LEAVE:"+group.groupId;
final String op = "GROUP_LEAVE:" + group.groupId;
storage.deleteGroup(group);
storage.save();
service.pushCommand(op);
if(group.isEnabled()) {
if (group.isEnabled()) {
group.enabled = false;
disconnectAllGroupUsers(group);
}
@ -480,5 +480,4 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
storage.clearGroups();
storage.save();
}
}