Merge "Fix the uri for local copies of cloud album cover" into main

1 files changed, 50 insertions, 0 deletions

diff --git a/tests/src/com/android/providers/media/photopicker/v2/sqlite/MediaGroupCursorUtilsTest.java b/tests/src/com/android/providers/media/photopicker/v2/sqlite/MediaGroupCursorUtilsTest.java
index 238e1f72a..5a8920674 100644
--- a/tests/src/com/android/providers/media/photopicker/v2/sqlite/MediaGroupCursorUtilsTest.java
+++ b/tests/src/com/android/providers/media/photopicker/v2/sqlite/MediaGroupCursorUtilsTest.java
@@ -30,8 +30,11 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.MockitoAnnotations.initMocks;
 
+import android.content.ContentResolver;
 import android.content.Context;
 import android.database.Cursor;
+import android.net.Uri;
+import android.os.UserHandle;
 
 import androidx.test.InstrumentationRegistry;
 
@@ -177,4 +180,51 @@ public class MediaGroupCursorUtilsTest {
                 .that(result.size())
                 .isEqualTo(0);
     }
+
+    @Test
+    public void testGetLocalUri() {
+        final String cloudAuthority = "cloud.authority";
+        final String cloudMediaId = "cloud-id";
+        final String localMediaId = "local-id";
+        final Uri cloudUri = new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .encodedAuthority(cloudAuthority)
+                .appendPath("media")
+                .appendPath(cloudMediaId)
+                .build();
+
+        final String localAuthority = PickerSyncController.getInstanceOrThrow().getLocalProvider();
+        final Uri expectedLocalUri = new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .encodedAuthority(UserHandle.myUserId() + "@" + localAuthority)
+                .appendPath("media")
+                .appendPath(localMediaId)
+                .build();
+
+        final String actualLocalUri = MediaGroupCursorUtils.maybeGetLocalUri(
+                cloudUri.toString(), Map.of(cloudMediaId, localMediaId));
+
+        assertWithMessage("Mapped local uri is not as expected.")
+                .that(actualLocalUri)
+                .isEqualTo(expectedLocalUri.toString());
+    }
+
+    @Test
+    public void testGetLocalUriWithNoMapping() {
+        final String cloudAuthority = "cloud.authority";
+        final String cloudMediaId = "cloud-id";
+        final Uri cloudUri = new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .encodedAuthority(cloudAuthority)
+                .appendPath("media")
+                .appendPath(cloudMediaId)
+                .build();
+
+        final String actualUri = MediaGroupCursorUtils.maybeGetLocalUri(
+                cloudUri.toString(), Map.of());
+
+        assertWithMessage("Returned uri is not as expected.")
+                .that(actualUri)
+                .isEqualTo(cloudUri.toString());
+    }
 }