From a4e03bc9704724b84e385c17115228fda036e8e7 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 19 Jun 2018 19:58:03 +0200
Subject: [PATCH] Fix a few bugs

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../talk/activities/MagicCallActivity.java    |   4 +-
 .../talk/controllers/CallController.java      |   1 -
 app/src/main/res/layout/activity_call.xml     | 107 ------------------
 app/src/main/res/layout/controller_call.xml   |   2 +-
 4 files changed, 2 insertions(+), 112 deletions(-)
 delete mode 100644 app/src/main/res/layout/activity_call.xml

diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.java
index c00fadf11..914b1ba7f 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.java
@@ -88,9 +88,7 @@ public class MagicCallActivity extends AppCompatActivity {
 
     @Override
     public void onBackPressed() {
-        if (!router.handleBack()) {
-            super.onBackPressed();
-        }
+        finish();
     }
 
 }
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
index 2bcd45904..ed7e46597 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -1055,7 +1055,6 @@ public class CallController extends BaseController {
 
                                     @Override
                                     public void onError(Throwable e) {
-                                        Log.d("MARIO", e.getLocalizedMessage());
                                         dispose(signalingDisposable);
                                     }
 
diff --git a/app/src/main/res/layout/activity_call.xml b/app/src/main/res/layout/activity_call.xml
deleted file mode 100644
index 2d3ffce23..000000000
--- a/app/src/main/res/layout/activity_call.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Nextcloud Talk application
-  ~
-  ~ @author Mario Danic
-  ~ Copyright (C) 2017 Mario Danic <mario@lovelyhq.com>
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:id="@+id/relative_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:fitsSystemWindows="true"
-                tools:context=".activities.CallActivity">
-
-    <LinearLayout
-        android:id="@+id/remote_renderers_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:animateLayoutChanges="true"
-        android:background="@color/grey950"
-        android:orientation="vertical">
-    </LinearLayout>
-
-    <org.webrtc.SurfaceViewRenderer
-        android:id="@+id/pip_video_view"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentTop="true"
-        android:layout_margin="16dp"
-        android:visibility="invisible"/>
-
-    <LinearLayout
-        android:id="@+id/call_controls"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="16dp"
-        android:animateLayoutChanges="true"
-        android:background="@android:color/transparent"
-        android:gravity="center">
-
-        <com.nextcloud.talk.utils.MagicFlipView
-            xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/call_control_camera"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_marginEnd="20dp"
-            android:alpha="0.7"
-            app:checked="false"
-            app:enableInitialAnimation="false"
-            app:frontBackgroundColor="@color/colorPrimary"
-            app:frontImage="@drawable/ic_videocam_off_white_24px"/>
-
-        <com.nextcloud.talk.utils.MagicFlipView
-            xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/call_control_switch_camera"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_marginEnd="20dp"
-            android:visibility="gone"
-            app:checked="false"
-            app:enableInitialAnimation="false"
-            app:frontBackgroundColor="@color/colorPrimary"
-            app:frontImage="@drawable/ic_switch_video_white_24px"/>
-
-        <com.nextcloud.talk.utils.MagicFlipView
-            xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/call_control_microphone"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_marginEnd="20dp"
-            android:alpha="0.7"
-            app:checked="false"
-            app:enableInitialAnimation="false"
-            app:frontBackgroundColor="@color/colorPrimary"
-            app:frontImage="@drawable/ic_mic_off_white_24px"/>
-
-        <com.nextcloud.talk.utils.MagicFlipView
-            xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/call_control_hangup"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            app:checked="false"
-            app:enableInitialAnimation="false"
-            app:frontBackgroundColor="@color/nc_darkRed"
-            app:frontImage="@drawable/ic_call_end_white_24px"/>
-
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/controller_call.xml b/app/src/main/res/layout/controller_call.xml
index d89c6c07b..3a593756f 100644
--- a/app/src/main/res/layout/controller_call.xml
+++ b/app/src/main/res/layout/controller_call.xml
@@ -26,7 +26,7 @@
                 android:layout_height="match_parent"
                 android:background="@color/grey950"
                 android:fitsSystemWindows="true"
-                tools:context=".activities.CallActivity">
+                tools:context=".activities.MagicCallActivity">
 
     <RelativeLayout
         android:id="@+id/connectingRelativeLayoutView"