Mercury-IM/Mercury-IM
Mercury-IM
/
Mercury-IM
mirror of https://codeberg.org/Mercury-IM/Mercury-IM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Show back button in chat activity

This commit is contained in:
Paul Schaub 2019-09-01 02:53:31 +02:00
parent 5d9a8fb8d7
commit d37d17e5f2
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/org/mercury_im/messenger/ui/chat/ChatActivity.java
View File

@ -60,18 +60,20 @@ public class ChatActivity extends AppCompatActivity
setContentView(R.layout.activity_chat);
ButterKnife.bind(this);
setSupportActionBar(toolbar);
MercuryImApplication.getApplication().getAppComponent().inject(this);
recyclerView.setAdapter(recyclerViewAdapter);
recyclerView.setLayoutManager(new LinearLayoutManager(this));
if (savedInstanceState == null) {
savedInstanceState = getIntent().getExtras();
if (savedInstanceState == null) return;
}
setSupportActionBar(toolbar);
// Show back arrow
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
recyclerView.setAdapter(recyclerViewAdapter);
recyclerView.setLayoutManager(new LinearLayoutManager(this));
String jidString = savedInstanceState.getString(EXTRA_JID);
if (jidString != null) {
jid = JidCreate.entityBareFromOrThrowUnchecked(jidString);
@ -179,4 +181,11 @@ public class ChatActivity extends AppCompatActivity
chatViewModel.queryTextChanged(query);
return false;
}
@Override
public boolean onSupportNavigateUp() {
// Go back when left arrow is pressed in toolbar
onBackPressed();
return true;
}
}