From 92f5008a4132e44db8fd57038c3311b27f672eca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 May 2021 19:10:36 +0000
Subject: [PATCH 1/3] Bump ucrop from 2.2.6 to 2.2.7
Bumps [ucrop](https://github.com/Yalantis/uCrop) from 2.2.6 to 2.2.7.
- [Release notes](https://github.com/Yalantis/uCrop/releases)
- [Commits](https://github.com/Yalantis/uCrop/compare/2.2.6...2.2.7)
Signed-off-by: dependabot[bot] <support@github.com>
---
vector/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vector/build.gradle b/vector/build.gradle
index 8af6e80479..63faa3b36c 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -417,7 +417,7 @@ dependencies {
implementation "com.github.bumptech.glide:glide:$glide_version"
kapt "com.github.bumptech.glide:compiler:$glide_version"
implementation 'com.danikula:videocache:2.7.1'
- implementation 'com.github.yalantis:ucrop:2.2.6'
+ implementation 'com.github.yalantis:ucrop:2.2.7'
// Badge for compatibility
implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
From 83a4f99830704b8d55641ce4acf7527d95cee475 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 2 Jun 2021 11:58:11 +0200
Subject: [PATCH 2/3] Fix compilation warning
---
.../im/vector/app/features/login/AbstractLoginFragment.kt | 4 +++-
.../im/vector/app/features/login2/AbstractLoginFragment2.kt | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
index c16c7c6645..ed999df1f2 100644
--- a/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
@@ -49,7 +49,9 @@ abstract class AbstractLoginFragment<VB: ViewBinding> : VectorBaseFragment<VB>()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- sharedElementEnterTransition = TransitionInflater.from(context).inflateTransition(android.R.transition.move)
+ context?.let {
+ sharedElementEnterTransition = TransitionInflater.from(it).inflateTransition(android.R.transition.move)
+ }
}
@CallSuper
diff --git a/vector/src/main/java/im/vector/app/features/login2/AbstractLoginFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/AbstractLoginFragment2.kt
index 39bee00ac2..77f7ac6e87 100644
--- a/vector/src/main/java/im/vector/app/features/login2/AbstractLoginFragment2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/AbstractLoginFragment2.kt
@@ -47,7 +47,9 @@ abstract class AbstractLoginFragment2<VB : ViewBinding> : VectorBaseFragment<VB>
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- sharedElementEnterTransition = TransitionInflater.from(context).inflateTransition(android.R.transition.move)
+ context?.let {
+ sharedElementEnterTransition = TransitionInflater.from(it).inflateTransition(android.R.transition.move)
+ }
}
@CallSuper
From 26d54eeb8bb7b25b4417371156476dab42835b87 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 2 Jun 2021 12:03:46 +0200
Subject: [PATCH 3/3] Explicitly add dep to androidx.transition.transition,
before it was a transitive dep from ucrop library.
---
vector/build.gradle | 1 +
1 file changed, 1 insertion(+)
diff --git a/vector/build.gradle b/vector/build.gradle
index 63faa3b36c..587d51403b 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -333,6 +333,7 @@ dependencies {
implementation "androidx.sharetarget:sharetarget:1.1.0"
implementation 'androidx.core:core-ktx:1.5.0'
implementation "androidx.media:media:1.3.1"
+ implementation "androidx.transition:transition:1.4.1"
implementation "org.threeten:threetenbp:1.4.0:no-tzdb"
implementation "com.gabrielittner.threetenbp:lazythreetenbp:0.9.0"