mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-21 20:45:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

More progress towards AndroidX

Browse source
This commit is contained in:
Mario Danic 2018-10-03 08:19:41 +02:00
parent bd2820c90e
commit f67e221e7a
6 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -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'

2
app/gplay.gradle
View file

@ -1,3 +1,3 @@
dependencies {
implementation "com.google.firebase:firebase-messaging:17.1.0"
implementation "com.google.firebase:firebase-messaging:17.3.3"
}

2
app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java
View file

@ -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);

5
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View file

@ -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);

1
gradle.properties
View file

@ -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

6
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -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