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

Show group dialog after join

Browse source
This commit is contained in:
Victor Shcherb 2014-07-06 17:08:08 +02:00
parent 95eee530c1
commit 4e72b0b8c0
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values-ru/strings.xml
View file

@ -1686,7 +1686,7 @@ OsmAnd - открытый источник и активно развается.
<string name="osmo_user_left">Пользователь %1$s покинул группу %2$s</string>
<string name="osmo_show_group_notifications">Показывать извещения группы</string>
<string name="osmo_show_group_notifications_descr">Показывать сообщения, когда пользователь присоединяется или покидает группу</string>
<string name="osmo_group_policy">Политика</string>
<string name="osmo_group_policy">Правила</string>
<string name="osmo_control">Быстрый доступ к OsMo</string>
<string name="osmo_cancel_moving_target">Отменить движущуюся цель</string>
<string name="osmo_set_moving_target">Движущаяся цель</string>

7
OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
View file

@ -103,6 +103,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
protected static final int TRACK_DEV_ID = 11;
private static final int LIST_REFRESH_MSG_ID = OsmAndConstants.UI_HANDLER_SEARCH + 30;
private static final long RECENT_THRESHOLD = 60000;
private boolean joinGroup;
private OsMoPlugin osMoPlugin;
private OsMoGroupsAdapter adapter;
@ -722,6 +723,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
builder.setView(v);
builder.setNegativeButton(R.string.default_buttons_cancel, null);
builder.setPositiveButton(R.string.default_buttons_apply, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
final String nameUser = name.getText().toString();
@ -736,6 +738,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
if(!checkOperationIsNotRunning()) {
return;
}
joinGroup = true;
String op = osMoPlugin.getGroups().joinGroup(id, nameUser, nick);
if(app.getSettings().OSMO_USER_PWD.get() == null) {
app.getSettings().OSMO_USER_NAME.set(nick);
@ -795,6 +798,10 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
if(operation == top || (operation != null && operation.equals(top))) {
hideProgressBar();
}
if(joinGroup && (operation != null && operation.startsWith("GROUP_JOIN"))) {
showGroupInfo(group);
joinGroup = false;
}
if(group != null) {
adapter.update(group);
}