Merge branch 'develop'

Author: Thibault Deckers

.github/workflows/main.yml

@@ -60,3 +60,30 @@ jobs:
         with:
           artifacts: "build/app/outputs/apk/release/*.apk,build/app/outputs/bundle/release/*.aab"
           token: ${{ secrets.RELEASE_WORKFLOW_TOKEN }}
+
+      - name: Upload app bundle
+        uses: actions/upload-artifact@v2
+        with:
+          name: appbundle
+          path: build/app/outputs/bundle/release/app-release.aab
+
+  release:
+    name: Create beta release on Play Store.
+    needs: [ build ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Get appbundle from artifacts.
+        uses: actions/download-artifact@v2
+        with:
+          name: appbundle
+
+      - name: Release app to beta channel.
+        uses: r0adkll/upload-google-play@v1
+        with:
+          serviceAccountJsonPlainText: ${{ secrets.PLAYSTORE_ACCOUNT_KEY }}
+          packageName: deckers.thibault.aves
+          releaseFile: app-release.aab
+          track: beta
+          whatsNewDirectory: whatsnew

android/app/src/main/AndroidManifest.xml

@@ -30,7 +30,7 @@
     <!-- to access media with unredacted metadata with scoped storage (Android Q+) -->
     <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
 
-    <!-- TODO remove this permission once this issue is fixed:
+    <!-- TODO TLAD remove this permission once this issue is fixed:
     https://github.com/flutter/flutter/issues/42349
     https://github.com/flutter/flutter/issues/42451
     -->

android/app/src/main/java/deckers/thibault/aves/channel/streams/ImageOpStreamHandler.java

@@ -6,6 +6,7 @@
 import android.os.Looper;
 import android.util.Log;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -94,6 +95,10 @@ private void move() {
         String destinationDir = (String) argMap.get("destinationPath");
         if (copy == null || destinationDir == null) return;
 
+        if (!destinationDir.endsWith(File.separator)) {
+            destinationDir += File.separator;
+        }
+
         List<AvesImageEntry> entries = entryMapList.stream().map(AvesImageEntry::new).collect(Collectors.toList());
         provider.moveMultiple(activity, copy, destinationDir, entries, new ImageProvider.ImageOpCallback() {
             @Override

android/app/src/main/java/deckers/thibault/aves/model/provider/ImageProvider.java

@@ -56,7 +56,7 @@ public ListenableFuture<Object> delete(final Activity activity, final String pat
         return Futures.immediateFailedFuture(new UnsupportedOperationException());
     }
 
-    public void moveMultiple(final Activity activity, Boolean copy, String destinationDir, List<AvesImageEntry> entries, @NonNull ImageOpCallback callback) {
+    public void moveMultiple(final Activity activity, final Boolean copy, final String destinationDir, final List<AvesImageEntry> entries, @NonNull final ImageOpCallback callback) {
         callback.onFailure(new UnsupportedOperationException());
     }
 
@@ -66,12 +66,11 @@ public void rename(final Activity activity, final String oldPath, final Uri oldM
             return;
         }
 
-        Map<String, Object> newFields = new HashMap<>();
         File oldFile = new File(oldPath);
         File newFile = new File(oldFile.getParent(), newFilename);
         if (oldFile.equals(newFile)) {
             Log.w(LOG_TAG, "new name and old name are the same, path=" + oldPath);
-            callback.onSuccess(newFields);
+            callback.onSuccess(new HashMap<>());
             return;
         }
 
@@ -94,40 +93,7 @@ public void rename(final Activity activity, final String oldPath, final Uri oldM
         }
 
         MediaScannerConnection.scanFile(activity, new String[]{oldPath}, new String[]{mimeType}, null);
-        MediaScannerConnection.scanFile(activity, new String[]{newFile.getPath()}, new String[]{mimeType}, (newPath, newUri) -> {
-            Log.d(LOG_TAG, "onScanCompleted with newPath=" + newPath + ", newUri=" + newUri);
-            if (newUri != null) {
-                // newURI is a file media URI (e.g. "content://media/12a9-8b42/file/62872")
-                // but we need an image/video media URI (e.g. "content://media/external/images/media/62872")
-                long contentId = ContentUris.parseId(newUri);
-                Uri contentUri = null;
-                if (mimeType.startsWith(MimeTypes.IMAGE)) {
-                    contentUri = ContentUris.withAppendedId(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentId);
-                } else if (mimeType.startsWith(MimeTypes.VIDEO)) {
-                    contentUri = ContentUris.withAppendedId(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, contentId);
-                }
-                if (contentUri != null) {
-                    // we retrieve updated fields as the renamed file became a new entry in the Media Store
-                    String[] projection = {MediaStore.MediaColumns.DATA, MediaStore.MediaColumns.TITLE};
-                    try {
-                        Cursor cursor = activity.getContentResolver().query(contentUri, projection, null, null, null);
-                        if (cursor != null) {
-                            if (cursor.moveToNext()) {
-                                newFields.put("uri", contentUri.toString());
-                                newFields.put("contentId", contentId);
-                                newFields.put("path", cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.DATA)));
-                                newFields.put("title", cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.TITLE)));
-                            }
-                            cursor.close();
-                        }
-                    } catch (Exception e) {
-                        callback.onFailure(e);
-                        return;
-                    }
-                }
-            }
-            callback.onSuccess(newFields);
-        });
+        scanNewPath(activity, newFile.getPath(), mimeType, callback);
     }
 
     public void rotate(final Activity activity, final String path, final Uri uri, final String mimeType, final boolean clockwise, final ImageOpCallback callback) {
@@ -291,6 +257,54 @@ private void rotatePng(final Activity activity, final String path, final Uri uri
 //        }
     }
 
+    protected void scanNewPath(final Activity activity, final String path, final String mimeType, final ImageOpCallback callback) {
+        MediaScannerConnection.scanFile(activity, new String[]{path}, new String[]{mimeType}, (newPath, newUri) -> {
+            Log.d(LOG_TAG, "scanNewPath onScanCompleted with newPath=" + newPath + ", newUri=" + newUri);
+
+            long contentId = 0;
+            Uri contentUri = null;
+            if (newUri != null) {
+                // newURI is possibly a file media URI (e.g. "content://media/12a9-8b42/file/62872")
+                // but we need an image/video media URI (e.g. "content://media/external/images/media/62872")
+                contentId = ContentUris.parseId(newUri);
+                if (mimeType.startsWith(MimeTypes.IMAGE)) {
+                    contentUri = ContentUris.withAppendedId(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentId);
+                } else if (mimeType.startsWith(MimeTypes.VIDEO)) {
+                    contentUri = ContentUris.withAppendedId(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, contentId);
+                }
+            }
+            if (contentUri == null) {
+                callback.onFailure(new Exception("failed to get content URI of item at path=" + path));
+                return;
+            }
+
+            Map<String, Object> newFields = new HashMap<>();
+            // we retrieve updated fields as the renamed file became a new entry in the Media Store
+            String[] projection = {MediaStore.MediaColumns.TITLE};
+            try {
+                Cursor cursor = activity.getContentResolver().query(contentUri, projection, null, null, null);
+                if (cursor != null) {
+                    if (cursor.moveToNext()) {
+                        newFields.put("uri", contentUri.toString());
+                        newFields.put("contentId", contentId);
+                        newFields.put("path", path);
+                        newFields.put("title", cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.MediaColumns.TITLE)));
+                    }
+                    cursor.close();
+                }
+            } catch (Exception e) {
+                callback.onFailure(e);
+                return;
+            }
+
+            if (newFields.isEmpty()) {
+                callback.onFailure(new Exception("failed to get item details from provider at contentUri=" + contentUri));
+            } else {
+                callback.onSuccess(newFields);
+            }
+        });
+    }
+
     public interface ImageOpCallback {
         void onSuccess(Map<String, Object> fields);