Merge branch 'master' into location-search

lib/core/configuration.dart

@@ -37,8 +37,10 @@ class Configuration {
   Configuration._privateConstructor();
 
   static final Configuration instance = Configuration._privateConstructor();
-  static const endpoint =
-      String.fromEnvironment("endpoint", defaultValue: "https://api.ente.io");
+  static const endpoint = String.fromEnvironment(
+    "endpoint",
+    defaultValue: kDefaultProductionEndpoint,
+  );
   static const emailKey = "email";
   static const foldersToBackUpKey = "folders_to_back_up";
   static const keyAttributesKey = "key_attributes";

lib/core/constants.dart

@@ -41,3 +41,5 @@ class FFDefault {
   static const bool disableCFWorker = false;
   static const bool enableMissingLocationMigration = false;
 }
+
+const kDefaultProductionEndpoint = 'https://api.ente.io';

lib/models/file.dart

@@ -1,6 +1,5 @@
 import 'dart:io' as io;
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter_sodium/flutter_sodium.dart';
 import 'package:path/path.dart';
 import 'package:photo_manager/photo_manager.dart';
@@ -189,24 +188,22 @@ class File extends EnteFile {
   }
 
   String getDownloadUrl() {
-    if (kDebugMode || FeatureFlagService.instance.disableCFWorker()) {
-      return Configuration.instance.getHttpEndpoint() +
-          "/files/download/" +
-          uploadedFileID.toString();
+    final endpoint = Configuration.instance.getHttpEndpoint();
+    if (endpoint != kDefaultProductionEndpoint ||
+        FeatureFlagService.instance.disableCFWorker()) {
+      return endpoint + "/files/download/" + uploadedFileID.toString();
     } else {
-      return "https://files.ente.workers.dev/?fileID=" +
-          uploadedFileID.toString();
+      return "https://files.ente.io/?fileID=" + uploadedFileID.toString();
     }
   }
 
   String getThumbnailUrl() {
-    if (kDebugMode || FeatureFlagService.instance.disableCFWorker()) {
-      return Configuration.instance.getHttpEndpoint() +
-          "/files/preview/" +
-          uploadedFileID.toString();
+    final endpoint = Configuration.instance.getHttpEndpoint();
+    if (endpoint != kDefaultProductionEndpoint ||
+        FeatureFlagService.instance.disableCFWorker()) {
+      return endpoint + "/files/preview/" + uploadedFileID.toString();
     } else {
-      return "https://thumbnails.ente.workers.dev/?fileID=" +
-          uploadedFileID.toString();
+      return "https://thumbnails.ente.io/?fileID=" + uploadedFileID.toString();
     }
   }