diff --git a/android/app/build.gradle b/android/app/build.gradle index bb0c654..0d01190 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -59,7 +59,9 @@ android { // applicationIdSuffix ".STOP" // } release { - signingConfig signingConfigs.release + shrinkResources false + minifyEnabled false + signingConfig signingConfigs.release } } } diff --git a/android/build.gradle b/android/build.gradle index d2ffbff..cbe6451 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,6 +9,19 @@ rootProject.buildDir = "../build" subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } + +subprojects { + afterEvaluate { project -> + if (project.plugins.hasPlugin("com.android.application") || + project.plugins.hasPlugin("com.android.library")) { + project.android { + compileSdkVersion 36 + buildToolsVersion "36.0.0" + } + } + } +} + subprojects { project.evaluationDependsOn(":app") } diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 57db739..ecb8d62 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -28,10 +28,10 @@ PODS: - Firebase/Messaging (12.4.0): - Firebase/CoreOnly - FirebaseMessaging (~> 12.4.0) - - firebase_core (4.2.0): + - firebase_core (4.2.1): - Firebase/CoreOnly (= 12.4.0) - Flutter - - firebase_messaging (16.0.3): + - firebase_messaging (16.0.4): - Firebase/Messaging (= 12.4.0) - firebase_core - Flutter @@ -383,8 +383,8 @@ SPEC CHECKSUMS: emoji_picker_flutter: ece213fc274bdddefb77d502d33080dc54e616cc ffmpeg_kit_flutter_new: 12426a19f10ac81186c67c6ebc4717f8f4364b7f Firebase: f07b15ae5a6ec0f93713e30b923d9970d144af3e - firebase_core: 744984dbbed8b3036abf34f0b98d80f130a7e464 - firebase_messaging: 82c70650c426a0a14873e1acdb9ec2b443c4e8b4 + firebase_core: f1aafb21c14f497e5498f7ffc4dc63cbb52b2594 + firebase_messaging: c17a29984eafce4b2997fe078bb0a9e0b06f5dde FirebaseAnalytics: 0fc2b20091f0ddd21bf73397cf8f0eb5346dc24f FirebaseCore: bb595f3114953664e3c1dc032f008a244147cfd3 FirebaseCoreInternal: d7f5a043c2cd01a08103ab586587c1468047bca6 diff --git a/lib/main.dart b/lib/main.dart index 607db29..7ff34fd 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -27,13 +27,18 @@ import 'package:twonly/src/utils/storage.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); - await initFCMService(); + try { + await initFCMService(); + } catch (e) { + Log.error('$e'); + } initLogger(); final user = await getUser(); if (user != null) { gUser = user; + unawaited(performTwonlySafeBackup()); } final settingsController = SettingsChangeProvider(); @@ -64,8 +69,6 @@ void main() async { unawaited(createPushAvatars()); await twonlyDB.messagesDao.purgeMessageTable(); - unawaited(performTwonlySafeBackup()); - runApp( MultiProvider( providers: [ diff --git a/pubspec.lock b/pubspec.lock index ff7558f..4d2c37e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: f871a7d1b686bea1f13722aa51ab31554d05c81f47054d6de48cc8c45153508b + sha256: "8a1f5f3020ef2a74fb93f7ab3ef127a8feea33a7a2276279113660784ee7516a" url: "https://pub.dev" source: hosted - version: "1.3.63" + version: "1.3.64" adaptive_number: dependency: transitive description: @@ -77,10 +77,10 @@ packages: dependency: "direct main" description: name: background_downloader - sha256: a22acfa37aa06ba5cfe6eb7b1aa700c78af64770ff450c73dd3d279d7c37d4ac + sha256: a913b37cc47a656a225e9562b69576000d516f705482f392e2663500e6ff6032 url: "https://pub.dev" source: hosted - version: "9.2.6" + version: "9.3.0" boolean_selector: dependency: transitive description: @@ -190,10 +190,10 @@ packages: dependency: transitive description: name: camera_platform_interface - sha256: ea1ef6ba79cdbed93df2d3eeef11542a90dec24dbcd9cde574926b86d7a09a10 + sha256: "98cfc9357e04bad617671b4c1f78a597f25f08003089dd94050709ae54effc63" url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" camera_web: dependency: transitive description: @@ -286,18 +286,18 @@ packages: dependency: transitive description: name: cross_file - sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670" + sha256: "942a4791cd385a68ccb3b32c71c427aba508a1bb949b86dff2adbe4049f16239" url: "https://pub.dev" source: hosted - version: "0.3.4+2" + version: "0.3.5" crypto: dependency: transitive description: name: crypto - sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" + sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "3.0.7" cryptography_flutter_plus: dependency: "direct main" description: @@ -478,10 +478,10 @@ packages: dependency: "direct main" description: name: firebase_core - sha256: "132e1c311bc41e7d387b575df0aacdf24efbf4930365eb61042be5bde3978f03" + sha256: "1f2dfd9f535d81f8b06d7a50ecda6eac1e6922191ed42e09ca2c84bd2288927c" url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "4.2.1" firebase_core_platform_interface: dependency: transitive description: @@ -494,34 +494,34 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: ecde2def458292404a4fcd3731ee4992fd631a0ec359d2d67c33baa8da5ec8ae + sha256: ff18fabb0ad0ed3595d2f2c85007ecc794aadecdff5b3bb1460b7ee47cded398 url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.3.0" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - sha256: "5021279acd1cb5ccaceaa388e616e82cc4a2e4d862f02637df0e8ab766e6900a" + sha256: "22086f857d2340f5d973776cfd542d3fb30cf98e1c643c3aa4a7520bb12745bb" url: "https://pub.dev" source: hosted - version: "16.0.3" + version: "16.0.4" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: f3a16c51f02055ace2a7c16ccb341c1f1b36b67c13270a48bcef68c1d970bbe8 + sha256: a59920cbf2eb7c83d34a5f354331210ffec116b216dc72d864d8b8eb983ca398 url: "https://pub.dev" source: hosted - version: "4.7.3" + version: "4.7.4" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: "3eb9a1382caeb95b370f21e36d4a460496af777c9c2ef5df9b90d4803982c069" + sha256: "1183e40e6fd2a279a628951cc3b639fcf5ffe7589902632db645011eb70ebefb" url: "https://pub.dev" source: hosted - version: "4.0.3" + version: "4.1.0" fixnum: dependency: "direct main" description: @@ -538,10 +538,11 @@ packages: flutter_android_volume_keydown: dependency: "direct main" description: - name: flutter_android_volume_keydown - sha256: bf7fed0be85541b939d9deb97b375cb12e6e703aa013754441318b0b9014e711 - url: "https://pub.dev" - source: hosted + path: "." + ref: HEAD + resolved-ref: e8b6a650b9fbe76a077539272bbdd422509e6e44 + url: "https://github.com/yenchieh/flutter_android_volume_keydown.git" + source: git version: "1.0.1" flutter_cache_manager: dependency: transitive @@ -753,10 +754,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678 + sha256: "055de8921be7b8e8b98a233c7a5ef84b3a6fcc32f46f1ebf5b9bb3576d108355" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" flutter_test: dependency: "direct dev" description: flutter @@ -1555,14 +1556,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.1" - sprintf: - dependency: transitive - description: - name: sprintf - sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" - url: "https://pub.dev" - source: hosted - version: "7.0.0" sqflite: dependency: transitive description: @@ -1607,10 +1600,10 @@ packages: dependency: transitive description: name: sqlite3 - sha256: f18fd9a72d7a1ad2920db61368f2a69368f1cc9b56b8233e9d83b47b0a8435aa + sha256: "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2" url: "https://pub.dev" source: hosted - version: "2.9.3" + version: "2.9.4" sqlite3_flutter_libs: dependency: transitive description: @@ -1783,10 +1776,10 @@ packages: dependency: transitive description: name: uuid - sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff + sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8 url: "https://pub.dev" source: hosted - version: "4.5.1" + version: "4.5.2" vector_graphics: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 245c4de..c43b7fb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: "twonly, a privacy-friendly way to connect with friends through sec publish_to: 'none' -version: 0.0.62+62 +version: 0.0.64+64 environment: sdk: ^3.6.0 @@ -76,6 +76,12 @@ dependencies: web_socket_channel: ^3.0.1 dependency_overrides: + + flutter_android_volume_keydown: + git: + url: https://github.com/yenchieh/flutter_android_volume_keydown.git + branch: fix/lStar-not-found-error + # hardcoding the mirror mode of the VideCapture to MIRROR_MODE_ON_FRONT_ONLY camera_android_camerax: # path: ../flutter-packages/packages/camera/camera_android_camerax