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

Add nickname

Browse source
This commit is contained in:
vshcherb 2014-05-28 18:15:37 +02:00
parent b49791add0
commit f2f69e08ca
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout/osmo_connect_to_device.xml
View file

@ -60,7 +60,7 @@
android:paddingLeft="3dp" />
</TableRow>
<TableRow android:id="@+id/MyGroupName">
<TableRow android:id="@+id/MyGroupName" android:visibility="gone">
<TextView
android:layout_width="wrap_content"

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

@ -240,7 +240,9 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
private List<OsMoDevice> mergeGroup(OsMoGroup gr, JSONObject obj, boolean deleteUsers) {
List<OsMoDevice> delta = new ArrayList<OsMoDevice>();
try {
parseGroup(obj.getJSONObject("group"), gr);
if(obj.has("group")) {
parseGroup(obj.getJSONObject("group"), gr);
}
JSONArray arr = obj.getJSONArray(USERS);
Map<String, OsMoDevice> toDelete = new HashMap<String, OsMoDevice>(gr.users);
for (int i = 0; i < arr.length(); i++) {