Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mobile][locker] Address wiring PR review nits

laurenspriem9f54395dc3c3
diff --git a/mobile/apps/locker/README.md b/mobile/apps/locker/README.md
index 35edcf395e..b3df11045e 100644
--- a/mobile/apps/locker/README.md
+++ b/mobile/apps/locker/README.md
@@ -4,7 +4,7 @@ Ente's secure document storage app. An end-to-end encrypted app for storing impo
## πŸ§‘β€πŸ’» Build from source
-1. [Install Flutter v3.38.10](https://flutter.dev/docs/get-started/install).
+1. Install [Flutter v3.38.10](https://flutter.dev/docs/get-started/install) and [Rust](https://www.rust-lang.org/tools/install).
2. From any folder inside `mobile/`, install the workspace dependencies with `flutter pub get --enforce-lockfile`. Then, from `rust/`, generate the Rust bindings with `cargo codegen frb`.
@@ -12,6 +12,16 @@ Ente's secure document storage app. An end-to-end encrypted app for storing impo
- Android: `flutter run --flavor independent`
- iOS: `flutter run`
+> [!NOTE]
+>
+> Re-run `cargo codegen frb` whenever the FRB-exported surface under `rust/bindings/frb/` changes. Internal Rust changes (function bodies, private helpers) are picked up by the normal Flutter build.
+>
+> From anywhere in the repo:
+>
+> ```sh
+> (cd "$(git rev-parse --show-toplevel)/rust" && cargo codegen frb)
+> ```
+
To build a release APK, [setup your keystore](https://docs.flutter.dev/deployment/android#create-an-upload-keystore) and run `flutter build apk --release --flavor independent`. For iOS, use `flutter build ios`.
### Updating dependencies
diff --git a/mobile/apps/locker/ios/Podfile b/mobile/apps/locker/ios/Podfile
index 27deb8fb97..b5efd7385b 100644
--- a/mobile/apps/locker/ios/Podfile
+++ b/mobile/apps/locker/ios/Podfile
@@ -1,4 +1,3 @@
-# Uncomment this line to define a global platform for your project
platform :ios, '13.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
diff --git a/mobile/apps/locker/rust_builder/android/build.gradle b/mobile/apps/locker/rust_builder/android/build.gradle
index eaf64b14d6..4973a1a8c9 100644
--- a/mobile/apps/locker/rust_builder/android/build.gradle
+++ b/mobile/apps/locker/rust_builder/android/build.gradle
@@ -1,5 +1,3 @@
-// The Android Gradle Plugin builds the native code with the Android NDK.
-
group 'com.flutter_rust_bridge.ente_locker_rust'
version '1.0'
@@ -10,7 +8,6 @@ buildscript {
}
dependencies {
- // The Android Gradle Plugin knows how to build native code with the NDK.
classpath 'com.android.tools.build:gradle:7.3.0'
}
}
@@ -29,14 +26,8 @@ android {
namespace 'com.flutter_rust_bridge.ente_locker_rust'
}
- // Bumping the plugin compileSdkVersion requires all clients of this plugin
- // to bump the version in their app.
compileSdkVersion 33
- // Use the NDK version
- // declared in /android/app/build.gradle file of the Flutter project.
- // Replace it with a version number if this plugin requires a specfic NDK version.
- // (e.g. ndkVersion "23.1.7779620")
ndkVersion "28.2.13676358"
compileOptions {