From f67e221e7a20281688170f00b3e3c586557dd91c Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Wed, 3 Oct 2018 08:19:41 +0200
Subject: [PATCH] More progress towards AndroidX

---
 app/build.gradle                                            | 2 +-
 app/gplay.gradle                                            | 2 +-
 .../talk/application/NextcloudTalkApplication.java          | 2 +-
 .../java/com/nextcloud/talk/controllers/CallController.java | 5 +----
 gradle.properties                                           | 3 +--
 gradle/wrapper/gradle-wrapper.properties                    | 6 +++---
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 37165b704..283da3334 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -188,7 +188,7 @@ dependencies {
 
     implementation 'com.github.Kennyc1012:BottomSheet:2.4.1'
     implementation 'eu.davidea:flipview:1.2.0'
-    implementation 'com.webianks.library:popup-bubble:1.0.5'
+    implementation 'com.github.mario:PopupBubble:a365177d96'
 
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
     implementation 'com.kevalpatel2106:emoticongifkeyboard:1.1'
diff --git a/app/gplay.gradle b/app/gplay.gradle
index ea8468037..c9b8d976d 100644
--- a/app/gplay.gradle
+++ b/app/gplay.gradle
@@ -1,3 +1,3 @@
 dependencies {
-  implementation "com.google.firebase:firebase-messaging:17.1.0"
+  implementation "com.google.firebase:firebase-messaging:17.3.3"
 }
diff --git a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java
index 3c6a40962..6332545f2 100644
--- a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java
+++ b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java
@@ -103,8 +103,8 @@ public class NextcloudTalkApplication extends MultiDexApplication implements Lif
                 WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true);
             }
 
+
             PeerConnectionFactory.initialize(PeerConnectionFactory.InitializationOptions.builder(this)
-                    .setEnableVideoHwAcceleration(MagicWebRTCUtils.shouldEnableVideoHardwareAcceleration())
                     .createInitializationOptions());
         } catch (UnsatisfiedLinkError e) {
             Log.w(TAG, e);
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 5e0b8d368..ca81a87e9 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java
@@ -330,9 +330,6 @@ public class CallController extends BaseController {
         PeerConnectionFactory.Options options = new PeerConnectionFactory.Options();
         peerConnectionFactory = PeerConnectionFactory.builder().createPeerConnectionFactory();
 
-        peerConnectionFactory.setVideoHwAccelerationOptions(rootEglBase.getEglBaseContext(),
-                rootEglBase.getEglBaseContext());
-
         //Create MediaConstraints - Will be useful for specifying video and audio constraints.
         audioConstraints = new MediaConstraints();
         videoConstraints = new MediaConstraints();
@@ -533,7 +530,7 @@ public class CallController extends BaseController {
 
         //Create a VideoSource instance
         if (videoCapturer != null) {
-            videoSource = peerConnectionFactory.createVideoSource(videoCapturer);
+            videoSource = peerConnectionFactory.createVideoSource(false);
             localVideoTrack = peerConnectionFactory.createVideoTrack("NCv0", videoSource);
             localMediaStream.addTrack(localVideoTrack);
             localVideoTrack.setEnabled(false);
diff --git a/gradle.properties b/gradle.properties
index c489a19dc..a066d344a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,6 +15,5 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-android.enableAapt2=false
 android.useAndroidX=true
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b052ecc28..17ee6ae82 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Mon Oct 01 13:14:24 CEST 2018
+#Tue Apr 03 16:56:17 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
-distributionSha256Sum=b7aedd369a26b177147bcb715f8b1fc4fe32b0a6ade0d7fd8ee5ed0c6f731f2c
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionSha256Sum=9af7345c199f1731c187c96d3fe3d31f5405192a42046bafa71d846c3d9adacb
\ No newline at end of file