Merge pull request #6645 from nextcloud/dependabot/gradle/com.google.android.material-material-1.2.0

build.gradle

@@ -288,7 +288,7 @@ dependencies {
     implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.1' // remove after entire switch to lib v2
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'com.google.android.material:material:1.2.0'
     implementation 'com.jakewharton:disklrucache:2.0.2'
     implementation 'androidx.appcompat:appcompat:1.2.0-rc01'
     implementation 'androidx.cardview:cardview:1.0.0'

lint.xml

@@ -61,5 +61,6 @@
         <ignore path="**/work-runtime-2.**/**/lint.jar" />
         <ignore path="**/jetified-butterknife-runtime-10.**/**/lint.jar" />
         <ignore path="**/jetified-dagger-lint-aar-2.28.**/**/lint.jar" />
+        <ignore path="**/jetified-annotation-experimental-1.**/**/lint.jar" />
     </issue>
 </lint>

src/androidTest/java/com/owncloud/android/ScreenshotsIT.java

@@ -7,6 +7,7 @@ import com.owncloud.android.operations.CreateFolderOperation;
 import com.owncloud.android.operations.common.SyncOperation;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.activity.SettingsActivity;
+import com.owncloud.android.ui.activity.SyncedFoldersActivity;
 
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -31,7 +32,6 @@ import static androidx.test.espresso.Espresso.onData;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.Espresso.pressBack;
 import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.action.ViewActions.swipeUp;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.core.AnyOf.anyOf;
@@ -72,7 +72,7 @@ public class ScreenshotsIT extends AbstractOnServerIT {
         String path = "/Camera/";
 
         // folder does not exist yet
-        if (getStorageManager().getFileByPath(path) == null) {
+        if (getStorageManager().getFileByEncryptedRemotePath(path) == null) {
             SyncOperation syncOp = new CreateFolderOperation(path, user, targetContext);
             RemoteOperationResult result = syncOp.execute(client, getStorageManager());
 
@@ -117,11 +117,7 @@ public class ScreenshotsIT extends AbstractOnServerIT {
 
     @Test
     public void autoUploadScreenshot() {
-        ActivityScenario.launch(FileDisplayActivity.class);
-
-        onView(withId(R.id.drawer_layout)).perform(DrawerActions.open());
-        onView(withId(R.id.nav_view)).perform(swipeUp());
-        onView(anyOf(withText(R.string.drawer_synced_folders), withId(R.id.nav_synced_folders))).perform(click());
+        ActivityScenario.launch(SyncedFoldersActivity.class);
 
         Screengrab.screenshot("05_autoUpload");