Add publisher

> no certificates with ExtKeyUsageCodeSigning
  Cannot extract publisher name from code signing certificate. As workaround, set win.publisherName.

desktop/.github/workflows/desktop-release.yml

@@ -54,8 +54,16 @@ jobs:
               # https://github.com/electron-userland/electron-builder/issues/4181
               run: sudo apt-get install libarchive-tools
 
-            - name: Build
+            - name: Export Windows code signing certificate
+              if: startsWith(matrix.os, 'windows')
+              run: echo "$CSC_LINK_PFX_B64" | base64 -d > windows-csc.pfx
+              shell: bash
+              env:
+                  CSC_LINK_PFX_B64: ${{ secrets.WINDOWS_CSC_LINK_PFX_B64 }}
+
+            - name: Build Linux
               uses: ente-io/action-electron-builder@v1.0.0
+              if: startsWith(matrix.os, 'ubuntu')
               with:
                   package_root: desktop
                   build_script_name: build:ci
@@ -68,6 +76,19 @@ jobs:
                   # create a (draft) release after building. Otherwise upload
                   # assets to the existing draft named after the version.
                   release: ${{ startsWith(github.ref, 'refs/tags/v') }}
+              env:
+                  # Workaround recommended in
+                  # https://github.com/electron-userland/electron-builder/issues/3179
+                  USE_HARD_LINKS: false
+
+            - name: Build macOS
+              uses: ente-io/action-electron-builder@v1.0.0
+              if: startsWith(matrix.os, 'macos')
+              with:
+                  package_root: desktop
+                  build_script_name: build:ci
+                  github_token: ${{ secrets.GITHUB_TOKEN }}
+                  release: ${{ startsWith(github.ref, 'refs/tags/v') }}
 
                   mac_certs: ${{ secrets.MAC_CERTS }}
                   mac_certs_password: ${{ secrets.MAC_CERTS_PASSWORD }}
@@ -78,3 +99,18 @@ jobs:
                       ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
                   APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
                   USE_HARD_LINKS: false
+
+            - name: Build Windows
+              uses: ente-io/action-electron-builder@v1.0.0
+              if: startsWith(matrix.os, 'windows')
+              with:
+                  package_root: desktop
+                  build_script_name: build:ci
+                  github_token: ${{ secrets.GITHUB_TOKEN }}
+                  release: ${{ startsWith(github.ref, 'refs/tags/v') }}
+              env:
+                  # Windows signing credentials
+                  # https://www.electron.build/code-signing
+                  CSC_LINK: "windows-csc.pfx"
+                  CSC_KEY_PASSWORD: ${{ secrets.WINDOWS_CSC_KEY_PASSWORD }}
+                  USE_HARD_LINKS: false

desktop/electron-builder.yml

@@ -7,6 +7,8 @@ extraFiles:
     - from: build
       to: resources
 win:
+    # prettier-ignore
+    publisherName: "C=US, ST=Delaware, L=Dover, O=Ente Technologies, Inc., CN=Ente, emailAddress=code@ente.io"
     target:
         - target: nsis
           arch: [x64, arm64]

mobile/lib/face/db.dart

@@ -35,15 +35,6 @@ class FaceMLDataDB {
 
   static final FaceMLDataDB instance = FaceMLDataDB._privateConstructor();
 
-  static final _migrationScripts = [
-    createFacesTable,
-    createFaceClustersTable,
-    createClusterPersonTable,
-    createClusterSummaryTable,
-    createNotPersonFeedbackTable,
-    fcClusterIDIndex,
-  ];
-
   // only have a single app-wide reference to the database
   static Future<SqliteDatabase>? _sqliteAsyncDBFuture;
 
@@ -59,42 +50,17 @@ class FaceMLDataDB {
     _logger.info("Opening sqlite_async access: DB path " + databaseDirectory);
     final asyncDBConnection =
         SqliteDatabase(path: databaseDirectory, maxReaders: 2);
-    final stopwatch = Stopwatch()..start();
-    _logger.info("FaceMLDataDB: Starting migration");
-    await _migrate(asyncDBConnection);
-    _logger.info(
-      "FaceMLDataDB Migration took ${stopwatch.elapsedMilliseconds} ms",
-    );
-    stopwatch.stop();
-
+    await _onCreate(asyncDBConnection);
     return asyncDBConnection;
   }
 
-  Future<void> _migrate(
-    SqliteDatabase database,
-  ) async {
-    final result = await database.execute('PRAGMA user_version');
-    final currentVersion = result[0]['user_version'] as int;
-    final toVersion = _migrationScripts.length;
-
-    if (currentVersion < toVersion) {
-      _logger.info("Migrating database from $currentVersion to $toVersion");
-      await database.writeTransaction((tx) async {
-        for (int i = currentVersion + 1; i <= toVersion; i++) {
-          try {
-            await tx.execute(_migrationScripts[i - 1]);
-          } catch (e) {
-            _logger.severe("Error running migration script index ${i - 1}", e);
-            rethrow;
-          }
-        }
-        await tx.execute('PRAGMA user_version = $toVersion');
-      });
-    } else if (currentVersion > toVersion) {
-      throw AssertionError(
-        "currentVersion($currentVersion) cannot be greater than toVersion($toVersion)",
-      );
-    }
+  Future<void> _onCreate(SqliteDatabase asyncDBConnection) async {
+    await asyncDBConnection.execute(createFacesTable);
+    await asyncDBConnection.execute(createFaceClustersTable);
+    await asyncDBConnection.execute(createClusterPersonTable);
+    await asyncDBConnection.execute(createClusterSummaryTable);
+    await asyncDBConnection.execute(createNotPersonFeedbackTable);
+    await asyncDBConnection.execute(fcClusterIDIndex);
   }
 
   // bulkInsertFaces inserts the faces in the database in batches of 1000.
@@ -229,10 +195,10 @@ class FaceMLDataDB {
     final db = await instance.asyncDB;
 
     await db.execute(deleteFacesTable);
-    await db.execute(deleteFaceClustersTable);
-    await db.execute(deleteClusterPersonTable);
-    await db.execute(deleteClusterSummaryTable);
-    await db.execute(deleteNotPersonFeedbackTable);
+    await db.execute(dropClusterPersonTable);
+    await db.execute(dropClusterSummaryTable);
+    await db.execute(deletePersonTable);
+    await db.execute(dropNotPersonFeedbackTable);
   }
 
   Future<Iterable<Uint8List>> getFaceEmbeddingsForCluster(
@@ -768,7 +734,7 @@ class FaceMLDataDB {
     try {
       final db = await instance.asyncDB;
 
-      await db.execute(deleteFaceClustersTable);
+      await db.execute(dropFaceClustersTable);
       await db.execute(createFaceClustersTable);
       await db.execute(fcClusterIDIndex);
     } catch (e, s) {
@@ -979,15 +945,16 @@ class FaceMLDataDB {
       if (faces) {
         await db.execute(deleteFacesTable);
         await db.execute(createFacesTable);
-        await db.execute(deleteFaceClustersTable);
+        await db.execute(dropFaceClustersTable);
         await db.execute(createFaceClustersTable);
         await db.execute(fcClusterIDIndex);
       }
 
-      await db.execute(deleteClusterPersonTable);
-      await db.execute(deleteNotPersonFeedbackTable);
-      await db.execute(deleteClusterSummaryTable);
-      await db.execute(deleteFaceClustersTable);
+      await db.execute(deletePersonTable);
+      await db.execute(dropClusterPersonTable);
+      await db.execute(dropNotPersonFeedbackTable);
+      await db.execute(dropClusterSummaryTable);
+      await db.execute(dropFaceClustersTable);
 
       await db.execute(createClusterPersonTable);
       await db.execute(createNotPersonFeedbackTable);
@@ -1005,8 +972,9 @@ class FaceMLDataDB {
       final db = await instance.asyncDB;
 
       // Drop the tables
-      await db.execute(deleteClusterPersonTable);
-      await db.execute(deleteNotPersonFeedbackTable);
+      await db.execute(deletePersonTable);
+      await db.execute(dropClusterPersonTable);
+      await db.execute(dropNotPersonFeedbackTable);
 
       // Recreate the tables
       await db.execute(createClusterPersonTable);

mobile/lib/face/db_fields.dart

@@ -29,7 +29,7 @@ const createFacesTable = '''CREATE TABLE IF NOT EXISTS $facesTable (
   );
   ''';
 
-const deleteFacesTable = 'DELETE FROM $facesTable';
+const deleteFacesTable = 'DROP TABLE IF EXISTS $facesTable';
 // End of Faces Table Fields & Schema Queries
 
 //##region Face Clusters Table Fields & Schema Queries
@@ -48,9 +48,15 @@ CREATE TABLE IF NOT EXISTS $faceClustersTable (
 // -- Creating a non-unique index on clusterID for query optimization
 const fcClusterIDIndex =
     '''CREATE INDEX IF NOT EXISTS idx_fcClusterID ON $faceClustersTable($fcClusterID);''';
-const deleteFaceClustersTable = 'DELETE FROM $faceClustersTable';
+const dropFaceClustersTable = 'DROP TABLE IF EXISTS $faceClustersTable';
 //##endregion
 
+// People Table Fields & Schema Queries
+const personTable = 'person';
+
+const deletePersonTable = 'DROP TABLE IF EXISTS $personTable';
+//End People Table Fields & Schema Queries
+
 // Clusters Table Fields & Schema Queries
 const clusterPersonTable = 'cluster_person';
 const personIdColumn = 'person_id';
@@ -63,7 +69,7 @@ CREATE TABLE IF NOT EXISTS $clusterPersonTable (
   PRIMARY KEY($personIdColumn, $clusterIDColumn)
 );
 ''';
-const deleteClusterPersonTable = 'DELETE FROM $clusterPersonTable';
+const dropClusterPersonTable = 'DROP TABLE IF EXISTS $clusterPersonTable';
 // End Clusters Table Fields & Schema Queries
 
 /// Cluster Summary Table Fields & Schema Queries
@@ -79,7 +85,7 @@ CREATE TABLE IF NOT EXISTS $clusterSummaryTable (
 );
 ''';
 
-const deleteClusterSummaryTable = 'DELETE FROM $clusterSummaryTable';
+const dropClusterSummaryTable = 'DROP TABLE IF EXISTS $clusterSummaryTable';
 
 /// End Cluster Summary Table Fields & Schema Queries
 
@@ -93,5 +99,5 @@ CREATE TABLE IF NOT EXISTS $notPersonFeedback (
   PRIMARY KEY($personIdColumn, $clusterIDColumn)
 );
 ''';
-const deleteNotPersonFeedbackTable = 'DELETE FROM $notPersonFeedback';
+const dropNotPersonFeedbackTable = 'DROP TABLE IF EXISTS $notPersonFeedback';
 // End Clusters Table Fields & Schema Queries

mobile/lib/generated/intl/messages_en.dart

@@ -814,7 +814,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Incorrect recovery key"),
         "indexedItems": MessageLookupByLibrary.simpleMessage("Indexed items"),
         "indexingIsPaused": MessageLookupByLibrary.simpleMessage(
-            "Indexing is paused. It will automatically resume when device is ready."),
+            "Indexing is paused, will automatically resume when device is ready"),
         "insecureDevice":
             MessageLookupByLibrary.simpleMessage("Insecure device"),
         "installManually":

mobile/lib/generated/l10n.dart

@@ -8794,10 +8794,10 @@ class S {
     );
   }
 
-  /// `Indexing is paused. It will automatically resume when device is ready.`
+  /// `Indexing is paused, will automatically resume when device is ready`
   String get indexingIsPaused {
     return Intl.message(
-      'Indexing is paused. It will automatically resume when device is ready.',
+      'Indexing is paused, will automatically resume when device is ready',
       name: 'indexingIsPaused',
       desc: '',
       args: [],

mobile/lib/l10n/intl_en.arb

@@ -1236,5 +1236,5 @@
   "faceRecognitionIndexingDescription": "Please note that this will result in a higher bandwidth and battery usage until all items are indexed.",
   "foundFaces": "Found faces",
   "clusteringProgress": "Clustering progress",
-  "indexingIsPaused": "Indexing is paused. It will automatically resume when device is ready."
-}
+  "indexingIsPaused": "Indexing is paused, will automatically resume when device is ready"
+}

mobile/lib/main.dart

@@ -246,11 +246,17 @@ Future<void> _init(bool isBackground, {String via = ''}) async {
 
   unawaited(SemanticSearchService.instance.init());
   MachineLearningController.instance.init();
-  if (flagService.faceSearchEnabled) {
-    unawaited(FaceMlService.instance.init());
-  } else {
-    if (LocalSettings.instance.isFaceIndexingEnabled) {
-      unawaited(LocalSettings.instance.toggleFaceIndexing());
+  // Can not including existing tf/ml binaries as they are not being built
+  // from source.
+  // See https://gitlab.com/fdroid/fdroiddata/-/merge_requests/12671#note_1294346819
+  if (!UpdateService.instance.isFdroidFlavor()) {
+    // unawaited(ObjectDetectionService.instance.init());
+    if (flagService.faceSearchEnabled) {
+      unawaited(FaceMlService.instance.init());
+    } else {
+      if (LocalSettings.instance.isFaceIndexingEnabled) {
+        unawaited(LocalSettings.instance.toggleFaceIndexing());
+      }
     }
   }
   PersonService.init(

mobile/lib/services/machine_learning/face_ml/face_ml_service.dart

@@ -43,7 +43,6 @@ import 'package:photos/services/machine_learning/face_ml/face_ml_result.dart';
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import 'package:photos/services/machine_learning/file_ml/file_ml.dart';
 import 'package:photos/services/machine_learning/file_ml/remote_fileml_service.dart';
-import "package:photos/services/machine_learning/machine_learning_controller.dart";
 import "package:photos/services/search_service.dart";
 import "package:photos/utils/file_util.dart";
 import 'package:photos/utils/image_ml_isolate.dart';
@@ -100,7 +99,7 @@ class FaceMlService {
 
   final int _fileDownloadLimit = 5;
   final int _embeddingFetchLimit = 200;
-  final int _kForceClusteringFaceCount = 8000;
+  final int _kForceClusteringFaceCount = 4000;
 
   Future<void> init({bool initializeImageMlIsolate = false}) async {
     if (LocalSettings.instance.isFaceIndexingEnabled == false) {
@@ -164,16 +163,9 @@ class FaceMlService {
           pauseIndexingAndClustering();
         }
       });
-      if (Platform.isIOS &&
-          MachineLearningController.instance.isDeviceHealthy) {
-        _logger.info("Starting face indexing and clustering on iOS from init");
-        unawaited(indexAndClusterAll());
-      }
 
       _listenIndexOnDiffSync();
       _listenOnPeopleChangedSync();
-
-      _logger.info('init done');
     });
   }
 
@@ -1024,13 +1016,9 @@ class FaceMlService {
         File? file;
         if (enteFile.fileType == FileType.video) {
           try {
-            file = await getThumbnailForUploadedFile(enteFile);
+          file = await getThumbnailForUploadedFile(enteFile);
           } on PlatformException catch (e, s) {
-            _logger.severe(
-              "Could not get thumbnail for $enteFile due to PlatformException",
-              e,
-              s,
-            );
+            _logger.severe("Could not get thumbnail for $enteFile due to PlatformException", e, s);
             throw ThumbnailRetrievalException(e.toString(), s);
           }
         } else {

mobile/lib/services/machine_learning/machine_learning_controller.dart

@@ -4,6 +4,7 @@ import "dart:io";
 import "package:battery_info/battery_info_plugin.dart";
 import "package:battery_info/model/android_battery_info.dart";
 import "package:battery_info/model/iso_battery_info.dart";
+import "package:flutter/foundation.dart" show kDebugMode;
 import "package:logging/logging.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/machine_learning_control_event.dart";
@@ -18,7 +19,8 @@ class MachineLearningController {
 
   static const kMaximumTemperature = 42; // 42 degree celsius
   static const kMinimumBatteryLevel = 20; // 20%
-  static const kDefaultInteractionTimeout = Duration(seconds: 10);
+  static const kDefaultInteractionTimeout =
+      kDebugMode ? Duration(seconds: 3) : Duration(seconds: 5);
   static const kUnhealthyStates = ["over_heat", "over_voltage", "dead"];
 
   bool _isDeviceHealthy = true;
@@ -29,7 +31,6 @@ class MachineLearningController {
   bool get isDeviceHealthy => _isDeviceHealthy;
 
   void init() {
-    _logger.info('init called');
     if (Platform.isAndroid) {
       _startInteractionTimer();
       BatteryInfoPlugin()
@@ -46,7 +47,6 @@ class MachineLearningController {
       });
     }
     _fireControlEvent();
-    _logger.info('init done');
   }
 
   void onUserInteraction() {

mobile/lib/ui/settings/machine_learning_settings_page.dart

@@ -89,8 +89,8 @@ class _MachineLearningSettingsPageState
                 iconButtonType: IconButtonType.secondary,
                 onTap: () {
                   Navigator.pop(context);
-                  if (Navigator.canPop(context)) Navigator.pop(context);
-                  if (Navigator.canPop(context)) Navigator.pop(context);
+                  Navigator.pop(context);
+                  Navigator.pop(context);
                 },
               ),
             ],

mobile/lib/ui/viewer/people/cluster_app_bar.dart

@@ -97,7 +97,7 @@ class _AppBarWidgetState extends State<ClusterAppBar> {
         maxLines: 2,
         overflow: TextOverflow.ellipsis,
       ),
-      actions: _getDefaultActions(context),
+      actions: kDebugMode ? _getDefaultActions(context) : null,
     );
   }
 

mobile/lib/ui/viewer/people/cluster_page.dart

@@ -161,45 +161,43 @@ class _ClusterPageState extends State<ClusterPage> {
             ),
           ),
           showNamingBanner
-              ? SafeArea(
-                  child: Dismissible(
-                    key: const Key("namingBanner"),
-                    direction: DismissDirection.horizontal,
-                    onDismissed: (direction) {
-                      setState(() {
-                        userDismissedNamingBanner = true;
-                      });
-                    },
-                    child: PeopleBanner(
-                      type: PeopleBannerType.addName,
-                      faceWidget: PersonFaceWidget(
-                        files.first,
-                        clusterID: widget.clusterID,
-                      ),
-                      actionIcon: Icons.add_outlined,
-                      text: S.of(context).addAName,
-                      subText: S.of(context).findPeopleByName,
-                      onTap: () async {
-                        if (widget.personID == null) {
-                          final result = await showAssignPersonAction(
-                            context,
-                            clusterID: widget.clusterID,
-                          );
-                          if (result != null &&
-                              result is (PersonEntity, EnteFile)) {
-                            Navigator.pop(context);
-                            // ignore: unawaited_futures
-                            routeToPage(context, PeoplePage(person: result.$1));
-                          } else if (result != null && result is PersonEntity) {
-                            Navigator.pop(context);
-                            // ignore: unawaited_futures
-                            routeToPage(context, PeoplePage(person: result));
-                          }
-                        } else {
-                          showShortToast(context, "No personID or clusterID");
-                        }
-                      },
+              ? Dismissible(
+                  key: const Key("namingBanner"),
+                  direction: DismissDirection.horizontal,
+                  onDismissed: (direction) {
+                    setState(() {
+                      userDismissedNamingBanner = true;
+                    });
+                  },
+                  child: PeopleBanner(
+                    type: PeopleBannerType.addName,
+                    faceWidget: PersonFaceWidget(
+                      files.first,
+                      clusterID: widget.clusterID,
                     ),
+                    actionIcon: Icons.add_outlined,
+                    text: S.of(context).addAName,
+                    subText: S.of(context).findPeopleByName,
+                    onTap: () async {
+                      if (widget.personID == null) {
+                        final result = await showAssignPersonAction(
+                          context,
+                          clusterID: widget.clusterID,
+                        );
+                        if (result != null &&
+                            result is (PersonEntity, EnteFile)) {
+                          Navigator.pop(context);
+                          // ignore: unawaited_futures
+                          routeToPage(context, PeoplePage(person: result.$1));
+                        } else if (result != null && result is PersonEntity) {
+                          Navigator.pop(context);
+                          // ignore: unawaited_futures
+                          routeToPage(context, PeoplePage(person: result));
+                        }
+                      } else {
+                        showShortToast(context, "No personID or clusterID");
+                      }
+                    },
                   ),
                 )
               : const SizedBox.shrink(),

mobile/lib/ui/viewer/people/person_clusters_page.dart

@@ -38,17 +38,12 @@ class _PersonClustersPageState extends State<PersonClustersPage> {
             .getClusterFilesForPersonID(widget.person.remoteID),
         builder: (context, snapshot) {
           if (snapshot.hasData) {
-            final clusters = snapshot.data!;
-            final List<int> keys = clusters.keys.toList();
-            // Sort the clusters by the number of files in each cluster, largest first
-            keys.sort(
-              (b, a) => clusters[a]!.length.compareTo(clusters[b]!.length),
-            );
+            final List<int> keys = snapshot.data!.keys.toList();
             return ListView.builder(
               itemCount: keys.length,
               itemBuilder: (context, index) {
                 final int clusterID = keys[index];
-                final List<EnteFile> files = clusters[clusterID]!;
+                final List<EnteFile> files = snapshot.data![keys[index]]!;
                 return InkWell(
                   onTap: () {
                     Navigator.of(context).push(
@@ -98,37 +93,34 @@ class _PersonClustersPageState extends State<PersonClustersPage> {
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               children: <Widget>[
                                 Text(
-                                  "${files.length} photos",
+                                  "${snapshot.data![keys[index]]!.length} photos",
                                   style: getEnteTextTheme(context).body,
                                 ),
-                                (index != 0)
-                                    ? GestureDetector(
-                                        onTap: () async {
-                                          try {
-                                            await PersonService.instance
-                                                .removeClusterToPerson(
-                                              personID: widget.person.remoteID,
-                                              clusterID: clusterID,
-                                            );
-                                            _logger.info(
-                                              "Removed cluster $clusterID from person ${widget.person.remoteID}",
-                                            );
-                                            Bus.instance
-                                                .fire(PeopleChangedEvent());
-                                            setState(() {});
-                                          } catch (e) {
-                                            _logger.severe(
-                                              "removing cluster from person,",
-                                              e,
-                                            );
-                                          }
-                                        },
-                                        child: const Icon(
-                                          CupertinoIcons.minus_circled,
-                                          color: Colors.red,
-                                        ),
-                                      )
-                                    : const SizedBox.shrink(),
+                                GestureDetector(
+                                  onTap: () async {
+                                    try {
+                                      await PersonService.instance
+                                          .removeClusterToPerson(
+                                        personID: widget.person.remoteID,
+                                        clusterID: clusterID,
+                                      );
+                                      _logger.info(
+                                        "Removed cluster $clusterID from person ${widget.person.remoteID}",
+                                      );
+                                      Bus.instance.fire(PeopleChangedEvent());
+                                      setState(() {});
+                                    } catch (e) {
+                                      _logger.severe(
+                                        "removing cluster from person,",
+                                        e,
+                                      );
+                                    }
+                                  },
+                                  child: const Icon(
+                                    CupertinoIcons.minus_circled,
+                                    color: Colors.red,
+                                  ),
+                                ),
                               ],
                             ),
                           ),

mobile/pubspec.yaml

@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.8.112+636
+version: 0.8.110+634
 publish_to: none
 
 environment: