Commit 92d00b44 authored by Grigory Fedorov's avatar Grigory Fedorov

Chat viewer debug behavior changed - wrong page selection cause chat closing.

parent 1e3997c3
...@@ -714,22 +714,22 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener ...@@ -714,22 +714,22 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
if (!(currentFragment instanceof ChatViewerFragment)) { if (!(currentFragment instanceof ChatViewerFragment)) {
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Debug message") builder.setTitle("Debug message")
.setMessage("Recent chats selected, but contact chat expected. Reselecting...") .setMessage("Recent chats selected, but contact chat expected.")
.setPositiveButton("ok", new DialogInterface.OnClickListener() { .setPositiveButton("ok", new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
selectPage(actionWithAccount, actionWithUser, false); finish();
} }
}); });
builder.create().show(); builder.create().show();
} else if (!((ChatViewerFragment) currentFragment).isEqual(actionWithAccount, actionWithUser)) { } else if (!((ChatViewerFragment) currentFragment).isEqual(actionWithAccount, actionWithUser)) {
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Debug message") builder.setTitle("Debug message")
.setMessage("Wrong contact chat selected. Reselecting...") .setMessage("Wrong contact chat selected.")
.setPositiveButton("ok", new DialogInterface.OnClickListener() { .setPositiveButton("ok", new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
selectPage(actionWithAccount, actionWithUser, false); finish();
} }
}); });
builder.create().show(); builder.create().show();
...@@ -740,11 +740,11 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener ...@@ -740,11 +740,11 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Debug message") builder.setTitle("Debug message")
.setMessage("Contact chat selected, but recent chats expected. Reselecting...") .setMessage("Contact chat selected, but recent chats expected.")
.setPositiveButton("ok", new DialogInterface.OnClickListener() { .setPositiveButton("ok", new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
selectPage(null, null, false); finish();
} }
}); });
builder.create().show(); builder.create().show();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment