feat: push all changes

2025-02-21 20:55:52 +05:30
parent 10e675a81c
commit 8a5cc0c221
11 changed files with 374 additions and 300 deletions
--- a/mobile/.metadata
+++ b/mobile/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.

 version:
-  revision: 0b8abb4724aa590dd0f429683339b1e045a1594d
-  channel: stable
+  revision: "2663184aa79047d0a33a14a3b607954f8fdd8730"
+  channel: "stable"

 project_type: app
--- a/mobile/android/.gitignore
+++ b/mobile/android/.gitignore
@@ -5,3 +5,9 @@ gradle-wrapper.jar
 /gradlew.bat
 /local.properties
 GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/to/reference-keystore
+key.properties
+**/*.keystore
+**/*.jks
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -28,25 +28,25 @@ if (keystorePropertiesFile.exists()) {
 }

 android {
-    compileSdkVersion 35
-    ndkVersion "26.0.10792818"
+    namespace = "io.ente.photos"
+    compileSdk = 35
+    ndkVersion = flutter.ndkVersion

-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
    }

-    lintOptions {
-        disable 'InvalidPackage'
-        warningsAsErrors false
-        checkReleaseBuilds false
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8
    }

    defaultConfig {
-        applicationId "io.ente.photos"
-        minSdkVersion 26
-        targetSdkVersion 35
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        applicationId = "io.ente.photos"
+        minSdk = 26
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        multiDexEnabled true
        consumerProguardFiles 'proguard-rules.pro'
@@ -115,14 +115,14 @@ rootProject.allprojects {
                if (details.requested.group == 'com.github.bumptech.glide'
                        && details.requested.name.contains('glide')) {
                    details.useVersion "4.15.1"
-                }
            }
+          }
        }
    }
 }

 flutter {
-    source '../..'
+    source = "../.."
 }

 dependencies {
--- a/mobile/android/build.gradle
+++ b/mobile/android/build.gradle
@@ -19,11 +19,11 @@ allprojects {
    }
 }

-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"

 subprojects {
    project.buildDir = "${rootProject.buildDir}/${project.name}"
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }

 tasks.register("clean", Delete) {
--- a/mobile/android/gradle.properties
+++ b/mobile/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4608m
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
--- a/mobile/android/gradle/wrapper/gradle-wrapper.properties
+++ b/mobile/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
-distributionSha256Sum=a8da5b02437a60819cad23e10fc7e9cf32bcb57029d9cb277e26eeff76ce014b
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
--- a/mobile/android/settings.gradle
+++ b/mobile/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {

 plugins {
    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.1.2" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.21" apply false
+    id "com.android.application" version "8.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }

-include ":app"
+include ":app"
--- a/mobile/lib/ui/viewer/file/zoomable_live_image_new.dart
+++ b/mobile/lib/ui/viewer/file/zoomable_live_image_new.dart
@@ -6,6 +6,7 @@ import 'package:logging/logging.dart';
 import "package:media_kit/media_kit.dart";
 import "package:media_kit_video/media_kit_video.dart";
 import 'package:motion_photos/motion_photos.dart';
+import "package:path_provider/path_provider.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/guest_view_event.dart";
 import "package:photos/generated/l10n.dart";
@@ -202,6 +203,7 @@ class _ZoomableLiveImageNewState extends State<ZoomableLiveImageNew>
          ).ignore();
        }
        return motionPhoto.getMotionVideoFile(
+          await getTemporaryDirectory(),
          index: index,
        );
      } else if (_enteFile.isMotionPhoto && _enteFile.canEditMetaInfo) {
--- a/mobile/lib/utils/file_util.dart
+++ b/mobile/lib/utils/file_util.dart
@@ -254,7 +254,7 @@ Future<_LivePhoto?> _downloadLivePhoto(
            if (compressResult == null) {
              throw Exception("Failed to compress file");
            } else {
-              imageConvertedFile = compressResult;
+              imageConvertedFile = File(compressResult.path);
            }
          }
          imageFileCache = await DefaultCacheManager().putFile(
@@ -316,7 +316,7 @@ Future<File?> _downloadAndCache(
      if (compressResult == null) {
        throw Exception("Failed to convert heic to jpg");
      } else {
-        outputFile = compressResult;
+        outputFile = File(compressResult.path);
      }
      await decryptedFile.delete();
    }
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -25,7 +25,9 @@ dependencies:
  animated_list_plus: ^0.5.2
  archive: ^3.6.1
  background_fetch: ^1.2.1
-  battery_info: ^1.1.1
+  battery_info:
+    git:
+      url: https://github.com/ente-io/battery_info
  bip39: ^1.0.6
  cached_network_image: ^3.0.0
  chewie:
@@ -79,8 +81,8 @@ dependencies:
  flutter_datetime_picker_bdaya: ^3.0.2
  flutter_displaymode: ^0.6.0
  flutter_easyloading: ^3.0.0
-  flutter_email_sender: ^5.2.0
-  flutter_image_compress: ^1.1.0
+  flutter_email_sender: ^7.0.0
+  flutter_image_compress: ^2.4.0
  flutter_inappwebview: ^6.1.4
  flutter_launcher_icons: ^0.13.1
  flutter_local_notifications: ^17.2.2
@@ -91,7 +93,9 @@ dependencies:
  flutter_native_splash: ^2.2.0+1
  flutter_password_strength: ^0.1.6
  flutter_secure_storage: ^9.2.4
-  flutter_sodium: ^0.2.0
+  flutter_sodium:
+    git:
+      url: https://github.com/ente-io/flutter_sodium
  flutter_staggered_grid_view: ^0.6.2
  flutter_svg: ^2.0.10+1
  fluttertoast: ^8.0.6
@@ -115,11 +119,10 @@ dependencies:
  local_auth_ios:
  logging: ^1.3.0
  lottie: ^1.2.2
-  maps_launcher: ^2.2.1
+  maps_launcher: ^3.0.0+1
  media_extension:
    git:
      url: "https://github.com/ente-io/media_extension.git"
-      ref: deeplink_fixes
  media_kit:
    git:
      url: https://github.com/media-kit/media-kit
@@ -142,7 +145,8 @@ dependencies:
    git: "https://github.com/ente-io/motion_photo.git"
  motionphoto:
    git: "https://github.com/ente-io/motionphoto.git"
-  move_to_background: ^1.0.2
+  move_to_background:
+    git: "https://github.com/ente-io/move_to_background.git"
  nanoid: ^1.0.0
  native_dio_adapter: ^1.4.0
  native_video_player: ^3.0.0-dev.3
@@ -152,7 +156,9 @@ dependencies:
    git:
      url: https://github.com/ente-io/onnxruntime.git
      ref: ios_only
-  open_mail_app: ^0.4.5
+  open_mail_app:
+    git:
+      url: https://github.com/ente-io/open-mail-app-flutter.git
  package_info_plus: ^8.2.1
  page_transition: ^2.0.2
  panorama:
@@ -169,7 +175,10 @@ dependencies:
  pinput: ^5.0.0
  pointycastle: ^3.7.3
  pool: ^1.5.1
-  privacy_screen: ^0.0.6
+  privacy_screen:
+    git:
+      url: https://github.com/ente-io/privacy_screen.git
+      ref: pb/FIX-obsolete-android-plugin
  protobuf: ^3.1.0
  provider: ^6.0.0
  quiver: ^3.0.1
@@ -190,10 +199,13 @@ dependencies:
  syncfusion_flutter_core: ^25.2.5
  syncfusion_flutter_sliders: ^25.2.5
  synchronized: ^3.1.0
-  system_info_plus: ^0.0.5
+  system_info_plus: ^0.0.6
  tuple: ^2.0.0
  ua_client_hints: ^1.4.0
-  uni_links: ^0.5.1
+  uni_links:
+    git:
+      url: https://github.com/ente-io/uni_links.git
+      path: uni_links
  url_launcher: ^6.3.0
  uuid: ^4.5.0
  video_editor:
@@ -204,10 +216,12 @@ dependencies:
      url: https://github.com/ente-io/packages.git
      ref: android_video_roation_fix
      path: packages/video_player/video_player/
-  video_thumbnail: ^0.5.3
+  video_thumbnail:
  visibility_detector: ^0.3.3
  wakelock_plus: ^1.1.1
-  wallpaper_manager_flutter: ^0.0.2
+  wallpaper_manager_flutter:
+    git:
+      url: https://github.com/ente-io/wallpaper_manager_fork.git
  wechat_assets_picker: ^8.6.3
  widgets_to_image: ^0.0.2
  xml: ^6.3.0
@@ -217,6 +231,9 @@ dependency_overrides:
  # Remove this after removing dependency from flutter_sodium.
  # Newer flutter packages depends on ffi > 2.0.0 while flutter_sodium depends on ffi < 2.0.0
  ffi: 2.1.0
+  flutter_sodium:
+    git:
+      url: https://github.com/ente-io/flutter_sodium
  intl: 0.18.1
  js: ^0.6.7
  media_kit:
@@ -240,8 +257,11 @@ dependency_overrides:
      url: https://github.com/ente-io/packages.git
      ref: android_video_roation_fix
      path: packages/video_player/video_player/
+  video_thumbnail:
+    git:
+      url: https://github.com/ente-io/video_thumbnail_fork.git
  watcher: ^1.1.0
-  win32: ^5.5.4
+  win32: ^5.11.0

 flutter_intl:
  enabled: true