Эх сурвалжийг харах

Merge pull request #8638 from nextcloud/dependabot/gradle/tools.fastlane-screengrab-2.1.0

Bump screengrab from 2.0.0 to 2.1.0
Andy Scherzinger 3 жил өмнө
parent
commit
cfa12f3c59

+ 1 - 1
build.gradle

@@ -384,7 +384,7 @@ dependencies {
     // androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
     // fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details
     //androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}"
-    androidTestImplementation 'tools.fastlane:screengrab:2.0.0'
+    androidTestImplementation 'tools.fastlane:screengrab:2.1.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     androidTestImplementation('com.android.support.test.espresso:espresso-intents:3.0.2')
 

+ 6 - 2
src/main/java/com/nextcloud/client/jobs/NotificationWork.kt

@@ -156,8 +156,12 @@ class NotificationWork constructor(
             }
             intent.putExtra(KEY_NOTIFICATION_ACCOUNT, user.accountName)
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            pendingIntent = PendingIntent.getActivity(context, notification.getNotificationId(), intent,
-                PendingIntent.FLAG_ONE_SHOT)
+            pendingIntent = PendingIntent.getActivity(
+                context,
+                notification.getNotificationId(),
+                intent,
+                PendingIntent.FLAG_ONE_SHOT
+            )
         }
 
         val pushNotificationId = randomId.nextInt()