Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Return to group after not inviting new members

Browse Source 
Also close keyboard when returning from message fragment
This commit is contained in:
Torsten Grote
2016-11-07 10:43:56 -02:00
parent fbcf334941
commit 7b884d2425
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-android/AndroidManifest.xml
View File

@@ -145,12 +145,11 @@
<activity <activity
android:name=".android.privategroup.creation.GroupInviteActivity" android:name=".android.privategroup.creation.GroupInviteActivity"
android:label="@string/groups_invite_members" android:label="@string/groups_invite_members"
android:parentActivityName=".android.NavDrawerActivity" android:parentActivityName=".android.privategroup.conversation.GroupActivity"
android:windowSoftInputMode="adjustResize|stateHidden"> android:windowSoftInputMode="adjustResize|stateHidden">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value=".android.privategroup.conversation.GroupActivity" android:value=".android.privategroup.conversation.GroupActivity"/>
/>
</activity> </activity>
<activity <activity

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> ThreadListActivity<PrivateGroup, GroupMessageItem, GroupMessageHeader>
implements OnClickListener { implements OnClickListener {
private final static int REQUEST_INVITE = 1; private final static int REQUEST_INVITE = 2;
@Inject @Inject
GroupController controller; 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.annotation.UiThread;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -62,6 +63,18 @@ public abstract class BaseMessageFragment extends BaseFragment
message.showSoftKeyboard(); 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 @Override
public void onSendClick(String msg) { public void onSendClick(String msg) {
if (StringUtils.utf8IsTooLong(msg, listener.getMaximumMessageLength())) { if (StringUtils.utf8IsTooLong(msg, listener.getMaximumMessageLength())) {

1
briar-core/src/org/briarproject/clients/ConversationClientImpl.java
View File

@@ -7,7 +7,6 @@ import org.briarproject.api.data.MetadataParser;
import org.briarproject.api.db.DatabaseComponent; import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException; import org.briarproject.api.db.DbException;
import org.briarproject.api.db.Transaction; import org.briarproject.api.db.Transaction;
import org.briarproject.api.messaging.ConversationManager;
import org.briarproject.api.messaging.ConversationManager.ConversationClient; import org.briarproject.api.messaging.ConversationManager.ConversationClient;
import org.briarproject.api.sync.Group; import org.briarproject.api.sync.Group;
import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.GroupId;