Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 04:18:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '735-back-button-in-invite-members-screen-returns-to-group-list' into 'master'

Browse Source 
Return to group after not inviting new members

This MR also closes the keyboard when returning from the message fragment.

Closes #735

See merge request !389
This commit is contained in:
akwizgran
2016-11-08 11:55:36 +00:00
parent c640ee8e51 7b884d2425
commit d204757395
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/org/briarproject/android/privategroup/conversation/GroupActivity.java
View File

@@ -35,7 +35,7 @@ public class GroupActivity extends
ThreadListActivity<PrivateGroup, GroupMessageItem, GroupMessageHeader>
implements OnClickListener {
private final static int REQUEST_INVITE = 1;
private final static int REQUEST_INVITE = 2;
@Inject
GroupController controller;

13
briar-android/src/org/briarproject/android/sharing/BaseMessageFragment.java
View File

@@ -6,6 +6,7 @@ import android.support.annotation.StringRes;
import android.support.annotation.UiThread;
import android.support.design.widget.Snackbar;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
@@ -62,6 +63,18 @@ public abstract class BaseMessageFragment extends BaseFragment
message.showSoftKeyboard();
}
@Override
public boolean onOptionsItemSelected(final MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
if (message.isKeyboardOpen()) message.hideSoftKeyboard();
listener.onBackPressed();
return true;
default:
return super.onOptionsItemSelected(item);
}
}
@Override
public void onSendClick(String msg) {
if (StringUtils.utf8IsTooLong(msg, listener.getMaximumMessageLength())) {