README and syncing

README.md

@@ -47,17 +47,11 @@ If you have any issues or suggestions, feel free to [open a pull request](https:
 
 If you wish to customize or learn more about the project, go [here](docs/codestructure.md).
 
-## Downloading
+## Download and Installation
 
-### Build Dependecies
-
-First [install flutter](https://flutter.dev/docs/get-started/install). After that run:
+For android, you can directly download a built version of the latest release [here](https://github.com/Lutetium-Vanadium/Music-Flutter/releases). First generate the API Keys and then download the APK from the latest release.
 
-```sh
-flutter pub get
-```
-
-This will install dependecies.
+If you are on iOS or want to download and build the project yourself, follow the steps given below.
 
 ### Api keys
 
@@ -68,6 +62,16 @@ Steps to create the API Keys can be viewed [here](docs/apikeys.md).
 Once you have those created, you can move onto running the app.
 You will need to enter the api keys directly in the app.
 
+### Build Dependecies
+
+First [install flutter](https://flutter.dev/docs/get-started/install). After that run:
+
+```sh
+flutter pub get
+```
+
+This will install dependecies.
+
 ### Testing
 
 To run the tests, written for the app, run:
@@ -146,6 +150,12 @@ Once finished building, the APK will be available at `build/app/outputs/apk/rele
 flutter install
 ```
 
+You may be shown this popup when installing the app:
+
+<img src="docs/images/play_protect.png" height="200">
+
+You can safely click 'Install Anyway'.
+
 #### For iOS
 
 See flutter's [ios](https://flutter.dev/docs/deployment/ios) release documentaion.

lib/routes/SyncStatus.dart

@@ -77,6 +77,9 @@ class _SyncStatusPageState extends State<SyncStatusPage> {
                             ),
                           ],
                         );
+                      } else if (event is SyncSongsFailed) {
+                        widget = Text(
+                            "Retrying ${event.failed} song${event.failed == 1 ? "" : "s"}.");
                       } else if (event is SyncAlbumsInitial) {
                         widget = Text("Checking Albums...");
                       } else if (event is SyncAlbumsName) {

lib/sync.dart

@@ -140,9 +140,6 @@ class FirestoreSync {
 
   List<List<int>> _diff<T extends DbCollection>(
       List<T> local, List<Map<String, dynamic>> online) {
-    local.sort((a, b) => (a.getId < b.getId ? -1 : 1));
-    online.sort((a, b) => (_getId(a) < _getId(b) ? -1 : 1));
-
     List<int> toAdd = [];
     List<int> toDelete = [];
     List<int> toUpdate = [];
@@ -250,6 +247,9 @@ class FirestoreSync {
     var dbSongs = await db.getSongs();
     var firestoreSongs = snapshot.documents.map((d) => d.data).toList();
 
+    dbSongs.sort((a, b) => (a.getId < b.getId ? -1 : 1));
+    firestoreSongs.sort((a, b) => (_getId(a) < _getId(b) ? -1 : 1));
+
     var diff = _diff(dbSongs, firestoreSongs);
 
     List<int> failed = [];
@@ -327,6 +327,9 @@ class FirestoreSync {
     var dbAlbums = await db.getAlbums();
     var firestoreAlbums = snapshot.documents.map((d) => d.data).toList();
 
+    dbAlbums.sort((a, b) => (a.getId < b.getId ? -1 : 1));
+    firestoreAlbums.sort((a, b) => (_getId(a) < _getId(b) ? -1 : 1));
+
     var diff = _diff(dbAlbums, firestoreAlbums);
 
     await Future.wait(diff[0].map((idx) {
@@ -378,6 +381,9 @@ class FirestoreSync {
     var dbAlbums = await db.getCustomAlbums();
     var firestoreAlbums = snapshot.documents.map((d) => d.data).toList();
 
+    dbAlbums.sort((a, b) => (a.getId < b.getId ? -1 : 1));
+    firestoreAlbums.sort((a, b) => (_getId(a) < _getId(b) ? -1 : 1));
+
     var diff = _diff(dbAlbums, firestoreAlbums);
 
     await Future.wait(diff[0].map((idx) {

pubspec.yaml

@@ -3,7 +3,7 @@ description: A new Flutter project.
 
 publish_to: "none"
 
-version: 0.0.1+2
+version: 0.0.1+3
 
 environment:
   sdk: ">=2.7.0 <3.0.0"