diff --git a/app/build.gradle b/app/build.gradle index 44bc168f..f87c1dd3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,5 @@ +import com.google.gms.googleservices.GoogleServicesPlugin + apply plugin: 'com.android.application' android { @@ -70,9 +72,9 @@ dependencies { implementation 'com.github.bumptech.glide:glide:4.11.0' implementation 'com.squareup.okhttp3:okhttp:4.4.1' - implementation 'com.google.firebase:firebase-analytics:17.4.0' + implementation 'com.google.firebase:firebase-analytics:17.4.1' implementation 'com.google.android.gms:play-services-base:17.2.1' - implementation 'com.google.firebase:firebase-messaging:20.1.6' + implementation 'com.google.firebase:firebase-messaging:20.1.7' implementation 'com.google.code.gson:gson:2.8.6' implementation 'com.google.android.exoplayer:exoplayer-core:2.11.4' @@ -103,4 +105,4 @@ dependencies { } apply plugin: 'com.google.gms.google-services' -com.google.gms.googleservices.GoogleServicesPlugin.config.disableVersionCheck = true +GoogleServicesPlugin.config.disableVersionCheck = true diff --git a/app/src/main/java/io/lbry/browser/MainActivity.java b/app/src/main/java/io/lbry/browser/MainActivity.java index 08295cf0..b9fc5105 100644 --- a/app/src/main/java/io/lbry/browser/MainActivity.java +++ b/app/src/main/java/io/lbry/browser/MainActivity.java @@ -535,8 +535,6 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener } protected void onNewIntent(Intent intent) { - android.util.Log.d(TAG, String.format("OnNewIntent: %s", intent)); - super.onNewIntent(intent); checkUrlIntent(intent); checkNotificationOpenIntent(intent); @@ -914,9 +912,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener @Override protected void onResume() { - android.util.Log.d(TAG, String.format("OnResume: Intent=%s", getIntent() != null ? getIntent().toString() : "NULL")); - super.onResume(); + enteringPIPMode = false; + applyNavbarSigninPadding(); checkFirstRun(); checkNowPlaying(); @@ -958,7 +956,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener @Override protected void onPause() { - if (!enteringPIPMode && appPlayer != null) { + if (!enteringPIPMode && !inPictureInPictureMode && appPlayer != null) { appPlayer.setPlayWhenReady(false); } super.onPause();