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

More magic

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-12-08 10:18:33 +01:00
parent 17aa050669
commit 3a9ebd16c3
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -116,6 +116,8 @@ public class CallActivity extends AppCompatActivity {
@BindView(R.id.full_screen_surface_view)
SurfaceViewRenderer fullScreenVideoView;
@BindView(R.id.relative_layout)
RelativeLayout relativeLayout;
@BindView(R.id.remote_renderers_layout)
LinearLayout remoteRenderersLayout;
@ -695,16 +697,13 @@ public class CallActivity extends AppCompatActivity {
}
private void gotRemoteStream(MediaStream stream, String session) {
if (fullScreenVideoView.getVisibility() != View.GONE) {
fullScreenVideoView.setVisibility(View.GONE);
if (fullScreenVideoView != null) {
remoteRenderersLayout.setVisibility(View.VISIBLE);
pipVideoView.setVisibility(View.VISIBLE);
localRenderer = new VideoRenderer(pipVideoView);
localVideoTrack.removeRenderer(localRenderer);
localRenderer = new VideoRenderer(pipVideoView);
localVideoTrack.addRenderer(localRenderer);
fullScreenVideoView.setVisibility(View.GONE);
relativeLayout.removeView(fullScreenVideoView);
}
removeMediaStream(session);

3
app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomOCS.java
View File

@ -24,6 +24,9 @@ import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.nextcloud.talk.api.models.json.generic.GenericOCS;
import lombok.Data;
@Data
@JsonObject
public class RoomOCS extends GenericOCS {
@JsonField(name = "data")

5
app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomOverall.java
View File

@ -23,14 +23,11 @@ package com.nextcloud.talk.api.models.json.rooms;
import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject;
import org.parceler.Parcel;
import lombok.Data;
@Parcel
@Data
@JsonObject
public class RoomOverall {
@JsonField(name = "ocs")
Room ocs;
RoomOCS ocs;
}

2
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
View File

@ -459,7 +459,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
overridePopHandler(new NoOpControllerChangeHandler());
Intent callIntent = new Intent(getActivity(), CallActivity.class);
BundleBuilder bundleBuilder = new BundleBuilder(new Bundle());
bundleBuilder.putString("roomToken", roomOverall.getOcs().getRoomId());
bundleBuilder.putString("roomToken", roomOverall.getOcs().getData().getToken());
bundleBuilder.putParcelable("userEntity", Parcels.wrap(userEntity));
callIntent.putExtras(bundleBuilder.build());
startActivity(callIntent);