Skip to content

Commit

Permalink
change signature for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
or-else committed Aug 19, 2019
1 parent aa2db37 commit c5d99a0
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions app/src/main/java/co/tinode/tindroid/MessageActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,13 @@ public void onResume() {
mTopic = (ComTopic<VxCard>) tinode.getTopic(mTopicName);
if (mTopic != null) {
UiUtils.setupToolbar(this, mTopic.getPub(), mTopicName, mTopic.getOnline());
showFragment(FRAGMENT_MESSAGES, false, null);
showFragment(FRAGMENT_MESSAGES, null, false);
} else {
// New topic by name, either an actual grp* or p2p* topic name or a usr*
Log.w(TAG, "Attempt to instantiate an unknown topic: " + mTopicName);
UiUtils.setupToolbar(this, null, mTopicName, false);
mTopic = (ComTopic<VxCard>) tinode.newTopic(mTopicName, null);
showFragment(FRAGMENT_INVALID, false, null);
showFragment(FRAGMENT_INVALID, null, false);
}
mTopic.setListener(new TListener());

Expand Down Expand Up @@ -248,7 +248,7 @@ private void topicAttach() {
public PromisedReply<ServerMessage> onSuccess(ServerMessage result) {
UiUtils.setupToolbar(MessageActivity.this, mTopic.getPub(),
mTopicName, mTopic.getOnline());
showFragment(FRAGMENT_MESSAGES, false, null);
showFragment(FRAGMENT_MESSAGES, null, false);
runOnUiThread(new Runnable() {
@Override
public void run() {
Expand All @@ -274,7 +274,7 @@ public PromisedReply<ServerMessage> onFailure(Exception err) {
if (!(err instanceof NotConnectedException)) {
Log.w(TAG, "Subscribe failed", err);
if (err instanceof ServerResponseException) {
showFragment(FRAGMENT_INVALID, false, null);
showFragment(FRAGMENT_INVALID, null, false);
}
}
return null;
Expand Down Expand Up @@ -311,7 +311,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
switch (id) {
case R.id.action_view_contact:
showFragment(FRAGMENT_INFO, true, null);
showFragment(FRAGMENT_INFO,null, false);
return true;

case R.id.action_archive:
Expand Down Expand Up @@ -372,7 +372,7 @@ private boolean isFragmentVisible(String tag) {
return fragment != null && fragment.isVisible();
}

void showFragment(String tag, boolean addToBackstack, Bundle args) {
void showFragment(String tag, Bundle args, boolean addToBackstack) {
FragmentManager fm = getSupportFragmentManager();
Fragment fragment = fm.findFragmentByTag(tag);
if (fragment == null) {
Expand Down

0 comments on commit c5d99a0

Please sign in to comment.