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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-11-23 17:07:09 +01:00
commit 6635e0cc39
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/src/net/osmand/plus/osmo/OsMoControlDevice.java
View file

@ -33,7 +33,6 @@ public class OsMoControlDevice implements OsMoReactor {
this.plugin = plugin; this.plugin = plugin;
this.service = service; this.service = service;
this.tracker = tracker; this.tracker = tracker;
service.registerReactor(this);
} }
public JSONObject getBatteryLevel() throws JSONException { public JSONObject getBatteryLevel() throws JSONException {

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

@ -26,6 +26,7 @@ import android.text.TextUtils;
public class OsMoGroups implements OsMoReactor, OsmoTrackerListener { public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
private static final String GROUP_NAME = "name"; private static final String GROUP_NAME = "name";
private static final String ACTIVE = "active";
private static final String GROUP_ID = "group_id"; private static final String GROUP_ID = "group_id";
private static final String EXPIRE_TIME = "expireTime"; private static final String EXPIRE_TIME = "expireTime";
private static final String DESCRIPTION = "description"; private static final String DESCRIPTION = "description";
@ -250,14 +251,14 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
JSONArray arr = new JSONArray(data); JSONArray arr = new JSONArray(data);
int arrLength = arr.length(); int arrLength = arr.length();
if (arrLength > 0) { if (arrLength > 0) {
Map<String, OsMoGroup> resivedGroups = new HashMap<String, OsMoGroupsStorage.OsMoGroup>(); Map<String, OsMoGroup> receivedGroups = new HashMap<String, OsMoGroupsStorage.OsMoGroup>();
for (int i = 0; i < arrLength; i++) { for (int i = 0; i < arrLength; i++) {
JSONObject o = arr.getJSONObject(i); JSONObject o = arr.getJSONObject(i);
OsMoGroup parsedGroup = parseGroup(o); OsMoGroup parsedGroup = parseGroup(o);
resivedGroups.put(parsedGroup.getGroupId(), parsedGroup); receivedGroups.put(parsedGroup.getGroupId(), parsedGroup);
} }
storage.mergeGroups(resivedGroups); storage.mergeGroups(receivedGroups);
storage.save(); storage.save();
} }
processed = true; processed = true;
@ -360,7 +361,8 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
private OsMoGroup parseGroup(JSONObject obj) throws JSONException { private OsMoGroup parseGroup(JSONObject obj) throws JSONException {
OsMoGroup groupe = new OsMoGroup(); OsMoGroup groupe = new OsMoGroup();
groupe.enabled = true; groupe.enabled = !(obj.has(ACTIVE) && ("0".equals(obj.getString(ACTIVE)) ||
"false".equals(obj.getString(ACTIVE))));
groupe.name = obj.optString(GROUP_NAME); groupe.name = obj.optString(GROUP_NAME);
groupe.groupId = obj.getString(GROUP_ID); groupe.groupId = obj.getString(GROUP_ID);
groupe.description = obj.optString(DESCRIPTION); groupe.description = obj.optString(DESCRIPTION);

1
OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsStorage.java
View file

@ -73,7 +73,6 @@ public class OsMoGroupsStorage {
public void load() { public void load() {
String grp = pref.get(); String grp = pref.get();
try { try {
System.out.println("DEBUG : OsMo groups load info " + grp);
JSONObject obj = new JSONObject(grp); JSONObject obj = new JSONObject(grp);
parseGroupUsers(mainGroup, obj); parseGroupUsers(mainGroup, obj);
if(!obj.has(GROUPS)) { if(!obj.has(GROUPS)) {

3
OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
View file

@ -62,6 +62,7 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer
private OsMoPositionLayer olayer; private OsMoPositionLayer olayer;
protected MapActivity mapActivity; protected MapActivity mapActivity;
protected OsMoGroupsActivity groupsActivity; protected OsMoGroupsActivity groupsActivity;
protected OsMoControlDevice deviceControl;
private final static Log log = PlatformUtil.getLog(OsMoPlugin.class); private final static Log log = PlatformUtil.getLog(OsMoPlugin.class);
@ -71,7 +72,7 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer
service = new OsMoService(app, this); service = new OsMoService(app, this);
tracker = new OsMoTracker(service, app.getSettings().OSMO_SAVE_TRACK_INTERVAL, tracker = new OsMoTracker(service, app.getSettings().OSMO_SAVE_TRACK_INTERVAL,
app.getSettings().OSMO_AUTO_SEND_LOCATIONS); app.getSettings().OSMO_AUTO_SEND_LOCATIONS);
new OsMoControlDevice(app, this, service, tracker); deviceControl = new OsMoControlDevice(app, this, service, tracker);
groups = new OsMoGroups(this, service, tracker, app); groups = new OsMoGroups(this, service, tracker, app);
ApplicationMode.regWidget("osmo_control", (ApplicationMode[])null); ApplicationMode.regWidget("osmo_control", (ApplicationMode[])null);
} }