From cfc1bca0331f5b7ae4c0ce3697cf6d49be378072 Mon Sep 17 00:00:00 2001 From: Haafingar Date: Thu, 4 Jun 2020 14:17:44 +1000 Subject: [PATCH] introduce excludes in build.gradle --- AndroidManifest.xml | 3 +++ build.gradle | 6 +++++- src/org/thoughtcrime/securesms/video/VideoPlayer.java | 9 ++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 29bb87816f..87644ddfaf 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -79,6 +79,9 @@ + diff --git a/build.gradle b/build.gradle index a9709b8d36..8264a47e6d 100644 --- a/build.gradle +++ b/build.gradle @@ -92,7 +92,11 @@ dependencies { implementation 'android.arch.lifecycle:extensions:1.1.1' implementation 'android.arch.lifecycle:common-java8:1.1.1' - implementation "com.google.firebase:firebase-messaging:$firebase_messaging_version" + implementation "com.google.firebase:firebase-messaging:$firebase_messaging_version" { + exclude group: 'com.google.firebase', module: 'firebase-core' + exclude group: 'com.google.firebase', module: 'firebase-analytics' + exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' + } implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1' implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.1' diff --git a/src/org/thoughtcrime/securesms/video/VideoPlayer.java b/src/org/thoughtcrime/securesms/video/VideoPlayer.java index 233dcf595f..13cf819155 100644 --- a/src/org/thoughtcrime/securesms/video/VideoPlayer.java +++ b/src/org/thoughtcrime/securesms/video/VideoPlayer.java @@ -30,31 +30,24 @@ import android.widget.Toast; import android.widget.VideoView; import com.google.android.exoplayer2.DefaultLoadControl; -import com.google.android.exoplayer2.ExoPlaybackException; -import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.LoadControl; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.SimpleExoPlayer; -import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory; import com.google.android.exoplayer2.extractor.ExtractorsFactory; import com.google.android.exoplayer2.source.ExtractorMediaSource; import com.google.android.exoplayer2.source.MediaSource; -import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection; import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; import com.google.android.exoplayer2.trackselection.TrackSelection; -import com.google.android.exoplayer2.trackselection.TrackSelectionArray; import com.google.android.exoplayer2.trackselection.TrackSelector; import com.google.android.exoplayer2.ui.PlayerControlView; import com.google.android.exoplayer2.ui.PlayerView; -import com.google.android.exoplayer2.ui.SimpleExoPlayerView; import com.google.android.exoplayer2.upstream.BandwidthMeter; import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; -import network.loki.messenger.R; import org.thoughtcrime.securesms.attachments.AttachmentServer; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.PartAuthority; @@ -64,6 +57,8 @@ import org.thoughtcrime.securesms.video.exo.AttachmentDataSourceFactory; import java.io.IOException; +import network.loki.messenger.R; + public class VideoPlayer extends FrameLayout { private static final String TAG = VideoPlayer.class.getSimpleName();