Commit 6ca6a5b3 authored by Grigory Fedorov's avatar Grigory Fedorov

ContactList: action null pointer exception fixed.

parent 7fc567c3
...@@ -208,6 +208,7 @@ public class ContactList extends ManagedActivity implements OnChoosedListener, O ...@@ -208,6 +208,7 @@ public class ContactList extends ManagedActivity implements OnChoosedListener, O
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
if (action != null) {
switch (action) { switch (action) {
case ContactList.ACTION_ROOM_INVITE: case ContactList.ACTION_ROOM_INVITE:
case Intent.ACTION_SEND: case Intent.ACTION_SEND:
...@@ -247,6 +248,7 @@ public class ContactList extends ManagedActivity implements OnChoosedListener, O ...@@ -247,6 +248,7 @@ public class ContactList extends ManagedActivity implements OnChoosedListener, O
} }
break; break;
} }
}
} }
if (Application.getInstance().doNotify()) { if (Application.getInstance().doNotify()) {
if (SettingsManager.bootCount() > 2 if (SettingsManager.bootCount() > 2
......
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