gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor intent creation

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-04-30 14:01:36 +02:00
parent b721e68a1a
commit 719c81d4a6
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -441,17 +441,10 @@ public class ChatController extends BaseController implements MessagesListAdapte
return true; return true;
case R.id.conversation_video_call: case R.id.conversation_video_call:
Bundle bundle = new Bundle(); startActivity(getIntentForCall(false));
bundle.putString(BundleKeys.KEY_ROOM_TOKEN, roomToken);
bundle.putParcelable(BundleKeys.KEY_USER_ENTITY, Parcels.wrap(currentUser));
bundle.putString(BundleKeys.KEY_CALL_SESSION, currentCall.getSessionId());
Intent callIntent = new Intent(getActivity(), CallActivity.class);
callIntent.putExtras(bundle);
startActivity(callIntent);
return true; return true;
case R.id.conversation_voice_call: case R.id.conversation_voice_call:
startActivity(getIntentForCall(true));
return true; return true;
default: default:
@ -459,6 +452,22 @@ public class ChatController extends BaseController implements MessagesListAdapte
} }
} }
private Intent getIntentForCall(boolean isVoiceOnlyCall) {
Bundle bundle = new Bundle();
bundle.putString(BundleKeys.KEY_ROOM_TOKEN, roomToken);
bundle.putParcelable(BundleKeys.KEY_USER_ENTITY, Parcels.wrap(currentUser));
bundle.putString(BundleKeys.KEY_CALL_SESSION, currentCall.getSessionId());
if (isVoiceOnlyCall) {
bundle.putBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, true);
}
Intent callIntent = new Intent(getActivity(), CallActivity.class);
callIntent.putExtras(bundle);
return callIntent;
}
@Override @Override
public void onSelectionChanged(int count) { public void onSelectionChanged(int count) {
//globalMenu.findItem(R.id.action_delete).setVisible(count > 0); //globalMenu.findItem(R.id.action_delete).setVisible(count > 0);

1
app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.java
View File

@ -47,4 +47,5 @@ public class BundleKeys {
public static final String KEY_INVITED_PARTICIPANTS = "KEY_INVITED_PARTICIPANTS"; public static final String KEY_INVITED_PARTICIPANTS = "KEY_INVITED_PARTICIPANTS";
public static final String KEY_CONVERSATION_NAME = "KEY_CONVERSATION_NAME"; public static final String KEY_CONVERSATION_NAME = "KEY_CONVERSATION_NAME";
public static final String KEY_ROOM_PASSWORD = "KEY_ROOM_PASSWORD"; public static final String KEY_ROOM_PASSWORD = "KEY_ROOM_PASSWORD";
public static final String KEY_CALL_VOICE_ONLY = "KEY_CALL_VOICE_ONLY";
} }