From e7261c6eec87b5f6ffe5360ee011e3dd2df48c14 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 23 Sep 2022 19:42:31 +0530
Subject: [PATCH 1/2] Fix mapping of edited files on Android

---
 lib/services/remote_sync_service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/services/remote_sync_service.dart b/lib/services/remote_sync_service.dart
index 393369086..7cc4ef733 100644
--- a/lib/services/remote_sync_service.dart
+++ b/lib/services/remote_sync_service.dart
@@ -445,7 +445,7 @@ class RemoteSyncService {
           remoteDiff.localID,
           remoteDiff.fileType,
           title: remoteDiff.title,
-          deviceFolder: remoteDiff.deviceFolder,
+          deviceFolder: remoteDiff.deviceFolder ?? '',
         );
         if (localFileEntries.isEmpty) {
           // set remote file's localID as null because corresponding local file

From 70425a2f36ceccf0ef3f04beaa58b1e39b51ff20 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 23 Sep 2022 19:51:01 +0530
Subject: [PATCH 2/2] bump version code to 0.6.35+365

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 661ac18b5..86c79e63b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: ente photos application
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.6.34+364
+version: 0.6.35+365
 
 environment:
   sdk: '>=2.12.0 <3.0.0'