twonly/twonly-app
1
0
Fork 0
mirror of https://github.com/twonlyapp/twonly-app.git synced 2026-01-15 09:28:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #271 from twonlyapp/dev

Browse source 
0.0.61
This commit is contained in:
Tobi 2025-10-18 00:23:03 +02:00 committed by GitHub
commit 702829b458
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
138 changed files with 7112 additions and 2092 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/dev_github.yml vendored
View file

@ -1,4 +1,4 @@
name: Publish on Github
name: Flutter analyze & test
on:
workflow_dispatch: {}
@ -9,7 +9,7 @@ on:
- lib/**/*.dart
jobs:
build_and_publish:
flutter_analyze_and_test:
runs-on: ubuntu-latest
permissions:
contents: write

10
CHANGELOG.md
View file

@ -1,12 +1,16 @@
# Changelog
## 0.0.61
- Improving image editor when changing colors
- Fixing message decryption error
- Fixing issue with user deletion
- Fixing issue with flame counter sync
- Dependency and Flutter upgrade
## 0.0.60
- Improved logging to debug the 'Tap to load' issue.
==> If you encounter any issues, please send your debug log via the feedback button along with a short description of the error so that we can resolve them. :)
- Display your own avatar in the title bar of the chat list.
- Created a default avatar image in case none was set.
- Improved UI handling when requesting microphone access for the first time.

2
analysis_options.yaml
View file

@ -10,6 +10,7 @@ analyzer:
inference_failure_on_instance_creation: ignore
avoid_positional_boolean_parameters: ignore
inference_failure_on_collection_literal: ignore
matching_super_parameters: ignore
exclude:
- "lib/src/model/protobuf/**"
- "lib/src/model/protobuf/api/websocket/**"
@ -23,3 +24,4 @@ linter:
public_member_api_docs: false
avoid_catches_without_on_clauses: false
document_ignores: false
discarded_futures: false

4
android/app/build.gradle
View file

@ -17,7 +17,7 @@ if (keystorePropertiesFile.exists()) {
android {
namespace = "eu.twonly"
// compileSdk = flutter.compileSdkVersion
compileSdk 35
compileSdk 36
//ndkVersion = flutter.ndkVersion
ndkVersion = "27.0.12077973"
@ -37,7 +37,7 @@ android {
multiDexEnabled true
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = 23
minSdkVersion = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode
versionName = flutter.versionName

2
android/settings.gradle
View file

@ -22,7 +22,7 @@ plugins {
// START: FlutterFire Configuration
id "com.google.gms.google-services" version "4.3.15" apply false
// END: FlutterFire Configuration
id "org.jetbrains.kotlin.android" version "2.0.20" apply false
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
}
include ":app"

1
drift_schemas/twonly_database/drift_schema_v17.json Normal file
View file

File diff suppressed because one or more lines are too long

2
ios/Podfile
View file

@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
platform :ios, '14.0'
platform :ios, '15.0'
use_frameworks!
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.

149
ios/Podfile.lock
View file

@ -9,56 +9,56 @@ PODS:
- Flutter
- device_info_plus (0.0.1):
- Flutter
- Firebase (11.15.0):
- Firebase/Core (= 11.15.0)
- Firebase/Core (11.15.0):
- Firebase (12.4.0):
- Firebase/Core (= 12.4.0)
- Firebase/Core (12.4.0):
- Firebase/CoreOnly
- FirebaseAnalytics (~> 11.15.0)
- Firebase/CoreOnly (11.15.0):
- FirebaseCore (~> 11.15.0)
- Firebase/Messaging (11.15.0):
- FirebaseAnalytics (~> 12.4.0)
- Firebase/CoreOnly (12.4.0):
- FirebaseCore (~> 12.4.0)
- Firebase/Messaging (12.4.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 11.15.0)
- firebase_core (3.15.2):
- Firebase/CoreOnly (= 11.15.0)
- FirebaseMessaging (~> 12.4.0)
- firebase_core (4.2.0):
- Firebase/CoreOnly (= 12.4.0)
- Flutter
- firebase_messaging (15.2.10):
- Firebase/Messaging (= 11.15.0)
- firebase_messaging (16.0.3):
- Firebase/Messaging (= 12.4.0)
- firebase_core
- Flutter
- FirebaseAnalytics (11.15.0):
- FirebaseAnalytics/Default (= 11.15.0)
- FirebaseCore (~> 11.15.0)
- FirebaseInstallations (~> 11.0)
- FirebaseAnalytics (12.4.0):
- FirebaseAnalytics/Default (= 12.4.0)
- FirebaseCore (~> 12.4.0)
- FirebaseInstallations (~> 12.4.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
- GoogleUtilities/MethodSwizzler (~> 8.1)
- GoogleUtilities/Network (~> 8.1)
- "GoogleUtilities/NSData+zlib (~> 8.1)"
- nanopb (~> 3.30910.0)
- FirebaseAnalytics/Default (11.15.0):
- FirebaseCore (~> 11.15.0)
- FirebaseInstallations (~> 11.0)
- GoogleAppMeasurement/Default (= 11.15.0)
- FirebaseAnalytics/Default (12.4.0):
- FirebaseCore (~> 12.4.0)
- FirebaseInstallations (~> 12.4.0)
- GoogleAppMeasurement/Default (= 12.4.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
- GoogleUtilities/MethodSwizzler (~> 8.1)
- GoogleUtilities/Network (~> 8.1)
- "GoogleUtilities/NSData+zlib (~> 8.1)"
- nanopb (~> 3.30910.0)
- FirebaseCore (11.15.0):
- FirebaseCoreInternal (~> 11.15.0)
- FirebaseCore (12.4.0):
- FirebaseCoreInternal (~> 12.4.0)
- GoogleUtilities/Environment (~> 8.1)
- GoogleUtilities/Logger (~> 8.1)
- FirebaseCoreInternal (11.15.0):
- FirebaseCoreInternal (12.4.0):
- "GoogleUtilities/NSData+zlib (~> 8.1)"
- FirebaseInstallations (11.15.0):
- FirebaseCore (~> 11.15.0)
- FirebaseInstallations (12.4.0):
- FirebaseCore (~> 12.4.0)
- GoogleUtilities/Environment (~> 8.1)
- GoogleUtilities/UserDefaults (~> 8.1)
- PromisesObjC (~> 2.4)
- FirebaseMessaging (11.15.0):
- FirebaseCore (~> 11.15.0)
- FirebaseInstallations (~> 11.0)
- GoogleDataTransport (~> 10.0)
- FirebaseMessaging (12.4.0):
- FirebaseCore (~> 12.4.0)
- FirebaseInstallations (~> 12.4.0)
- GoogleDataTransport (~> 10.1)
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
- GoogleUtilities/Environment (~> 8.1)
- GoogleUtilities/Reachability (~> 8.1)
@ -70,7 +70,7 @@ PODS:
- Mantle
- SDWebImage
- SDWebImageWebPCoder
- flutter_keyboard_visibility (0.0.1):
- flutter_keyboard_visibility_temp_fork (0.0.1):
- Flutter
- flutter_local_notifications (0.0.1):
- Flutter
@ -82,27 +82,28 @@ PODS:
- gal (1.0.0):
- Flutter
- FlutterMacOS
- GoogleAdsOnDeviceConversion (2.1.0):
- GoogleAdsOnDeviceConversion (3.1.0):
- GoogleUtilities/Environment (~> 8.1)
- GoogleUtilities/Logger (~> 8.1)
- GoogleUtilities/Network (~> 8.1)
- nanopb (~> 3.30910.0)
- GoogleAppMeasurement/Core (11.15.0):
- GoogleAppMeasurement/Core (12.4.0):
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
- GoogleUtilities/MethodSwizzler (~> 8.1)
- GoogleUtilities/Network (~> 8.1)
- "GoogleUtilities/NSData+zlib (~> 8.1)"
- nanopb (~> 3.30910.0)
- GoogleAppMeasurement/Default (11.15.0):
- GoogleAdsOnDeviceConversion (= 2.1.0)
- GoogleAppMeasurement/Core (= 11.15.0)
- GoogleAppMeasurement/IdentitySupport (= 11.15.0)
- GoogleAppMeasurement/Default (12.4.0):
- GoogleAdsOnDeviceConversion (~> 3.1.0)
- GoogleAppMeasurement/Core (= 12.4.0)
- GoogleAppMeasurement/IdentitySupport (= 12.4.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
- GoogleUtilities/MethodSwizzler (~> 8.1)
- GoogleUtilities/Network (~> 8.1)
- "GoogleUtilities/NSData+zlib (~> 8.1)"
- nanopb (~> 3.30910.0)
- GoogleAppMeasurement/IdentitySupport (11.15.0):
- GoogleAppMeasurement/Core (= 11.15.0)
- GoogleAppMeasurement/IdentitySupport (12.4.0):
- GoogleAppMeasurement/Core (= 12.4.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
- GoogleUtilities/MethodSwizzler (~> 8.1)
- GoogleUtilities/Network (~> 8.1)
@ -190,9 +191,9 @@ PODS:
- restart_app (0.0.1):
- Flutter
- ScreenProtectorKit (1.3.1)
- SDWebImage (5.21.1):
- SDWebImage/Core (= 5.21.1)
- SDWebImage/Core (5.21.1)
- SDWebImage (5.21.3):
- SDWebImage/Core (= 5.21.3)
- SDWebImage/Core (5.21.3)
- SDWebImageWebPCoder (0.14.6):
- libwebp (~> 1.0)
- SDWebImage/Core (~> 5.17)
@ -204,32 +205,32 @@ PODS:
- sqflite_darwin (0.0.4):
- Flutter
- FlutterMacOS
- sqlite3 (3.50.3):
- sqlite3/common (= 3.50.3)
- sqlite3/common (3.50.3)
- sqlite3/dbstatvtab (3.50.3):
- sqlite3 (3.50.4):
- sqlite3/common (= 3.50.4)
- sqlite3/common (3.50.4)
- sqlite3/dbstatvtab (3.50.4):
- sqlite3/common
- sqlite3/fts5 (3.50.3):
- sqlite3/fts5 (3.50.4):
- sqlite3/common
- sqlite3/math (3.50.3):
- sqlite3/math (3.50.4):
- sqlite3/common
- sqlite3/perf-threadsafe (3.50.3):
- sqlite3/perf-threadsafe (3.50.4):
- sqlite3/common
- sqlite3/rtree (3.50.3):
- sqlite3/rtree (3.50.4):
- sqlite3/common
- sqlite3/session (3.50.3):
- sqlite3/session (3.50.4):
- sqlite3/common
- sqlite3_flutter_libs (0.0.1):
- Flutter
- FlutterMacOS
- sqlite3 (~> 3.50.3)
- sqlite3 (~> 3.50.4)
- sqlite3/dbstatvtab
- sqlite3/fts5
- sqlite3/math
- sqlite3/perf-threadsafe
- sqlite3/rtree
- sqlite3/session
- SwiftProtobuf (1.30.0)
- SwiftProtobuf (1.32.0)
- url_launcher_ios (0.0.1):
- Flutter
- video_compress (0.3.0):
@ -255,7 +256,7 @@ DEPENDENCIES:
- FirebaseMessaging
- Flutter (from `Flutter`)
- flutter_image_compress_common (from `.symlinks/plugins/flutter_image_compress_common/ios`)
- flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
- flutter_keyboard_visibility_temp_fork (from `.symlinks/plugins/flutter_keyboard_visibility_temp_fork/ios`)
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
- flutter_secure_storage_darwin (from `.symlinks/plugins/flutter_secure_storage_darwin/darwin`)
- flutter_zxing (from `.symlinks/plugins/flutter_zxing/ios`)
@ -319,8 +320,8 @@ EXTERNAL SOURCES:
:path: Flutter
flutter_image_compress_common:
:path: ".symlinks/plugins/flutter_image_compress_common/ios"
flutter_keyboard_visibility:
:path: ".symlinks/plugins/flutter_keyboard_visibility/ios"
flutter_keyboard_visibility_temp_fork:
:path: ".symlinks/plugins/flutter_keyboard_visibility_temp_fork/ios"
flutter_local_notifications:
:path: ".symlinks/plugins/flutter_local_notifications/ios"
flutter_secure_storage_darwin:
@ -362,32 +363,32 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
background_downloader: 50e91d979067b82081aba359d7d916b3ba5fadad
camera_avfoundation: be3be85408cd4126f250386828e9b1dfa40ab436
camera_avfoundation: 5675ca25298b6f81fa0a325188e7df62cc217741
connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
cryptography_flutter_plus: 44f4e9e4079395fcbb3e7809c0ac2c6ae2d9576f
device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
Firebase: d99ac19b909cd2c548339c2241ecd0d1599ab02e
firebase_core: 995454a784ff288be5689b796deb9e9fa3601818
firebase_messaging: f4a41dd102ac18b840eba3f39d67e77922d3f707
FirebaseAnalytics: 6433dfd311ba78084fc93bdfc145e8cb75740eae
FirebaseCore: efb3893e5b94f32b86e331e3bd6dadf18b66568e
FirebaseCoreInternal: 9afa45b1159304c963da48addb78275ef701c6b4
FirebaseInstallations: 317270fec08a5d418fdbc8429282238cab3ac843
FirebaseMessaging: 3b26e2cee503815e01c3701236b020aa9b576f09
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
Firebase: f07b15ae5a6ec0f93713e30b923d9970d144af3e
firebase_core: 744984dbbed8b3036abf34f0b98d80f130a7e464
firebase_messaging: 82c70650c426a0a14873e1acdb9ec2b443c4e8b4
FirebaseAnalytics: 0fc2b20091f0ddd21bf73397cf8f0eb5346dc24f
FirebaseCore: bb595f3114953664e3c1dc032f008a244147cfd3
FirebaseCoreInternal: d7f5a043c2cd01a08103ab586587c1468047bca6
FirebaseInstallations: ae9f4902cb5bf1d0c5eaa31ec1f4e5495a0714e2
FirebaseMessaging: d33971b7bb252745ea6cd31ab190d1a1df4b8ed5
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
flutter_image_compress_common: 1697a328fd72bfb335507c6bca1a65fa5ad87df1
flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619
flutter_keyboard_visibility_temp_fork: 95b2d534bacf6ac62e7fcbe5c2a9e2c2a17ce06f
flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
flutter_secure_storage_darwin: ce237a8775b39723566dc72571190a3769d70468
flutter_zxing: e8bcc43bd3056c70c271b732ed94e7a16fd62f93
gal: baecd024ebfd13c441269ca7404792a7152fde89
GoogleAdsOnDeviceConversion: 2be6297a4f048459e0ae17fad9bfd2844e10cf64
GoogleAppMeasurement: 700dce7541804bec33db590a5c496b663fbe2539
GoogleAdsOnDeviceConversion: e03a386840803ea7eef3fd22a061930142c039c1
GoogleAppMeasurement: 1e718274b7e015cefd846ac1fcf7820c70dc017d
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
local_auth_darwin: d2e8c53ef0c4f43c646462e3415432c4dab3ae19
local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb
Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
no_screenshot: 6d183496405a3ab709a67a54e5cd0f639e94729e
@ -397,19 +398,19 @@ SPEC CHECKSUMS:
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
restart_app: 9cda5378aacc5000e3f66ee76a9201534e7d3ecf
ScreenProtectorKit: 83a6281b02c7a5902ee6eac4f5045f674e902ae4
SDWebImage: f29024626962457f3470184232766516dee8dfea
SDWebImage: 16309af6d214ba3f77a7c6f6fdda888cb313a50a
SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
sqlite3: 83105acd294c9137c026e2da1931c30b4588ab81
sqlite3_flutter_libs: 616267f2fca40e9c6af8c5d82324e05667040b6e
SwiftProtobuf: 3697407f0d5b23bedeba9c2eaaf3ec6fdff69349
sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b
sqlite3_flutter_libs: 83f8e9f5b6554077f1d93119fe20ebaa5f3a9ef1
SwiftProtobuf: 81e341191afbddd64aa031bd12862dccfab2f639
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
video_compress: f2133a07762889d67f0711ac831faa26f956980e
video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
video_thumbnail: b637e0ad5f588ca9945f6e2c927f73a69a661140
PODFILE CHECKSUM: a01f0821a361ca6708e29b1299e8becf492a8a71
PODFILE CHECKSUM: 47470fbd5b59affa461eaf943ac57acce81e0ee8
COCOAPODS: 1.16.2

6
ios/Runner.xcodeproj/project.pbxproj
View file

@ -609,7 +609,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@ -752,7 +752,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@ -805,7 +805,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;

1
l10n.yaml
View file

@ -1,4 +1,3 @@
synthetic-package: false
arb-dir: lib/src/localization
template-arb-file: app_en.arb
output-localization-file: app_localizations.dart

20
lib/app.dart
View file

@ -28,16 +28,18 @@ class _AppState extends State<App> with WidgetsBindingObserver {
globalIsAppInBackground = false;
WidgetsBinding.instance.addObserver(this);
globalCallbackConnectionState = ({required bool isConnected}) {
context.read<CustomChangeProvider>().updateConnectionState(isConnected);
setUserPlan();
globalCallbackConnectionState = ({required bool isConnected}) async {
await context
.read<CustomChangeProvider>()
.updateConnectionState(isConnected);
await setUserPlan();
};
globalCallbackUpdatePlan = (String planId) {
context.read<CustomChangeProvider>().updatePlan(planId);
globalCallbackUpdatePlan = (String planId) async {
await context.read<CustomChangeProvider>().updatePlan(planId);
};
initAsync();
unawaited(initAsync());
}
Future<void> setUserPlan() async {
@ -77,12 +79,12 @@ class _AppState extends State<App> with WidgetsBindingObserver {
if (wasPaused) {
globalIsAppInBackground = false;
twonlyDB.markUpdated();
apiService.connect(force: true);
unawaited(apiService.connect(force: true));
}
} else if (state == AppLifecycleState.paused) {
wasPaused = true;
globalIsAppInBackground = true;
handleUploadWhenAppGoesBackground();
unawaited(handleUploadWhenAppGoesBackground());
}
}
@ -138,7 +140,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
initialRoute: '/',
routes: {
'/': (context) => const AppMainWidget(initialPage: 1),
'/chats': (context) => const AppMainWidget(initialPage: 0)
'/chats': (context) => const AppMainWidget(initialPage: 0),
},
);
},

32
lib/src/database/daos/contacts_dao.dart
View file

@ -10,6 +10,7 @@ class ContactsDao extends DatabaseAccessor<TwonlyDatabase>
with _$ContactsDaoMixin {
// this constructor is required so that the main database can create an instance
// of this object.
// ignore: matching_super_parameters
ContactsDao(super.db);
Future<int> insertContact(ContactsCompanion contact) async {
@ -102,7 +103,9 @@ class ContactsDao extends DatabaseAccessor<TwonlyDatabase>
}
Future<void> updateContact(
int userId, ContactsCompanion updatedValues) async {
int userId,
ContactsCompanion updatedValues,
) async {
await (update(contacts)..where((c) => c.userId.equals(userId)))
.write(updatedValues);
if (updatedValues.blocked.present ||
@ -117,10 +120,12 @@ class ContactsDao extends DatabaseAccessor<TwonlyDatabase>
Stream<List<Contact>> watchNotAcceptedContacts() {
return (select(contacts)
..where((t) =>
..where(
(t) =>
t.accepted.equals(false) &
t.archived.equals(false) &
t.blocked.equals(false)))
t.blocked.equals(false),
))
.watch();
// return (select(contacts)).watch();
}
@ -132,10 +137,12 @@ class ContactsDao extends DatabaseAccessor<TwonlyDatabase>
Stream<List<Contact>> watchContactsForShareView() {
return (select(contacts)
..where((t) =>
..where(
(t) =>
t.accepted.equals(true) &
t.blocked.equals(false) &
t.deleted.equals(false))
t.deleted.equals(false),
)
..orderBy([(t) => OrderingTerm.desc(t.lastMessageExchange)]))
.watch();
}
@ -177,8 +184,9 @@ class ContactsDao extends DatabaseAccessor<TwonlyDatabase>
Stream<int?> watchContactsRequested() {
final count = contacts.requested.count(distinct: true);
final query = selectOnly(contacts)
..where(contacts.requested.equals(true) &
contacts.accepted.equals(true).not())
..where(
contacts.requested.equals(true) & contacts.accepted.equals(true).not(),
)
..addColumns([count]);
return query.map((row) => row.read(count)).watchSingle();
}
@ -187,6 +195,16 @@ class ContactsDao extends DatabaseAccessor<TwonlyDatabase>
return select(contacts).watch();
}
Future<void> modifyFlameCounterForTesting() async {
await update(contacts).write(
ContactsCompanion(
lastFlameCounterChange: Value(DateTime.now()),
flameCounter: const Value(1337),
lastFlameSync: const Value(null),
),
);
}
Stream<int> watchFlameCounter(int userId) {
return (select(contacts)
..where(

8
lib/src/database/daos/media_uploads_dao.dart
View file

@ -8,17 +8,21 @@ part 'media_uploads_dao.g.dart';
@DriftAccessor(tables: [MediaUploads])
class MediaUploadsDao extends DatabaseAccessor<TwonlyDatabase>
with _$MediaUploadsDaoMixin {
// ignore: matching_super_parameters
MediaUploadsDao(super.db);
Future<List<MediaUpload>> getMediaUploadsForRetry() {
return (select(mediaUploads)
..where(
(t) => t.state.equals(UploadState.receiverNotified.name).not()))
(t) => t.state.equals(UploadState.receiverNotified.name).not(),
))
.get();
}
Future<int> updateMediaUpload(
int mediaUploadId, MediaUploadsCompanion updatedValues) {
int mediaUploadId,
MediaUploadsCompanion updatedValues,
) {
return (update(mediaUploads)
..where((c) => c.mediaUploadId.equals(mediaUploadId)))
.write(updatedValues);

41
lib/src/database/daos/message_retransmissions.dao.dart
View file

@ -10,10 +10,12 @@ class MessageRetransmissionDao extends DatabaseAccessor<TwonlyDatabase>
with _$MessageRetransmissionDaoMixin {
// this constructor is required so that the main database can create an instance
// of this object.
// ignore: matching_super_parameters
MessageRetransmissionDao(super.db);
Future<int?> insertRetransmission(
MessageRetransmissionsCompanion message) async {
MessageRetransmissionsCompanion message,
) async {
try {
return await into(messageRetransmissions).insert(message);
} catch (e) {
@ -25,18 +27,22 @@ class MessageRetransmissionDao extends DatabaseAccessor<TwonlyDatabase>
Future<void> purgeOldRetransmissions() async {
// delete entries older than two weeks
await (delete(messageRetransmissions)
..where((t) => (t.acknowledgeByServerAt.isSmallerThanValue(
..where(
(t) => (t.acknowledgeByServerAt.isSmallerThanValue(
DateTime.now().subtract(
const Duration(days: 25),
),
))))
)),
))
.go();
}
Future<List<int>> getRetransmitAbleMessages() async {
final countDeleted = await (delete(messageRetransmissions)
..where((t) =>
t.encryptedHash.isNull() & t.acknowledgeByServerAt.isNotNull()))
..where(
(t) =>
t.encryptedHash.isNull() & t.acknowledgeByServerAt.isNotNull(),
))
.go();
if (countDeleted > 0) {
@ -51,11 +57,18 @@ class MessageRetransmissionDao extends DatabaseAccessor<TwonlyDatabase>
}
SingleOrNullSelectable<MessageRetransmission> getRetransmissionById(
int retransmissionId) {
int retransmissionId,
) {
return select(messageRetransmissions)
..where((t) => t.retransmissionId.equals(retransmissionId));
}
Stream<List<MessageRetransmission>> watchAllMessages() {
return (select(messageRetransmissions)
..orderBy([(t) => OrderingTerm.asc(t.retransmissionId)]))
.watch();
}
Future<void> updateRetransmission(
int retransmissionId,
MessageRetransmissionsCompanion updatedValues,
@ -67,9 +80,11 @@ class MessageRetransmissionDao extends DatabaseAccessor<TwonlyDatabase>
Future<int> resetAckStatusFor(int fromUserId, Uint8List encryptedHash) async {
return ((update(messageRetransmissions))
..where((m) =>
..where(
(m) =>
m.contactId.equals(fromUserId) &
m.encryptedHash.equals(encryptedHash)))
m.encryptedHash.equals(encryptedHash),
))
.write(
const MessageRetransmissionsCompanion(
acknowledgeByServerAt: Value(null),
@ -78,11 +93,15 @@ class MessageRetransmissionDao extends DatabaseAccessor<TwonlyDatabase>
}
Future<MessageRetransmission?> getRetransmissionFromHash(
int fromUserId, Uint8List encryptedHash) async {
int fromUserId,
Uint8List encryptedHash,
) async {
return ((select(messageRetransmissions))
..where((m) =>
..where(
(m) =>
m.contactId.equals(fromUserId) &
m.encryptedHash.equals(encryptedHash)))
m.encryptedHash.equals(encryptedHash),
))
.getSingleOrNull();
}

118
lib/src/database/daos/messages_dao.dart
View file

@ -11,26 +11,31 @@ class MessagesDao extends DatabaseAccessor<TwonlyDatabase>
with _$MessagesDaoMixin {
// this constructor is required so that the main database can create an instance
// of this object.
// ignore: matching_super_parameters
MessagesDao(super.db);
Stream<List<Message>> watchMessageNotOpened(int contactId) {
return (select(messages)
..where((t) =>
..where(
(t) =>
t.openedAt.isNull() &
t.contactId.equals(contactId) &
t.errorWhileSending.equals(false))
t.errorWhileSending.equals(false),
)
..orderBy([(t) => OrderingTerm.desc(t.sendAt)]))
.watch();
}
Stream<List<Message>> watchMediaMessageNotOpened(int contactId) {
return (select(messages)
..where((t) =>
..where(
(t) =>
t.openedAt.isNull() &
t.contactId.equals(contactId) &
t.errorWhileSending.equals(false) &
t.messageOtherId.isNotNull() &
t.kind.equals(MessageKind.media.name))
t.kind.equals(MessageKind.media.name),
)
..orderBy([(t) => OrderingTerm.asc(t.sendAt)]))
.watch();
}
@ -45,27 +50,33 @@ class MessagesDao extends DatabaseAccessor<TwonlyDatabase>
Stream<List<Message>> watchAllMessagesFrom(int contactId) {
return (select(messages)
..where((t) =>
..where(
(t) =>
t.contactId.equals(contactId) &
t.contentJson.isNotNull() &
(t.openedAt.isNull() |
t.mediaStored.equals(true) |
t.openedAt.isBiggerThanValue(
DateTime.now().subtract(const Duration(days: 1)))))
DateTime.now().subtract(const Duration(days: 1)),
)),
)
..orderBy([(t) => OrderingTerm.asc(t.sendAt)]))
.watch();
}
Future<void> removeOldMessages() {
return (update(messages)
..where((t) =>
..where(
(t) =>
(t.openedAt.isSmallerThanValue(
DateTime.now().subtract(const Duration(days: 1)),
) |
(t.sendAt.isSmallerThanValue(
DateTime.now().subtract(const Duration(days: 1))) &
DateTime.now().subtract(const Duration(days: 3)),
) &
t.errorWhileSending.equals(true))) &
t.kind.equals(MessageKind.textMessage.name)))
t.kind.equals(MessageKind.textMessage.name),
))
.write(const MessagesCompanion(contentJson: Value(null)));
}
@ -99,13 +110,15 @@ class MessagesDao extends DatabaseAccessor<TwonlyDatabase>
Future<List<Message>> getAllNonACKMessagesFromUser() {
return (select(messages)
..where((t) =>
..where(
(t) =>
t.acknowledgeByUser.equals(false) &
t.messageOtherId.isNull() &
t.errorWhileSending.equals(false) &
t.sendAt.isBiggerThanValue(
DateTime.now().subtract(const Duration(minutes: 10)),
)))
),
))
.get();
}
@ -133,11 +146,13 @@ class MessagesDao extends DatabaseAccessor<TwonlyDatabase>
Future<void> openedAllNonMediaMessages(int contactId) {
final updates = MessagesCompanion(openedAt: Value(DateTime.now()));
return (update(messages)
..where((t) =>
..where(
(t) =>
t.contactId.equals(contactId) &
t.messageOtherId.isNotNull() &
t.openedAt.isNull() &
t.kind.equals(MessageKind.media.name).not()))
t.kind.equals(MessageKind.media.name).not(),
))
.write(updates);
}
@ -148,44 +163,59 @@ class MessagesDao extends DatabaseAccessor<TwonlyDatabase>
const updates =
MessagesCompanion(downloadState: Value(DownloadState.pending));
return (update(messages)
..where((t) =>
..where(
(t) =>
t.messageOtherId.isNotNull() &
t.downloadState.equals(DownloadState.downloading.index) &
t.kind.equals(MessageKind.media.name)))
t.kind.equals(MessageKind.media.name),
))
.write(updates);
}
Future<void> openedAllNonMediaMessagesFromOtherUser(int contactId) {
final updates = MessagesCompanion(openedAt: Value(DateTime.now()));
return (update(messages)
..where((t) =>
..where(
(t) =>
t.contactId.equals(contactId) &
t.messageOtherId
.isNull() & // only mark messages open that where send
t.openedAt.isNull() &
t.kind.equals(MessageKind.media.name).not()))
t.kind.equals(MessageKind.media.name).not(),
))
.write(updates);
}
Future<void> updateMessageByOtherUser(
int userId, int messageId, MessagesCompanion updatedValues) {
int userId,
int messageId,
MessagesCompanion updatedValues,
) {
return (update(messages)
..where((c) =>
c.contactId.equals(userId) & c.messageId.equals(messageId)))
..where(
(c) => c.contactId.equals(userId) & c.messageId.equals(messageId),
))
.write(updatedValues);
}
Future<void> updateMessageByOtherMessageId(
int userId, int messageOtherId, MessagesCompanion updatedValues) {
int userId,
int messageOtherId,
MessagesCompanion updatedValues,
) {
return (update(messages)
..where((c) =>
..where(
(c) =>
c.contactId.equals(userId) &
c.messageOtherId.equals(messageOtherId)))
c.messageOtherId.equals(messageOtherId),
))
.write(updatedValues);
}
Future<void> updateMessageByMessageId(
int messageId, MessagesCompanion updatedValues) {
int messageId,
MessagesCompanion updatedValues,
) {
return (update(messages)..where((c) => c.messageId.equals(messageId)))
.write(updatedValues);
}
@ -207,17 +237,22 @@ class MessagesDao extends DatabaseAccessor<TwonlyDatabase>
Future<void> deleteMessagesByContactId(int contactId) {
return (delete(messages)
..where((t) =>
t.contactId.equals(contactId) & t.mediaStored.equals(false)))
..where(
(t) => t.contactId.equals(contactId) & t.mediaStored.equals(false),
))
.go();
}
Future<void> deleteMessagesByContactIdAndOtherMessageId(
int contactId, int messageOtherId) {
int contactId,
int messageOtherId,
) {
return (delete(messages)
..where((t) =>
..where(
(t) =>
t.contactId.equals(contactId) &
t.messageOtherId.equals(messageOtherId)))
t.messageOtherId.equals(messageOtherId),
))
.go();
}
@ -234,9 +269,11 @@ class MessagesDao extends DatabaseAccessor<TwonlyDatabase>
int messageOtherId,
) async {
final query = select(messages)
..where((t) =>
..where(
(t) =>
t.messageOtherId.equals(messageOtherId) &
t.contactId.equals(fromUserId));
t.contactId.equals(fromUserId),
);
final entry = await query.get();
return entry.isNotEmpty;
}
@ -252,16 +289,23 @@ class MessagesDao extends DatabaseAccessor<TwonlyDatabase>
}
SingleOrNullSelectable<Message> getMessageByOtherMessageId(
int fromUserId, int messageId) {
int fromUserId,
int messageId,
) {
return select(messages)
..where((t) =>
t.messageOtherId.equals(messageId) & t.contactId.equals(fromUserId));
..where(
(t) =>
t.messageOtherId.equals(messageId) & t.contactId.equals(fromUserId),
);
}
SingleOrNullSelectable<Message> getMessageByIdAndContactId(
int fromUserId, int messageId) {
int fromUserId,
int messageId,
) {
return select(messages)
..where((t) =>
t.messageId.equals(messageId) & t.contactId.equals(fromUserId));
..where(
(t) => t.messageId.equals(messageId) & t.contactId.equals(fromUserId),
);
}
}

56
lib/src/database/daos/signal_dao.dart
View file

@ -7,13 +7,16 @@ import 'package:twonly/src/utils/log.dart';
part 'signal_dao.g.dart';
@DriftAccessor(tables: [
@DriftAccessor(
tables: [
SignalContactPreKeys,
SignalContactSignedPreKeys,
])
],
)
class SignalDao extends DatabaseAccessor<TwonlyDatabase> with _$SignalDaoMixin {
// this constructor is required so that the main database can create an instance
// of this object.
// ignore: matching_super_parameters
SignalDao(super.db);
Future<void> deleteAllByContactId(int contactId) async {
await (delete(signalContactPreKeys)
@ -48,10 +51,13 @@ class SignalDao extends DatabaseAccessor<TwonlyDatabase> with _$SignalDaoMixin {
if (preKey != null) {
// remove the pre key...
await (delete(signalContactPreKeys)
..where((tbl) =>
..where(
(tbl) =>
tbl.contactId.equals(contactId) &
tbl.preKeyId.equals(preKey.preKeyId)))
tbl.preKeyId.equals(preKey.preKeyId),
))
.go();
Log.info('Using prekey ${preKey.preKeyId} for $contactId');
return preKey;
}
return null;
@ -59,7 +65,8 @@ class SignalDao extends DatabaseAccessor<TwonlyDatabase> with _$SignalDaoMixin {
// 3: Insert multiple pre-keys
Future<void> insertPreKeys(
List<SignalContactPreKeysCompanion> preKeys) async {
List<SignalContactPreKeysCompanion> preKeys,
) async {
for (final preKey in preKeys) {
try {
await into(signalContactPreKeys).insert(preKey);
@ -78,7 +85,8 @@ class SignalDao extends DatabaseAccessor<TwonlyDatabase> with _$SignalDaoMixin {
// 5: Insert or update signed pre-key by contact ID
Future<void> insertOrUpdateSignedPreKeyByContactId(
SignalContactSignedPreKeysCompanion signedPreKey) async {
SignalContactSignedPreKeysCompanion signedPreKey,
) async {
await (delete(signalContactSignedPreKeys)
..where((t) => t.contactId.equals(signedPreKey.contactId.value)))
.go();
@ -86,21 +94,35 @@ class SignalDao extends DatabaseAccessor<TwonlyDatabase> with _$SignalDaoMixin {
}
Future<void> purgeOutDatedPreKeys() async {
// other pre keys are valid 25 days
await (delete(signalContactSignedPreKeys)
..where((t) => (t.createdAt.isSmallerThanValue(
DateTime.now().subtract(
const Duration(days: 25),
),
))))
// Deletion is a workaround for the issue, that own pre keys where deleted after 40 days, while they could be 30days
// on the server + 25 days on the others device old, resulting in the issue that the receiver could not decrypt the
// messages...
await (delete(signalContactPreKeys)
..where(
(t) => (t.createdAt.isSmallerThanValue(
DateTime(2025, 10, 10),
)),
))
.go();
// own pre keys are valid for 40 days
// other pre keys are valid 100 days
await (delete(signalContactPreKeys)
..where(
(t) => (t.createdAt.isSmallerThanValue(
DateTime.now().subtract(
const Duration(days: 100),
),
)),
))
.go();
// own pre keys are valid for 180 days
await (delete(twonlyDB.signalPreKeyStores)
..where((t) => (t.createdAt.isSmallerThanValue(
..where(
(t) => (t.createdAt.isSmallerThanValue(
DateTime.now().subtract(
const Duration(days: 40),
const Duration(days: 365),
),
))))
)),
))
.go();
}
}

23
lib/src/database/signal/connect_identity_key_store.dart
View file

@ -13,9 +13,11 @@ class ConnectIdentityKeyStore extends IdentityKeyStore {
@override
Future<IdentityKey?> getIdentity(SignalProtocolAddress address) async {
final identity = await (twonlyDB.select(twonlyDB.signalIdentityKeyStores)
..where((t) =>
..where(
(t) =>
t.deviceId.equals(address.getDeviceId()) &
t.name.equals(address.getName())))
t.name.equals(address.getName()),
))
.getSingleOrNull();
if (identity == null) return null;
return IdentityKey.fromBytes(identity.identityKey, 0);
@ -28,8 +30,11 @@ class ConnectIdentityKeyStore extends IdentityKeyStore {
Future<int> getLocalRegistrationId() async => localRegistrationId;
@override
Future<bool> isTrustedIdentity(SignalProtocolAddress address,
IdentityKey? identityKey, Direction? direction) async {
Future<bool> isTrustedIdentity(
SignalProtocolAddress address,
IdentityKey? identityKey,
Direction? direction,
) async {
final trusted = await getIdentity(address);
if (identityKey == null) {
return false;
@ -41,7 +46,9 @@ class ConnectIdentityKeyStore extends IdentityKeyStore {
@override
Future<bool> saveIdentity(
SignalProtocolAddress address, IdentityKey? identityKey) async {
SignalProtocolAddress address,
IdentityKey? identityKey,
) async {
if (identityKey == null) {
return false;
}
@ -55,9 +62,11 @@ class ConnectIdentityKeyStore extends IdentityKeyStore {
);
} else {
await (twonlyDB.update(twonlyDB.signalIdentityKeyStores)
..where((t) =>
..where(
(t) =>
t.deviceId.equals(address.getDeviceId()) &
t.name.equals(address.getName())))
t.name.equals(address.getName()),
))
.write(
SignalIdentityKeyStoresCompanion(
identityKey: Value(identityKey.serialize()),

1
lib/src/database/signal/connect_pre_key_store.dart
View file

@ -21,6 +21,7 @@ class ConnectPreKeyStore extends PreKeyStore {
if (preKeyRecord.isEmpty) {
throw InvalidKeyIdException('No such preKey record! - $preKeyId');
}
Log.info('Contact used preKey $preKeyId');
final preKey = preKeyRecord.first.preKey;
return PreKeyRecord.fromBuffer(preKey);
}

7
lib/src/database/signal/connect_sender_key_store.dart
View file

@ -11,14 +11,17 @@ class ConnectSenderKeyStore extends SenderKeyStore {
.getSingleOrNull();
if (identity == null) {
throw InvalidKeyIdException(
'No such sender key record! - $senderKeyName');
'No such sender key record! - $senderKeyName',
);
}
return SenderKeyRecord.fromSerialized(identity.senderKey);
}
@override
Future<void> storeSenderKey(
SenderKeyName senderKeyName, SenderKeyRecord record) async {
SenderKeyName senderKeyName,
SenderKeyRecord record,
) async {
await twonlyDB.into(twonlyDB.signalSenderKeyStores).insert(
SignalSenderKeyStoresCompanion(
senderKey: Value(record.serialize()),

31
lib/src/database/signal/connect_session_store.dart
View file

@ -7,9 +7,11 @@ class ConnectSessionStore extends SessionStore {
@override
Future<bool> containsSession(SignalProtocolAddress address) async {
final sessions = await (twonlyDB.select(twonlyDB.signalSessionStores)
..where((tbl) =>
..where(
(tbl) =>
tbl.deviceId.equals(address.getDeviceId()) &
tbl.name.equals(address.getName())))
tbl.name.equals(address.getName()),
))
.get();
return sessions.isNotEmpty;
}
@ -24,9 +26,11 @@ class ConnectSessionStore extends SessionStore {
@override
Future<void> deleteSession(SignalProtocolAddress address) async {
await (twonlyDB.delete(twonlyDB.signalSessionStores)
..where((tbl) =>
..where(
(tbl) =>
tbl.deviceId.equals(address.getDeviceId()) &
tbl.name.equals(address.getName())))
tbl.name.equals(address.getName()),
))
.go();
}
@ -34,7 +38,8 @@ class ConnectSessionStore extends SessionStore {
Future<List<int>> getSubDeviceSessions(String name) async {
final deviceIds = await (twonlyDB.select(twonlyDB.signalSessionStores)
..where(
(tbl) => tbl.deviceId.equals(1).not() & tbl.name.equals(name)))
(tbl) => tbl.deviceId.equals(1).not() & tbl.name.equals(name),
))
.get();
return deviceIds.map((row) => row.deviceId).toList();
}
@ -42,9 +47,11 @@ class ConnectSessionStore extends SessionStore {
@override
Future<SessionRecord> loadSession(SignalProtocolAddress address) async {
final dbSession = await (twonlyDB.select(twonlyDB.signalSessionStores)
..where((tbl) =>
..where(
(tbl) =>
tbl.deviceId.equals(address.getDeviceId()) &
tbl.name.equals(address.getName())))
tbl.name.equals(address.getName()),
))
.get();
if (dbSession.isEmpty) {
@ -56,7 +63,9 @@ class ConnectSessionStore extends SessionStore {
@override
Future<void> storeSession(
SignalProtocolAddress address, SessionRecord record) async {
SignalProtocolAddress address,
SessionRecord record,
) async {
final sessionCompanion = SignalSessionStoresCompanion(
deviceId: Value(address.getDeviceId()),
name: Value(address.getName()),
@ -69,9 +78,11 @@ class ConnectSessionStore extends SessionStore {
.insert(sessionCompanion);
} else {
await (twonlyDB.update(twonlyDB.signalSessionStores)
..where((tbl) =>
..where(
(tbl) =>
tbl.deviceId.equals(address.getDeviceId()) &
tbl.name.equals(address.getName())))
tbl.name.equals(address.getName()),
))
.write(sessionCompanion);
}
}

23
lib/src/database/signal/connect_signal_protocol_store.dart
View file

@ -6,7 +6,9 @@ import 'package:twonly/src/database/signal/connect_signed_pre_key_store.dart';
class ConnectSignalProtocolStore implements SignalProtocolStore {
ConnectSignalProtocolStore(
IdentityKeyPair identityKeyPair, int registrationId) {
IdentityKeyPair identityKeyPair,
int registrationId,
) {
_identityKeyStore =
ConnectIdentityKeyStore(identityKeyPair, registrationId);
}
@ -27,12 +29,17 @@ class ConnectSignalProtocolStore implements SignalProtocolStore {
@override
Future<bool> saveIdentity(
SignalProtocolAddress address, IdentityKey? identityKey) async =>
SignalProtocolAddress address,
IdentityKey? identityKey,
) async =>
_identityKeyStore.saveIdentity(address, identityKey);
@override
Future<bool> isTrustedIdentity(SignalProtocolAddress address,
IdentityKey? identityKey, Direction direction) async =>
Future<bool> isTrustedIdentity(
SignalProtocolAddress address,
IdentityKey? identityKey,
Direction direction,
) async =>
_identityKeyStore.isTrustedIdentity(address, identityKey, direction);
@override
@ -67,7 +74,9 @@ class ConnectSignalProtocolStore implements SignalProtocolStore {
@override
Future<void> storeSession(
SignalProtocolAddress address, SessionRecord record) async {
SignalProtocolAddress address,
SessionRecord record,
) async {
await sessionStore.storeSession(address, record);
}
@ -95,7 +104,9 @@ class ConnectSignalProtocolStore implements SignalProtocolStore {
@override
Future<void> storeSignedPreKey(
int signedPreKeyId, SignedPreKeyRecord record) async {
int signedPreKeyId,
SignedPreKeyRecord record,
) async {
await signedPreKeyStore.storeSignedPreKey(signedPreKeyId, record);
}

3
lib/src/database/tables/message_retransmissions.dart
View file

@ -16,5 +16,8 @@ class MessageRetransmissions extends Table {
BlobColumn get pushData => blob().nullable()();
BlobColumn get encryptedHash => blob().nullable()();
IntColumn get retryCount => integer().withDefault(const Constant(0))();
DateTimeColumn get lastRetry => dateTime().nullable()();
DateTimeColumn get acknowledgeByServerAt => dateTime().nullable()();
}

72
lib/src/database/twonly_database.dart
View file

@ -23,7 +23,8 @@ import 'package:twonly/src/utils/log.dart';
part 'twonly_database.g.dart';
// You can then create a database class that includes this table
@DriftDatabase(tables: [
@DriftDatabase(
tables: [
Contacts,
Messages,
MediaUploads,
@ -33,24 +34,27 @@ part 'twonly_database.g.dart';
SignalSessionStores,
SignalContactPreKeys,
SignalContactSignedPreKeys,
MessageRetransmissions
], daos: [
MessageRetransmissions,
],
daos: [
MessagesDao,
ContactsDao,
MediaUploadsDao,
SignalDao,
MessageRetransmissionDao
])
MessageRetransmissionDao,
],
)
class TwonlyDatabase extends _$TwonlyDatabase {
TwonlyDatabase([QueryExecutor? e])
: super(
e ?? _openConnection(),
);
// ignore: matching_super_parameters
TwonlyDatabase.forTesting(DatabaseConnection super.connection);
@override
int get schemaVersion => 16;
int get schemaVersion => 17;
static QueryExecutor _openConnection() {
return driftDatabase(
@ -74,17 +78,21 @@ class TwonlyDatabase extends _$TwonlyDatabase {
from2To3: (m, schema) async {
await m.addColumn(schema.contacts, schema.contacts.archived);
await m.addColumn(
schema.contacts, schema.contacts.deleteMessagesAfterXMinutes);
schema.contacts,
schema.contacts.deleteMessagesAfterXMinutes,
);
},
from3To4: (m, schema) async {
await m.createTable(schema.mediaUploads);
await m.alterTable(TableMigration(
await m.alterTable(
TableMigration(
schema.mediaUploads,
columnTransformer: {
schema.mediaUploads.metadata:
schema.mediaUploads.metadata.cast<String>(),
},
));
),
);
},
from4To5: (m, schema) async {
await m.createTable(schema.mediaDownloads);
@ -102,13 +110,15 @@ class TwonlyDatabase extends _$TwonlyDatabase {
await m.addColumn(schema.contacts, schema.contacts.lastFlameSync);
},
from8To9: (m, schema) async {
await m.alterTable(TableMigration(
await m.alterTable(
TableMigration(
schema.mediaUploads,
columnTransformer: {
schema.mediaUploads.metadata:
schema.mediaUploads.metadata.cast<String>(),
},
));
),
);
},
from9To10: (m, schema) async {
await m.createTable(schema.signalContactPreKeys);
@ -119,26 +129,44 @@ class TwonlyDatabase extends _$TwonlyDatabase {
await m.createTable(schema.messageRetransmissions);
},
from11To12: (m, schema) async {
await m.addColumn(schema.messageRetransmissions,
schema.messageRetransmissions.willNotGetACKByUser);
await m.addColumn(
schema.messageRetransmissions,
schema.messageRetransmissions.willNotGetACKByUser,
);
},
from12To13: (m, schema) async {
await m.dropColumn(
schema.messageRetransmissions, 'will_not_get_a_c_k_by_user');
schema.messageRetransmissions,
'will_not_get_a_c_k_by_user',
);
},
from13To14: (m, schema) async {
await m.addColumn(schema.messageRetransmissions,
schema.messageRetransmissions.encryptedHash);
await m.addColumn(
schema.messageRetransmissions,
schema.messageRetransmissions.encryptedHash,
);
},
from14To15: (m, schema) async {
await m.dropColumn(schema.mediaUploads, 'upload_tokens');
await m.dropColumn(schema.mediaUploads, 'already_notified');
await m.addColumn(
schema.messages, schema.messages.mediaRetransmissionState);
schema.messages,
schema.messages.mediaRetransmissionState,
);
},
from15To16: (m, schema) async {
await m.deleteTable('media_downloads');
},
from16To17: (m, schema) async {
await m.addColumn(
schema.messageRetransmissions,
schema.messageRetransmissions.lastRetry,
);
await m.addColumn(
schema.messageRetransmissions,
schema.messageRetransmissions.retryCount,
);
},
),
);
}
@ -150,8 +178,8 @@ class TwonlyDatabase extends _$TwonlyDatabase {
Future<void> printTableSizes() async {
final result = await customSelect(
'SELECT name, SUM(pgsize) as size FROM dbstat GROUP BY name')
.get();
'SELECT name, SUM(pgsize) as size FROM dbstat GROUP BY name',
).get();
for (final row in result) {
final tableName = row.read<String>('name');
@ -173,11 +201,13 @@ class TwonlyDatabase extends _$TwonlyDatabase {
await delete(signalContactPreKeys).go();
await delete(signalContactSignedPreKeys).go();
await (delete(signalPreKeyStores)
..where((t) => (t.createdAt.isSmallerThanValue(
..where(
(t) => (t.createdAt.isSmallerThanValue(
DateTime.now().subtract(
const Duration(days: 25),
),
))))
)),
))
.go();
}
}

111
lib/src/database/twonly_database.g.dart
View file

@ -3983,6 +3983,20 @@ class $MessageRetransmissionsTable extends MessageRetransmissions
late final GeneratedColumn<Uint8List> encryptedHash =
GeneratedColumn<Uint8List>('encrypted_hash', aliasedName, true,
type: DriftSqlType.blob, requiredDuringInsert: false);
static const VerificationMeta _retryCountMeta =
const VerificationMeta('retryCount');
@override
late final GeneratedColumn<int> retryCount = GeneratedColumn<int>(
'retry_count', aliasedName, false,
type: DriftSqlType.int,
requiredDuringInsert: false,
defaultValue: const Constant(0));
static const VerificationMeta _lastRetryMeta =
const VerificationMeta('lastRetry');
@override
late final GeneratedColumn<DateTime> lastRetry = GeneratedColumn<DateTime>(
'last_retry', aliasedName, true,
type: DriftSqlType.dateTime, requiredDuringInsert: false);
static const VerificationMeta _acknowledgeByServerAtMeta =
const VerificationMeta('acknowledgeByServerAt');
@override
@ -3997,6 +4011,8 @@ class $MessageRetransmissionsTable extends MessageRetransmissions
plaintextContent,
pushData,
encryptedHash,
retryCount,
lastRetry,
acknowledgeByServerAt
];
@override
@ -4044,6 +4060,16 @@ class $MessageRetransmissionsTable extends MessageRetransmissions
encryptedHash.isAcceptableOrUnknown(
data['encrypted_hash']!, _encryptedHashMeta));
}
if (data.containsKey('retry_count')) {
context.handle(
_retryCountMeta,
retryCount.isAcceptableOrUnknown(
data['retry_count']!, _retryCountMeta));
}
if (data.containsKey('last_retry')) {
context.handle(_lastRetryMeta,
lastRetry.isAcceptableOrUnknown(data['last_retry']!, _lastRetryMeta));
}
if (data.containsKey('acknowledge_by_server_at')) {
context.handle(
_acknowledgeByServerAtMeta,
@ -4071,6 +4097,10 @@ class $MessageRetransmissionsTable extends MessageRetransmissions
.read(DriftSqlType.blob, data['${effectivePrefix}push_data']),
encryptedHash: attachedDatabase.typeMapping
.read(DriftSqlType.blob, data['${effectivePrefix}encrypted_hash']),
retryCount: attachedDatabase.typeMapping
.read(DriftSqlType.int, data['${effectivePrefix}retry_count'])!,
lastRetry: attachedDatabase.typeMapping
.read(DriftSqlType.dateTime, data['${effectivePrefix}last_retry']),
acknowledgeByServerAt: attachedDatabase.typeMapping.read(
DriftSqlType.dateTime,
data['${effectivePrefix}acknowledge_by_server_at']),
@ -4091,6 +4121,8 @@ class MessageRetransmission extends DataClass
final Uint8List plaintextContent;
final Uint8List? pushData;
final Uint8List? encryptedHash;
final int retryCount;
final DateTime? lastRetry;
final DateTime? acknowledgeByServerAt;
const MessageRetransmission(
{required this.retransmissionId,
@ -4099,6 +4131,8 @@ class MessageRetransmission extends DataClass
required this.plaintextContent,
this.pushData,
this.encryptedHash,
required this.retryCount,
this.lastRetry,
this.acknowledgeByServerAt});
@override
Map<String, Expression> toColumns(bool nullToAbsent) {
@ -4115,6 +4149,10 @@ class MessageRetransmission extends DataClass
if (!nullToAbsent || encryptedHash != null) {
map['encrypted_hash'] = Variable<Uint8List>(encryptedHash);
}
map['retry_count'] = Variable<int>(retryCount);
if (!nullToAbsent || lastRetry != null) {
map['last_retry'] = Variable<DateTime>(lastRetry);
}
if (!nullToAbsent || acknowledgeByServerAt != null) {
map['acknowledge_by_server_at'] =
Variable<DateTime>(acknowledgeByServerAt);
@ -4136,6 +4174,10 @@ class MessageRetransmission extends DataClass
encryptedHash: encryptedHash == null && nullToAbsent
? const Value.absent()
: Value(encryptedHash),
retryCount: Value(retryCount),
lastRetry: lastRetry == null && nullToAbsent
? const Value.absent()
: Value(lastRetry),
acknowledgeByServerAt: acknowledgeByServerAt == null && nullToAbsent
? const Value.absent()
: Value(acknowledgeByServerAt),
@ -4153,6 +4195,8 @@ class MessageRetransmission extends DataClass
serializer.fromJson<Uint8List>(json['plaintextContent']),
pushData: serializer.fromJson<Uint8List?>(json['pushData']),
encryptedHash: serializer.fromJson<Uint8List?>(json['encryptedHash']),
retryCount: serializer.fromJson<int>(json['retryCount']),
lastRetry: serializer.fromJson<DateTime?>(json['lastRetry']),
acknowledgeByServerAt:
serializer.fromJson<DateTime?>(json['acknowledgeByServerAt']),
);
@ -4167,6 +4211,8 @@ class MessageRetransmission extends DataClass
'plaintextContent': serializer.toJson<Uint8List>(plaintextContent),
'pushData': serializer.toJson<Uint8List?>(pushData),
'encryptedHash': serializer.toJson<Uint8List?>(encryptedHash),
'retryCount': serializer.toJson<int>(retryCount),
'lastRetry': serializer.toJson<DateTime?>(lastRetry),
'acknowledgeByServerAt':
serializer.toJson<DateTime?>(acknowledgeByServerAt),
};
@ -4179,6 +4225,8 @@ class MessageRetransmission extends DataClass
Uint8List? plaintextContent,
Value<Uint8List?> pushData = const Value.absent(),
Value<Uint8List?> encryptedHash = const Value.absent(),
int? retryCount,
Value<DateTime?> lastRetry = const Value.absent(),
Value<DateTime?> acknowledgeByServerAt = const Value.absent()}) =>
MessageRetransmission(
retransmissionId: retransmissionId ?? this.retransmissionId,
@ -4188,6 +4236,8 @@ class MessageRetransmission extends DataClass
pushData: pushData.present ? pushData.value : this.pushData,
encryptedHash:
encryptedHash.present ? encryptedHash.value : this.encryptedHash,
retryCount: retryCount ?? this.retryCount,
lastRetry: lastRetry.present ? lastRetry.value : this.lastRetry,
acknowledgeByServerAt: acknowledgeByServerAt.present
? acknowledgeByServerAt.value
: this.acknowledgeByServerAt,
@ -4207,6 +4257,9 @@ class MessageRetransmission extends DataClass
encryptedHash: data.encryptedHash.present
? data.encryptedHash.value
: this.encryptedHash,
retryCount:
data.retryCount.present ? data.retryCount.value : this.retryCount,
lastRetry: data.lastRetry.present ? data.lastRetry.value : this.lastRetry,
acknowledgeByServerAt: data.acknowledgeByServerAt.present
? data.acknowledgeByServerAt.value
: this.acknowledgeByServerAt,
@ -4222,6 +4275,8 @@ class MessageRetransmission extends DataClass
..write('plaintextContent: $plaintextContent, ')
..write('pushData: $pushData, ')
..write('encryptedHash: $encryptedHash, ')
..write('retryCount: $retryCount, ')
..write('lastRetry: $lastRetry, ')
..write('acknowledgeByServerAt: $acknowledgeByServerAt')
..write(')'))
.toString();
@ -4235,6 +4290,8 @@ class MessageRetransmission extends DataClass
$driftBlobEquality.hash(plaintextContent),
$driftBlobEquality.hash(pushData),
$driftBlobEquality.hash(encryptedHash),
retryCount,
lastRetry,
acknowledgeByServerAt);
@override
bool operator ==(Object other) =>
@ -4247,6 +4304,8 @@ class MessageRetransmission extends DataClass
other.plaintextContent, this.plaintextContent) &&
$driftBlobEquality.equals(other.pushData, this.pushData) &&
$driftBlobEquality.equals(other.encryptedHash, this.encryptedHash) &&
other.retryCount == this.retryCount &&
other.lastRetry == this.lastRetry &&
other.acknowledgeByServerAt == this.acknowledgeByServerAt);
}
@ -4258,6 +4317,8 @@ class MessageRetransmissionsCompanion
final Value<Uint8List> plaintextContent;
final Value<Uint8List?> pushData;
final Value<Uint8List?> encryptedHash;
final Value<int> retryCount;
final Value<DateTime?> lastRetry;
final Value<DateTime?> acknowledgeByServerAt;
const MessageRetransmissionsCompanion({
this.retransmissionId = const Value.absent(),
@ -4266,6 +4327,8 @@ class MessageRetransmissionsCompanion
this.plaintextContent = const Value.absent(),
this.pushData = const Value.absent(),
this.encryptedHash = const Value.absent(),
this.retryCount = const Value.absent(),
this.lastRetry = const Value.absent(),
this.acknowledgeByServerAt = const Value.absent(),
});
MessageRetransmissionsCompanion.insert({
@ -4275,6 +4338,8 @@ class MessageRetransmissionsCompanion
required Uint8List plaintextContent,
this.pushData = const Value.absent(),
this.encryptedHash = const Value.absent(),
this.retryCount = const Value.absent(),
this.lastRetry = const Value.absent(),
this.acknowledgeByServerAt = const Value.absent(),
}) : contactId = Value(contactId),
plaintextContent = Value(plaintextContent);
@ -4285,6 +4350,8 @@ class MessageRetransmissionsCompanion
Expression<Uint8List>? plaintextContent,
Expression<Uint8List>? pushData,
Expression<Uint8List>? encryptedHash,
Expression<int>? retryCount,
Expression<DateTime>? lastRetry,
Expression<DateTime>? acknowledgeByServerAt,
}) {
return RawValuesInsertable({
@ -4294,6 +4361,8 @@ class MessageRetransmissionsCompanion
if (plaintextContent != null) 'plaintext_content': plaintextContent,
if (pushData != null) 'push_data': pushData,
if (encryptedHash != null) 'encrypted_hash': encryptedHash,
if (retryCount != null) 'retry_count': retryCount,
if (lastRetry != null) 'last_retry': lastRetry,
if (acknowledgeByServerAt != null)
'acknowledge_by_server_at': acknowledgeByServerAt,
});
@ -4306,6 +4375,8 @@ class MessageRetransmissionsCompanion
Value<Uint8List>? plaintextContent,
Value<Uint8List?>? pushData,
Value<Uint8List?>? encryptedHash,
Value<int>? retryCount,
Value<DateTime?>? lastRetry,
Value<DateTime?>? acknowledgeByServerAt}) {
return MessageRetransmissionsCompanion(
retransmissionId: retransmissionId ?? this.retransmissionId,
@ -4314,6 +4385,8 @@ class MessageRetransmissionsCompanion
plaintextContent: plaintextContent ?? this.plaintextContent,
pushData: pushData ?? this.pushData,
encryptedHash: encryptedHash ?? this.encryptedHash,
retryCount: retryCount ?? this.retryCount,
lastRetry: lastRetry ?? this.lastRetry,
acknowledgeByServerAt:
acknowledgeByServerAt ?? this.acknowledgeByServerAt,
);
@ -4340,6 +4413,12 @@ class MessageRetransmissionsCompanion
if (encryptedHash.present) {
map['encrypted_hash'] = Variable<Uint8List>(encryptedHash.value);
}
if (retryCount.present) {
map['retry_count'] = Variable<int>(retryCount.value);
}
if (lastRetry.present) {
map['last_retry'] = Variable<DateTime>(lastRetry.value);
}
if (acknowledgeByServerAt.present) {
map['acknowledge_by_server_at'] =
Variable<DateTime>(acknowledgeByServerAt.value);
@ -4356,6 +4435,8 @@ class MessageRetransmissionsCompanion
..write('plaintextContent: $plaintextContent, ')
..write('pushData: $pushData, ')
..write('encryptedHash: $encryptedHash, ')
..write('retryCount: $retryCount, ')
..write('lastRetry: $lastRetry, ')
..write('acknowledgeByServerAt: $acknowledgeByServerAt')
..write(')'))
.toString();
@ -6752,6 +6833,8 @@ typedef $$MessageRetransmissionsTableCreateCompanionBuilder
required Uint8List plaintextContent,
Value<Uint8List?> pushData,
Value<Uint8List?> encryptedHash,
Value<int> retryCount,
Value<DateTime?> lastRetry,
Value<DateTime?> acknowledgeByServerAt,
});
typedef $$MessageRetransmissionsTableUpdateCompanionBuilder
@ -6762,6 +6845,8 @@ typedef $$MessageRetransmissionsTableUpdateCompanionBuilder
Value<Uint8List> plaintextContent,
Value<Uint8List?> pushData,
Value<Uint8List?> encryptedHash,
Value<int> retryCount,
Value<DateTime?> lastRetry,
Value<DateTime?> acknowledgeByServerAt,
});
@ -6824,6 +6909,12 @@ class $$MessageRetransmissionsTableFilterComposer
ColumnFilters<Uint8List> get encryptedHash => $composableBuilder(
column: $table.encryptedHash, builder: (column) => ColumnFilters(column));
ColumnFilters<int> get retryCount => $composableBuilder(
column: $table.retryCount, builder: (column) => ColumnFilters(column));
ColumnFilters<DateTime> get lastRetry => $composableBuilder(
column: $table.lastRetry, builder: (column) => ColumnFilters(column));
ColumnFilters<DateTime> get acknowledgeByServerAt => $composableBuilder(
column: $table.acknowledgeByServerAt,
builder: (column) => ColumnFilters(column));
@ -6893,6 +6984,12 @@ class $$MessageRetransmissionsTableOrderingComposer
column: $table.encryptedHash,
builder: (column) => ColumnOrderings(column));
ColumnOrderings<int> get retryCount => $composableBuilder(
column: $table.retryCount, builder: (column) => ColumnOrderings(column));
ColumnOrderings<DateTime> get lastRetry => $composableBuilder(
column: $table.lastRetry, builder: (column) => ColumnOrderings(column));
ColumnOrderings<DateTime> get acknowledgeByServerAt => $composableBuilder(
column: $table.acknowledgeByServerAt,
builder: (column) => ColumnOrderings(column));
@ -6959,6 +7056,12 @@ class $$MessageRetransmissionsTableAnnotationComposer
GeneratedColumn<Uint8List> get encryptedHash => $composableBuilder(
column: $table.encryptedHash, builder: (column) => column);
GeneratedColumn<int> get retryCount => $composableBuilder(
column: $table.retryCount, builder: (column) => column);
GeneratedColumn<DateTime> get lastRetry =>
$composableBuilder(column: $table.lastRetry, builder: (column) => column);
GeneratedColumn<DateTime> get acknowledgeByServerAt => $composableBuilder(
column: $table.acknowledgeByServerAt, builder: (column) => column);
@ -7036,6 +7139,8 @@ class $$MessageRetransmissionsTableTableManager extends RootTableManager<
Value<Uint8List> plaintextContent = const Value.absent(),
Value<Uint8List?> pushData = const Value.absent(),
Value<Uint8List?> encryptedHash = const Value.absent(),
Value<int> retryCount = const Value.absent(),
Value<DateTime?> lastRetry = const Value.absent(),
Value<DateTime?> acknowledgeByServerAt = const Value.absent(),
}) =>
MessageRetransmissionsCompanion(
@ -7045,6 +7150,8 @@ class $$MessageRetransmissionsTableTableManager extends RootTableManager<
plaintextContent: plaintextContent,
pushData: pushData,
encryptedHash: encryptedHash,
retryCount: retryCount,
lastRetry: lastRetry,
acknowledgeByServerAt: acknowledgeByServerAt,
),
createCompanionCallback: ({
@ -7054,6 +7161,8 @@ class $$MessageRetransmissionsTableTableManager extends RootTableManager<
required Uint8List plaintextContent,
Value<Uint8List?> pushData = const Value.absent(),
Value<Uint8List?> encryptedHash = const Value.absent(),
Value<int> retryCount = const Value.absent(),
Value<DateTime?> lastRetry = const Value.absent(),
Value<DateTime?> acknowledgeByServerAt = const Value.absent(),
}) =>
MessageRetransmissionsCompanion.insert(
@ -7063,6 +7172,8 @@ class $$MessageRetransmissionsTableTableManager extends RootTableManager<
plaintextContent: plaintextContent,
pushData: pushData,
encryptedHash: encryptedHash,
retryCount: retryCount,
lastRetry: lastRetry,
acknowledgeByServerAt: acknowledgeByServerAt,
),
withReferenceMapper: (p0) => p0

255
lib/src/database/twonly_database.steps.dart
View file

@ -3713,6 +3713,253 @@ final class Schema16 extends i0.VersionedSchema {
alias: null);
}
final class Schema17 extends i0.VersionedSchema {
Schema17({required super.database}) : super(version: 17);
@override
late final List<i1.DatabaseSchemaEntity> entities = [
contacts,
messages,
mediaUploads,
signalIdentityKeyStores,
signalPreKeyStores,
signalSenderKeyStores,
signalSessionStores,
signalContactPreKeys,
signalContactSignedPreKeys,
messageRetransmissions,
];
late final Shape13 contacts = Shape13(
source: i0.VersionedTable(
entityName: 'contacts',
withoutRowId: false,
isStrict: false,
tableConstraints: [
'PRIMARY KEY(user_id)',
],
columns: [
_column_0,
_column_1,
_column_2,
_column_3,
_column_4,
_column_5,
_column_6,
_column_7,
_column_8,
_column_9,
_column_39,
_column_53,
_column_57,
_column_54,
_column_40,
_column_10,
_column_11,
_column_12,
_column_13,
_column_14,
_column_55,
_column_15,
_column_16,
],
attachedDatabase: database,
),
alias: null);
late final Shape19 messages = Shape19(
source: i0.VersionedTable(
entityName: 'messages',
withoutRowId: false,
isStrict: false,
tableConstraints: [],
columns: [
_column_17,
_column_18,
_column_19,
_column_48,
_column_49,
_column_20,
_column_21,
_column_22,
_column_52,
_column_23,
_column_24,
_column_25,
_column_70,
_column_26,
_column_27,
_column_28,
_column_29,
_column_30,
],
attachedDatabase: database,
),
alias: null);
late final Shape20 mediaUploads = Shape20(
source: i0.VersionedTable(
entityName: 'media_uploads',
withoutRowId: false,
isStrict: false,
tableConstraints: [],
columns: [
_column_41,
_column_42,
_column_56,
_column_44,
_column_45,
],
attachedDatabase: database,
),
alias: null);
late final Shape2 signalIdentityKeyStores = Shape2(
source: i0.VersionedTable(
entityName: 'signal_identity_key_stores',
withoutRowId: false,
isStrict: false,
tableConstraints: [
'PRIMARY KEY(device_id, name)',
],
columns: [
_column_31,
_column_32,
_column_33,
_column_10,
],
attachedDatabase: database,
),
alias: null);
late final Shape3 signalPreKeyStores = Shape3(
source: i0.VersionedTable(
entityName: 'signal_pre_key_stores',
withoutRowId: false,
isStrict: false,
tableConstraints: [
'PRIMARY KEY(pre_key_id)',
],
columns: [
_column_34,
_column_35,
_column_10,
],
attachedDatabase: database,
),
alias: null);
late final Shape4 signalSenderKeyStores = Shape4(
source: i0.VersionedTable(
entityName: 'signal_sender_key_stores',
withoutRowId: false,
isStrict: false,
tableConstraints: [
'PRIMARY KEY(sender_key_name)',
],
columns: [
_column_36,
_column_37,
],
attachedDatabase: database,
),
alias: null);
late final Shape5 signalSessionStores = Shape5(
source: i0.VersionedTable(
entityName: 'signal_session_stores',
withoutRowId: false,
isStrict: false,
tableConstraints: [
'PRIMARY KEY(device_id, name)',
],
columns: [
_column_31,
_column_32,
_column_38,
_column_10,
],
attachedDatabase: database,
),
alias: null);
late final Shape14 signalContactPreKeys = Shape14(
source: i0.VersionedTable(
entityName: 'signal_contact_pre_keys',
withoutRowId: false,
isStrict: false,
tableConstraints: [
'PRIMARY KEY(contact_id, pre_key_id)',
],
columns: [
_column_58,
_column_34,
_column_35,
_column_10,
],
attachedDatabase: database,
),
alias: null);
late final Shape15 signalContactSignedPreKeys = Shape15(
source: i0.VersionedTable(
entityName: 'signal_contact_signed_pre_keys',
withoutRowId: false,
isStrict: false,
tableConstraints: [
'PRIMARY KEY(contact_id)',
],
columns: [
_column_58,
_column_59,
_column_60,
_column_61,
_column_10,
],
attachedDatabase: database,
),
alias: null);
late final Shape21 messageRetransmissions = Shape21(
source: i0.VersionedTable(
entityName: 'message_retransmissions',
withoutRowId: false,
isStrict: false,
tableConstraints: [],
columns: [
_column_62,
_column_63,
_column_64,
_column_65,
_column_66,
_column_69,
_column_71,
_column_72,
_column_67,
],
attachedDatabase: database,
),
alias: null);
}
class Shape21 extends i0.VersionedTable {
Shape21({required super.source, required super.alias}) : super.aliased();
i1.GeneratedColumn<int> get retransmissionId =>
columnsByName['retransmission_id']! as i1.GeneratedColumn<int>;
i1.GeneratedColumn<int> get contactId =>
columnsByName['contact_id']! as i1.GeneratedColumn<int>;
i1.GeneratedColumn<int> get messageId =>
columnsByName['message_id']! as i1.GeneratedColumn<int>;
i1.GeneratedColumn<i2.Uint8List> get plaintextContent =>
columnsByName['plaintext_content']! as i1.GeneratedColumn<i2.Uint8List>;
i1.GeneratedColumn<i2.Uint8List> get pushData =>
columnsByName['push_data']! as i1.GeneratedColumn<i2.Uint8List>;
i1.GeneratedColumn<i2.Uint8List> get encryptedHash =>
columnsByName['encrypted_hash']! as i1.GeneratedColumn<i2.Uint8List>;
i1.GeneratedColumn<int> get retryCount =>
columnsByName['retry_count']! as i1.GeneratedColumn<int>;
i1.GeneratedColumn<DateTime> get lastRetry =>
columnsByName['last_retry']! as i1.GeneratedColumn<DateTime>;
i1.GeneratedColumn<DateTime> get acknowledgeByServerAt =>
columnsByName['acknowledge_by_server_at']!
as i1.GeneratedColumn<DateTime>;
}
i1.GeneratedColumn<int> _column_71(String aliasedName) =>
i1.GeneratedColumn<int>('retry_count', aliasedName, false,
type: i1.DriftSqlType.int, defaultValue: const CustomExpression('0'));
i1.GeneratedColumn<DateTime> _column_72(String aliasedName) =>
i1.GeneratedColumn<DateTime>('last_retry', aliasedName, true,
type: i1.DriftSqlType.dateTime);
i0.MigrationStepWithVersion migrationSteps({
required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@ -3729,6 +3976,7 @@ i0.MigrationStepWithVersion migrationSteps({
required Future<void> Function(i1.Migrator m, Schema14 schema) from13To14,
required Future<void> Function(i1.Migrator m, Schema15 schema) from14To15,
required Future<void> Function(i1.Migrator m, Schema16 schema) from15To16,
required Future<void> Function(i1.Migrator m, Schema17 schema) from16To17,
}) {
return (currentVersion, database) async {
switch (currentVersion) {
@ -3807,6 +4055,11 @@ i0.MigrationStepWithVersion migrationSteps({
final migrator = i1.Migrator(database, schema);
await from15To16(migrator, schema);
return 16;
case 16:
final schema = Schema17(database: database);
final migrator = i1.Migrator(database, schema);
await from16To17(migrator, schema);
return 17;
default:
throw ArgumentError.value('Unknown migration from $currentVersion');
}
@ -3829,6 +4082,7 @@ i1.OnUpgrade stepByStep({
required Future<void> Function(i1.Migrator m, Schema14 schema) from13To14,
required Future<void> Function(i1.Migrator m, Schema15 schema) from14To15,
required Future<void> Function(i1.Migrator m, Schema16 schema) from15To16,
required Future<void> Function(i1.Migrator m, Schema17 schema) from16To17,
}) =>
i0.VersionedSchema.stepByStepHelper(
step: migrationSteps(
@ -3847,4 +4101,5 @@ i1.OnUpgrade stepByStep({
from13To14: from13To14,
from14To15: from14To15,
from15To16: from15To16,
from16To17: from16To17,
));

17
lib/src/model/json/message.dart
View file

@ -65,7 +65,9 @@ class MessageJson {
messageSenderId: (json['messageSenderId'] as num?)?.toInt(),
retransId: (json['retransId'] as num?)?.toInt(),
content: MessageContent.fromJson(
kind, json['content'] as Map<String, dynamic>),
kind,
json['content'] as Map<String, dynamic>,
),
timestamp: DateTime.fromMillisecondsSinceEpoch(json['timestamp'] as int),
);
}
@ -191,7 +193,8 @@ class TextMessageContent extends MessageContent {
: null,
responseToMessageId: json.containsKey('responseToMessageId')
? json['responseToMessageId'] as int?
: null);
: null,
);
}
@override
@ -297,10 +300,11 @@ class PushKeyContent extends MessageContent {
}
class FlameSyncContent extends MessageContent {
FlameSyncContent(
{required this.flameCounter,
FlameSyncContent({
required this.flameCounter,
required this.bestFriend,
required this.lastFlameCounterChange});
required this.lastFlameCounterChange,
});
int flameCounter;
DateTime lastFlameCounterChange;
bool bestFriend;
@ -310,7 +314,8 @@ class FlameSyncContent extends MessageContent {
flameCounter: json['flameCounter'] as int,
bestFriend: json['bestFriend'] as bool,
lastFlameCounterChange: DateTime.fromMillisecondsSinceEpoch(
json['lastFlameCounterChange'] as int),
json['lastFlameCounterChange'] as int,
),
);
}

3
lib/src/model/json/userdata.dart
View file

@ -29,6 +29,9 @@ class UserData {
@JsonKey(defaultValue: 0)
int avatarCounter = 0;
@JsonKey(defaultValue: false)
bool isDeveloper = false;
@JsonKey(defaultValue: 0)
int deviceId = 0;

2
lib/src/model/json/userdata.g.dart
View file

@ -16,6 +16,7 @@ UserData _$UserDataFromJson(Map<String, dynamic> json) => UserData(
..avatarSvg = json['avatarSvg'] as String?
..avatarJson = json['avatarJson'] as String?
..avatarCounter = (json['avatarCounter'] as num?)?.toInt() ?? 0
..isDeveloper = json['isDeveloper'] as bool? ?? false
..deviceId = (json['deviceId'] as num?)?.toInt() ?? 0
..lastImageSend = json['lastImageSend'] == null
? null
@ -79,6 +80,7 @@ Map<String, dynamic> _$UserDataToJson(UserData instance) => <String, dynamic>{
'avatarSvg': instance.avatarSvg,
'avatarJson': instance.avatarJson,
'avatarCounter': instance.avatarCounter,
'isDeveloper': instance.isDeveloper,
'deviceId': instance.deviceId,
'subscriptionPlan': instance.subscriptionPlan,
'lastImageSend': instance.lastImageSend?.toIso8601String(),

7
lib/src/model/memory_item.model.dart
View file

@ -67,7 +67,8 @@ class MemoryItem {
var mirrorVideo = false;
if (videoPath != null) {
final content = MediaMessageContent.fromJson(
jsonDecode(message.contentJson!) as Map);
jsonDecode(message.contentJson!) as Map,
);
mirrorVideo = content.mirrorVideo;
}
@ -81,7 +82,9 @@ class MemoryItem {
mirrorVideo: mirrorVideo,
thumbnailPath: thumbnailFile,
imagePath: imagePath,
videoPath: videoPath))
videoPath: videoPath,
),
)
.messages
.add(message);
}

41
lib/src/services/api.service.dart
View file

@ -119,9 +119,10 @@ class ApiService {
Future<void> startReconnectionTimer() async {
reconnectionTimer?.cancel();
reconnectionTimer ??= Timer(Duration(seconds: _reconnectionDelay), () {
reconnectionTimer ??=
Timer(Duration(seconds: _reconnectionDelay), () async {
reconnectionTimer = null;
connect(force: true);
await connect(force: true);
});
_reconnectionDelay += 5;
}
@ -143,9 +144,9 @@ class ApiService {
}
connectivitySubscription = Connectivity()
.onConnectivityChanged
.listen((List<ConnectivityResult> result) {
.listen((List<ConnectivityResult> result) async {
if (!result.contains(ConnectivityResult.none)) {
connect(force: true);
await connect(force: true);
}
// Received changes in available connectivity types!
});
@ -186,14 +187,14 @@ class ApiService {
bool get isConnected => _channel != null && _channel!.closeCode != null;
void _onDone() {
Future<void> _onDone() async {
Log.info('websocket closed without error');
onClosed();
await onClosed();
}
void _onError(dynamic e) {
Future<void> _onError(dynamic e) async {
Log.error('websocket error: $e');
onClosed();
await onClosed();
}
Future<void> _onData(dynamic msgBuffer) async {
@ -338,14 +339,20 @@ class ApiService {
}
if (res.error == ErrorCode.UserIdNotFound && contactId != null) {
Log.error('Contact deleted their account $contactId.');
final contact = await twonlyDB.contactsDao
.getContactByUserId(contactId)
.getSingleOrNull();
if (contact != null) {
await twonlyDB.contactsDao.updateContact(
contactId,
const ContactsCompanion(
deleted: Value(true),
ContactsCompanion(
deleted: const Value(true),
username: Value('${contact.username} (${contact.userId})'),
),
);
}
}
}
return res;
}
@ -441,7 +448,9 @@ class ApiService {
const storage = FlutterSecureStorage();
await storage.write(
key: SecureStorageKeys.apiAuthToken, value: apiAuthTokenB64);
key: SecureStorageKeys.apiAuthToken,
value: apiAuthTokenB64,
);
await tryAuthenticateWithToken(userData.userId);
}
@ -575,7 +584,10 @@ class ApiService {
}
Future<Result> switchToPayedPlan(
String planId, bool payMonthly, bool autoRenewal) async {
String planId,
bool payMonthly,
bool autoRenewal,
) async {
final get = ApplicationData_SwitchToPayedPlan()
..planId = planId
..payMonthly = payMonthly
@ -676,7 +688,10 @@ class ApiService {
}
Future<Result> sendTextMessage(
int target, Uint8List msg, List<int>? pushData) async {
int target,
Uint8List msg,
List<int>? pushData,
) async {
final testMessage = ApplicationData_TextMessage()
..userId = Int64(target)
..body = msg;

18
lib/src/services/api/media_download.dart
View file

@ -40,8 +40,8 @@ Map<String, List<String>> defaultAutoDownloadOptions = {
ConnectivityResult.mobile.name: [],
ConnectivityResult.wifi.name: [
DownloadMediaTypes.video.name,
DownloadMediaTypes.image.name
]
DownloadMediaTypes.image.name,
],
};
Future<bool> isAllowedToDownload(bool isVideo) async {
@ -121,7 +121,8 @@ Mutex protectDownload = Mutex();
Future<void> startDownloadMedia(Message message, bool force) async {
Log.info(
'Download blocked for ${message.messageId} because of network state.');
'Download blocked for ${message.messageId} because of network state.',
);
if (message.contentJson == null) {
Log.error('Content of ${message.messageId} not found.');
await handleMediaError(message);
@ -147,7 +148,8 @@ Future<void> startDownloadMedia(Message message, bool force) async {
if (!force && !await isAllowedToDownload(content.isVideo)) {
Log.warn(
'Download blocked for ${message.messageId} because of network state.');
'Download blocked for ${message.messageId} because of network state.',
);
return;
}
@ -160,7 +162,8 @@ Future<void> startDownloadMedia(Message message, bool force) async {
if (msg.downloadState != DownloadState.pending) {
Log.error(
'${message.messageId} is already downloaded or is downloading.');
'${message.messageId} is already downloaded or is downloading.',
);
return true;
}
@ -317,7 +320,8 @@ Future<void> handleEncryptedFile(int messageId) async {
await writeMediaFile(msg.messageId, 'png', imageBytes);
} catch (e) {
Log.error(
'could not decrypt the media file in the second try. reporting error to user: $e');
'could not decrypt the media file in the second try. reporting error to user: $e',
);
await handleMediaError(msg);
return;
}
@ -461,7 +465,7 @@ Future<void> purgeMediaFiles(Directory directory) async {
if ((message == null) ||
(message.openedAt != null &&
!message.mediaStored &&
message.acknowledgeByServer == true) ||
message.acknowledgeByServer) ||
message.errorWhileSending) {
file.deleteSync();
}

60
lib/src/services/api/media_upload.dart
View file

@ -75,16 +75,19 @@ Future<void> initFileDownloader() async {
}
case TaskProgressUpdate():
Log.info(
'Progress update for ${update.task} with progress ${update.progress}');
'Progress update for ${update.task} with progress ${update.progress}',
);
}
});
await FileDownloader().start();
try {
await FileDownloader().configure(androidConfig: [
(Config.bypassTLSCertificateValidation, kDebugMode),
]);
var androidConfig = [];
if (kDebugMode) {
androidConfig = [(Config.bypassTLSCertificateValidation, kDebugMode)];
}
await FileDownloader().configure(androidConfig: androidConfig);
} catch (e) {
Log.error(e);
}
@ -201,7 +204,9 @@ Future<bool> addVideoToUpload(int mediaUploadId, File videoFilePath) async {
}
Future<Uint8List> addOrModifyImageToUpload(
int mediaUploadId, Uint8List imageBytes) async {
int mediaUploadId,
Uint8List imageBytes,
) async {
Uint8List imageBytesCompressed;
final stopwatch = Stopwatch()..start();
@ -236,7 +241,8 @@ Future<Uint8List> addOrModifyImageToUpload(
stopwatch.stop();
Log.info(
'Compression the image took: ${stopwatch.elapsedMilliseconds} milliseconds');
'Compression the image took: ${stopwatch.elapsedMilliseconds} milliseconds',
);
Log.info('Raw images size in bytes: ${imageBytesCompressed.length}');
// stopwatch.reset();
@ -285,7 +291,6 @@ Future<void> encryptMediaFiles(
Future<bool>? videoHandler,
) async {
Log.info('$mediaUploadId encrypting files');
// ignore: cast_nullable_to_non_nullable
var dataToEncrypt = await imageHandler;
/// if there is a video wait until it is finished with compression
@ -332,8 +337,14 @@ Future<void> encryptMediaFiles(
unawaited(handleNextMediaUploadSteps(mediaUploadId));
}
Future<void> finalizeUpload(int mediaUploadId, List<int> contactIds,
bool isRealTwonly, bool isVideo, bool mirrorVideo, int maxShowTime) async {
Future<void> finalizeUpload(
int mediaUploadId,
List<int> contactIds,
bool isRealTwonly,
bool isVideo,
bool mirrorVideo,
int maxShowTime,
) async {
final metadata = MediaUploadMetadata()
..contactIds = contactIds
..isRealTwonly = isRealTwonly
@ -474,7 +485,8 @@ Future<void> handleUploadStatusUpdate(TaskStatusUpdate update) async {
}
}
Log.info(
'Status update for ${update.task.taskId} with status ${update.status}');
'Status update for ${update.task.taskId} with status ${update.status}',
);
}
Future<void> handleUploadSuccess(MediaUpload media) async {
@ -565,7 +577,8 @@ Future<void> handleMediaUpload(MediaUpload media) async {
if (contact == null || contact.deleted) {
Log.warn(
'Contact deleted ${message.contactId} or not found in database.');
'Contact deleted ${message.contactId} or not found in database.',
);
await twonlyDB.messagesDao.updateMessageByMessageId(
message.messageId,
const MessagesCompanion(errorWhileSending: Value(true)),
@ -708,11 +721,13 @@ Future<void> uploadFileFast(
);
requestMultipart.headers['x-twonly-auth-token'] = apiAuthToken;
requestMultipart.files.add(http.MultipartFile.fromBytes(
requestMultipart.files.add(
http.MultipartFile.fromBytes(
'file',
uploadRequestFile,
filename: 'upload',
));
),
);
final response = await requestMultipart.send();
if (response.statusCode == 200) {
@ -790,7 +805,10 @@ Future<Uint8List> readSendMediaFile(int mediaUploadId, String type) async {
}
Future<File> writeSendMediaFile(
int mediaUploadId, String type, Uint8List data) async {
int mediaUploadId,
String type,
Uint8List data,
) async {
final basePath = await getMediaFilePath(mediaUploadId, 'send');
final file = File('$basePath.$type');
await file.writeAsBytes(data);
@ -838,8 +856,11 @@ List<Uint8List> extractUint8Lists(Uint8List combinedList) {
final byteData = ByteData.sublistView(combinedList);
final sizeOfList1 = byteData.getInt32(0);
final list1 = Uint8List.view(combinedList.buffer, 4, sizeOfList1);
final list2 = Uint8List.view(combinedList.buffer, 4 + sizeOfList1,
combinedList.lengthInBytes - 4 - sizeOfList1);
final list2 = Uint8List.view(
combinedList.buffer,
4 + sizeOfList1,
combinedList.lengthInBytes - 4 - sizeOfList1,
);
return [list1, list2];
}
@ -853,9 +874,12 @@ String uint8ListToHex(List<int> bytes) {
return bytes.map((byte) => byte.toRadixString(16).padLeft(2, '0')).join();
}
Uint8List hexToUint8List(String hex) => Uint8List.fromList(List<int>.generate(
Uint8List hexToUint8List(String hex) => Uint8List.fromList(
List<int>.generate(
hex.length ~/ 2,
(i) => int.parse(hex.substring(i * 2, i * 2 + 2), radix: 16)));
(i) => int.parse(hex.substring(i * 2, i * 2 + 2), radix: 16),
),
);
Uint8List createDownloadToken() {
final random = Random();

14
lib/src/services/api/messages.dart
View file

@ -52,11 +52,13 @@ Future<void> sendRetransmitMessage(int retransId) async {
return;
}
final json = MessageJson.fromJson(jsonDecode(
final json = MessageJson.fromJson(
jsonDecode(
utf8.decode(
gzip.decode(retrans.plaintextContent),
),
) as Map<String, dynamic>);
) as Map<String, dynamic>,
);
Log.info('Retransmitting $retransId: ${json.kind} to ${retrans.contactId}');
@ -65,6 +67,8 @@ Future<void> sendRetransmitMessage(int retransId) async {
.getSingleOrNull();
if (contact == null || contact.deleted) {
Log.warn('Contact deleted $retransId or not found in database.');
await twonlyDB.messageRetransmissionDao
.deleteRetransmissionById(retransId);
if (retrans.messageId != null) {
await twonlyDB.messagesDao.updateMessageByMessageId(
retrans.messageId!,
@ -140,6 +144,8 @@ Future<void> sendRetransmitMessage(int retransId) async {
retransId,
MessageRetransmissionsCompanion(
acknowledgeByServerAt: Value(DateTime.now()),
retryCount: Value(retrans.retryCount + 1),
lastRetry: Value(DateTime.now()),
),
);
}
@ -185,7 +191,9 @@ Future<void> encryptAndSendMessageAsync(
await twonlyDB.messageRetransmissionDao.updateRetransmission(
retransId,
MessageRetransmissionsCompanion(
plaintextContent: Value(plaintextContent)));
plaintextContent: Value(plaintextContent),
),
);
// this can now be done in the background...
unawaited(sendRetransmitMessage(retransId));

114
lib/src/services/api/server_messages.dart
View file

@ -46,7 +46,7 @@ Future<void> handleServerMessage(server.ServerToClient msg) async {
final fromUserId = msg.v0.newMessage.fromUserId.toInt();
response = await handleNewMessage(fromUserId, body);
} else {
Log.error('Got a new message from the server: $msg');
Log.error('Got a unknown message from the server: $msg');
response = client.Response()..error = ErrorCode.InternalError;
}
} catch (e) {
@ -90,26 +90,10 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
return client.Response()..ok = ok;
}
client.Response? result;
Log.info('Got: ${message.kind} from $fromUserId');
if (messageGetsAck(message.kind) && message.retransId != null) {
Log.info('Sending ACK for ${message.kind}');
/// ACK every message
await encryptAndSendMessageAsync(
null,
fromUserId,
MessageJson(
kind: MessageKind.ack,
content: AckContent(
messageIdToAck: message.messageSenderId,
retransIdToAck: message.retransId!,
),
timestamp: DateTime.now(),
),
);
}
switch (message.kind) {
case MessageKind.ack:
final content = message.content;
@ -125,13 +109,13 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
update,
);
}
await twonlyDB.messageRetransmissionDao
.deleteRetransmissionById(content.retransIdToAck);
}
case MessageKind.signalDecryptError:
Log.error(
'Got signal decrypt error from other user! Sending all non ACK messages again.');
'Got signal decrypt error from other user! Sending it again.',
);
final content = message.content;
if (content is SignalDecryptErrorContent) {
@ -148,7 +132,7 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
}
case MessageKind.contactRequest:
return handleContactRequest(fromUserId, message);
await handleContactRequest(fromUserId, message);
case MessageKind.flameSync:
final contact = await twonlyDB.contactsDao
@ -164,7 +148,6 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
isToday(content.lastFlameCounterChange)) {
if (content.flameCounter > contact.flameCounter) {
updates = ContactsCompanion(
alsoBestFriend: Value(content.bestFriend),
flameCounter: Value(content.flameCounter),
);
}
@ -282,14 +265,49 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
// ignore: no_default_cases
default:
if (message.kind != MessageKind.textMessage &&
message.kind != MessageKind.media &&
message.kind != MessageKind.storedMediaFile &&
message.kind != MessageKind.reopenedMedia) {
Log.error('Got unknown MessageKind $message');
} else if (message.messageSenderId == null) {
if (message.messageSenderId == null) {
Log.error('Messageid not defined $message');
} else if ([
MessageKind.textMessage,
MessageKind.media,
MessageKind.storedMediaFile,
MessageKind.reopenedMedia,
].contains(message.kind)) {
result = await handleMediaOrTextMessage(fromUserId, message);
} else {
Log.error('Got unknown MessageKind $message');
}
}
if (messageGetsAck(message.kind) && message.retransId != null) {
Log.info('Sending ACK for ${message.kind}');
/// ACK every message
await encryptAndSendMessageAsync(
null,
fromUserId,
MessageJson(
kind: MessageKind.ack,
content: AckContent(
messageIdToAck: message.messageSenderId,
retransIdToAck: message.retransId!,
),
timestamp: DateTime.now(),
),
);
}
if (result != null) {
return result;
}
final ok = client.Response_Ok()..none = true;
return client.Response()..ok = ok;
}
Future<client.Response?> handleMediaOrTextMessage(
int fromUserId,
MessageJson message,
) async {
if (message.kind == MessageKind.storedMediaFile) {
if (message.messageReceiverId != null) {
/// stored media file just updates the message
@ -303,11 +321,12 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
);
final msg = await twonlyDB.messagesDao
.getMessageByIdAndContactId(
fromUserId, message.messageReceiverId!)
fromUserId,
message.messageReceiverId!,
)
.getSingleOrNull();
if (msg != null && msg.mediaUploadId != null) {
final filePath =
await getMediaFilePath(msg.mediaUploadId, 'send');
final filePath = await getMediaFilePath(msg.mediaUploadId, 'send');
if (filePath.contains('mp4')) {
unawaited(createThumbnailsForVideo(File(filePath)));
} else {
@ -329,7 +348,8 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
.deleteMessagesByMessageId(openedMessage.messageId);
} else {
Log.error(
'Got a duplicated message from other user: ${message.messageSenderId!}');
'Got a duplicated message from other user: ${message.messageSenderId!}',
);
final ok = client.Response_Ok()..none = true;
return client.Response()..ok = ok;
}
@ -351,8 +371,7 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
responseToMessageId = content.responseToMessageId;
responseToOtherMessageId = content.responseToOtherMessageId;
if (responseToMessageId != null ||
responseToOtherMessageId != null) {
if (responseToMessageId != null || responseToOtherMessageId != null) {
// reactions are shown in the notification directly...
if (isEmoji(content.text)) {
openedAt = DateTime.now();
@ -387,9 +406,11 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
responseToMessageId: Value(responseToMessageId),
responseToOtherMessageId: Value(responseToOtherMessageId),
openedAt: Value(openedAt),
downloadState: Value(message.kind == MessageKind.media
downloadState: Value(
message.kind == MessageKind.media
? DownloadState.pending
: DownloadState.downloaded),
: DownloadState.downloaded,
),
sendAt: Value(message.timestamp),
);
@ -429,10 +450,7 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
archived: Value(false),
),
);
}
}
final ok = client.Response_Ok()..none = true;
return client.Response()..ok = ok;
return null;
}
Future<client.Response> handleRequestNewPreKey() async {
@ -440,17 +458,21 @@ Future<client.Response> handleRequestNewPreKey() async {
final prekeysList = <client.Response_PreKey>[];
for (var i = 0; i < localPreKeys.length; i++) {
prekeysList.add(client.Response_PreKey()
prekeysList.add(
client.Response_PreKey()
..id = Int64(localPreKeys[i].id)
..prekey = localPreKeys[i].getKeyPair().publicKey.serialize());
..prekey = localPreKeys[i].getKeyPair().publicKey.serialize(),
);
}
final prekeys = client.Response_Prekeys(prekeys: prekeysList);
final ok = client.Response_Ok()..prekeys = prekeys;
return client.Response()..ok = ok;
}
Future<client.Response> handleContactRequest(
int fromUserId, MessageJson message) async {
Future<void> handleContactRequest(
int fromUserId,
MessageJson message,
) async {
// request the username by the server so an attacker can not
// forge the displayed username in the contact request
final username = await apiService.getUsername(fromUserId);
@ -465,6 +487,4 @@ Future<client.Response> handleContactRequest(
);
}
await setupNotificationWithUsers();
final ok = client.Response_Ok()..none = true;
return client.Response()..ok = ok;
}

3
lib/src/services/api/utils.dart
View file

@ -44,7 +44,8 @@ ClientToServer createClientToServerFromHandshake(Handshake handshake) {
}
ClientToServer createClientToServerFromApplicationData(
ApplicationData applicationData) {
ApplicationData applicationData,
) {
final v0 = client.V0()
..seq = Int64()
..applicationdata = applicationData;

2
lib/src/services/fcm.service.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: unreachable_from_main
import 'dart:io' show Platform;
import 'package:firebase_core/firebase_core.dart';

3
lib/src/services/flame.service.dart
View file

@ -27,7 +27,8 @@ Future<void> syncFlameCounters() async {
}
for (final contact in contacts) {
if (contact.lastFlameCounterChange == null) continue;
if (contact.lastFlameCounterChange == null || contact.deleted) continue;
if (!isToday(contact.lastFlameCounterChange!)) continue;
if (contact.lastFlameSync != null) {
if (isToday(contact.lastFlameSync!)) continue;
}

12
lib/src/services/notifications/background.notifications.dart
View file

@ -98,7 +98,9 @@ Future<void> handlePushData(String pushDataB64) async {
}
Future<PushNotification?> tryDecryptMessage(
List<int> key, EncryptedPushNotification push) async {
List<int> key,
EncryptedPushNotification push,
) async {
try {
final chacha20 = FlutterChacha20.poly1305Aead();
final secretKeyData = SecretKeyData(key);
@ -190,7 +192,9 @@ Future<void> showLocalPushNotificationWithoutUserId(
const darwinNotificationDetails = DarwinNotificationDetails();
const notificationDetails = NotificationDetails(
android: androidNotificationDetails, iOS: darwinNotificationDetails);
android: androidNotificationDetails,
iOS: darwinNotificationDetails,
);
await flutterLocalNotificationsPlugin.show(
2,
@ -307,7 +311,9 @@ String getPushNotificationText(PushNotification pushNotification) {
var contentText = pushNotificationText[pushNotification.kind.name] ?? '';
if (pushNotification.hasReactionContent()) {
contentText = contentText.replaceAll(
'{{reaction}}', pushNotification.reactionContent);
'{{reaction}}',
pushNotification.reactionContent,
);
}
return contentText;
}

33
lib/src/services/notifications/pushkeys.notifications.dart
View file

@ -18,8 +18,10 @@ import 'package:twonly/src/services/api/messages.dart';
import 'package:twonly/src/utils/log.dart';
/// This function must be called after the database is setup
Future<void> setupNotificationWithUsers(
{bool force = false, int? forceContact}) async {
Future<void> setupNotificationWithUsers({
bool force = false,
int? forceContact,
}) async {
var pushUsers = await getPushKeys(SecureStorageKeys.receivingPushKeys);
// HotFIX: Search for user with id 0 if not there remove all
@ -29,11 +31,13 @@ Future<void> setupNotificationWithUsers(
Log.info('Clearing push keys');
await setPushKeys(SecureStorageKeys.receivingPushKeys, []);
pushUsers = await getPushKeys(SecureStorageKeys.receivingPushKeys)
..add(PushUser(
..add(
PushUser(
userId: Int64(),
displayName: 'NoUser',
pushKeys: [],
));
),
);
}
var wasChanged = false;
@ -51,7 +55,8 @@ Future<void> setupNotificationWithUsers(
DateTime.now().subtract(Duration(days: 5 + random.nextInt(5)));
final lastKey = pushUser.pushKeys.last;
final createdAt = DateTime.fromMillisecondsSinceEpoch(
lastKey.createdAtUnixTimestamp.toInt());
lastKey.createdAtUnixTimestamp.toInt(),
);
if (force ||
(forceContact == contact.userId) ||
@ -82,12 +87,14 @@ Future<void> setupNotificationWithUsers(
createdAtUnixTimestamp: Int64(DateTime.now().millisecondsSinceEpoch),
);
await sendNewPushKey(contact.userId, pushKey);
pushUsers.add(PushUser(
pushUsers.add(
PushUser(
userId: Int64(contact.userId),
displayName: getContactDisplayName(contact),
blocked: contact.blocked,
pushKeys: [pushKey],
));
),
);
}
}
@ -119,13 +126,15 @@ Future<void> updatePushUser(Contact contact) async {
final pushUser = pushKeys.firstWhereOrNull((x) => x.userId == contact.userId);
if (pushUser == null) {
pushKeys.add(PushUser(
pushKeys.add(
PushUser(
userId: Int64(contact.userId),
displayName: getContactDisplayName(contact),
pushKeys: [],
blocked: contact.blocked,
lastMessageId: Int64(),
));
),
);
} else {
pushUser
..displayName = getContactDisplayName(contact)
@ -145,13 +154,15 @@ Future<void> handleNewPushKey(int fromUserId, my.PushKeyContent pushKey) async {
.getContactByUserId(fromUserId)
.getSingleOrNull();
if (contact == null) return;
pushKeys.add(PushUser(
pushKeys.add(
PushUser(
userId: Int64(fromUserId),
displayName: getContactDisplayName(contact),
pushKeys: [],
blocked: contact.blocked,
lastMessageId: Int64(),
));
),
);
pushUser = pushKeys.firstWhereOrNull((x) => x.userId == fromUserId);
}

5
lib/src/services/notifications/setup.notifications.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: unreachable_from_main
import 'dart:async';
import 'dart:io';
import 'dart:ui' as ui;
@ -18,7 +20,8 @@ void notificationTapBackground(NotificationResponse notificationResponse) {
if (notificationResponse.input?.isNotEmpty ?? false) {
// ignore: avoid_print
print(
'notification action tapped with input: ${notificationResponse.input}');
'notification action tapped with input: ${notificationResponse.input}',
);
}
}

14
lib/src/services/signal/encryption.signal.dart
View file

@ -15,7 +15,9 @@ import 'package:twonly/src/utils/misc.dart';
final lockingSignalEncryption = Mutex();
Future<Uint8List?> signalEncryptMessage(
int target, Uint8List plaintextContent) async {
int target,
Uint8List plaintextContent,
) async {
return lockingSignalEncryption.protect<Uint8List?>(() async {
try {
final signalStore = (await getSignalStore())!;
@ -95,7 +97,9 @@ Future<MessageJson?> signalDecryptMessage(int source, Uint8List msg) async {
final signalStore = (await getSignalStore())!;
final session = SessionCipher.fromStore(
signalStore, SignalProtocolAddress(source.toString(), defaultDeviceId));
signalStore,
SignalProtocolAddress(source.toString(), defaultDeviceId),
);
final msgs = removeLastXBytes(msg, 4);
if (msgs == null) {
@ -115,11 +119,13 @@ Future<MessageJson?> signalDecryptMessage(int source, Uint8List msg) async {
Log.error('Type not known: $type');
return null;
}
return MessageJson.fromJson(jsonDecode(
return MessageJson.fromJson(
jsonDecode(
utf8.decode(
gzip.decode(plaintext),
),
) as Map<String, dynamic>);
) as Map<String, dynamic>,
);
} catch (e) {
Log.error(e.toString());
return null;

6
lib/src/services/signal/prekeys.signal.dart
View file

@ -37,7 +37,8 @@ Future<void> requestNewPrekeysForContact(int contactId) async {
final otherKeys = await apiService.getPreKeysByUserId(contactId);
if (otherKeys != null) {
Log.info(
'got fresh ${otherKeys.preKeys.length} pre keys from other $contactId!');
'got fresh ${otherKeys.preKeys.length} pre keys from other $contactId!',
);
final preKeys = otherKeys.preKeys
.map(
(preKey) => SignalContactPreKeysCompanion(
@ -80,7 +81,8 @@ Future<void> requestNewSignedPreKeyForContact(int contactId) async {
signedPreKeySignature:
Value(Uint8List.fromList(signedPreKey.signedPrekeySignature)),
signedPreKeyId: Value(signedPreKey.signedPrekeyId.toInt()),
));
),
);
} else {
Log.error('could not load new signed pre key for user $contactId');
}

3
lib/src/services/signal/utils.signal.dart
View file

@ -8,7 +8,8 @@ Future<ConnectSignalProtocolStore?> getSignalStore() async {
}
Future<ConnectSignalProtocolStore> getSignalStoreFromIdentity(
SignalIdentity signalIdentity) async {
SignalIdentity signalIdentity,
) async {
final identityKeyPair =
IdentityKeyPair.fromSerialized(signalIdentity.identityKeyPairU8List);

11
lib/src/services/twonly_safe/create_backup.twonly_safe.dart
View file

@ -34,7 +34,7 @@ Future<void> performTwonlySafeBackup({bool force = false}) async {
}
final lastUpdateTime = user.twonlySafeBackup!.lastBackupDone;
if (force != true && lastUpdateTime != null) {
if (!force && lastUpdateTime != null) {
if (lastUpdateTime
.isAfter(DateTime.now().subtract(const Duration(days: 1)))) {
return;
@ -163,7 +163,8 @@ Future<void> performTwonlySafeBackup({bool force = false}) async {
await encryptedBackupBytesFile.writeAsBytes(encryptedBackupBytes);
Log.info(
'Create twonly Safe backup with a size of ${encryptedBackupBytes.length} bytes.');
'Create twonly Safe backup with a size of ${encryptedBackupBytes.length} bytes.',
);
if (user.backupServer != null) {
if (encryptedBackupBytes.length > user.backupServer!.maxBackupBytes) {
@ -205,7 +206,8 @@ Future<void> handleBackupStatusUpdate(TaskStatusUpdate update) async {
if (update.status == TaskStatus.failed ||
update.status == TaskStatus.canceled) {
Log.error(
'twonly Safe upload failed. ${update.responseStatusCode} ${update.responseBody} ${update.responseHeaders} ${update.exception}');
'twonly Safe upload failed. ${update.responseStatusCode} ${update.responseBody} ${update.responseHeaders} ${update.exception}',
);
await updateUserdata((user) {
if (user.twonlySafeBackup != null) {
user.twonlySafeBackup!.backupUploadState = LastBackupUploadState.failed;
@ -214,7 +216,8 @@ Future<void> handleBackupStatusUpdate(TaskStatusUpdate update) async {
});
} else if (update.status == TaskStatus.complete) {
Log.error(
'twonly Safe uploaded with status code ${update.responseStatusCode}');
'twonly Safe uploaded with status code ${update.responseStatusCode}',
);
await updateUserdata((user) {
if (user.twonlySafeBackup != null) {
user.twonlySafeBackup!.backupUploadState =

19
lib/src/services/twonly_safe/restore.twonly_safe.dart
View file

@ -37,9 +37,12 @@ Future<void> recoverTwonlySafe(
late http.Response response;
try {
response = await http.get(Uri.parse(backupServerUrl), headers: {
response = await http.get(
Uri.parse(backupServerUrl),
headers: {
HttpHeaders.acceptHeader: 'application/octet-stream',
});
},
);
} catch (e) {
Log.error('Error fetching backup: $e');
throw Exception('Backup server could not be reached. ($e)');
@ -110,7 +113,8 @@ Future<void> handleBackupData(
// for each day add 400 message ids
final dummyMessagesCounter = (lastMessageSend + 1) * 400;
Log.info(
'Creating $dummyMessagesCounter dummy messages to increase message counter as last message was $lastMessageSend days ago.');
'Creating $dummyMessagesCounter dummy messages to increase message counter as last message was $lastMessageSend days ago.',
);
for (var i = 0; i < dummyMessagesCounter; i++) {
await database.messagesDao.insertMessage(
MessagesCompanion(
@ -130,13 +134,16 @@ Future<void> handleBackupData(
await storage.write(
key: SecureStorageKeys.signalIdentity,
value: secureStorage[SecureStorageKeys.signalIdentity] as String);
value: secureStorage[SecureStorageKeys.signalIdentity] as String,
);
await storage.write(
key: SecureStorageKeys.signalSignedPreKey,
value: secureStorage[SecureStorageKeys.signalSignedPreKey] as String);
value: secureStorage[SecureStorageKeys.signalSignedPreKey] as String,
);
await storage.write(
key: SecureStorageKeys.userData,
value: secureStorage[SecureStorageKeys.userData] as String);
value: secureStorage[SecureStorageKeys.userData] as String,
);
await updateUserdata((u) {
u.deviceId += 1;
return u;

3
lib/src/utils/log.dart
View file

@ -11,7 +11,8 @@ void initLogger() {
await _writeLogToFile(record);
if (kDebugMode) {
print(
'${record.level.name} [twonly] ${record.loggerName} > ${record.message}');
'${record.level.name} [twonly] ${record.loggerName} > ${record.message}',
);
}
});
}

183
lib/src/utils/misc.dart
View file

@ -1,7 +1,6 @@
import 'dart:convert';
import 'dart:math';
import 'package:drift/drift.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -10,8 +9,6 @@ import 'package:gal/gal.dart';
import 'package:intl/intl.dart';
import 'package:local_auth/local_auth.dart';
import 'package:provider/provider.dart';
import 'package:twonly/globals.dart';
import 'package:twonly/src/database/tables/messages_table.dart';
import 'package:twonly/src/database/twonly_database.dart';
import 'package:twonly/src/localization/generated/app_localizations.dart';
import 'package:twonly/src/model/json/message.dart';
@ -133,18 +130,20 @@ Future<Uint8List?> getCompressedImage(Uint8List imageBytes) async {
return result;
}
Future<bool> authenticateUser(String localizedReason,
{bool force = true}) async {
Future<bool> authenticateUser(
String localizedReason, {
bool force = true,
}) async {
try {
final auth = LocalAuthentication();
final didAuthenticate = await auth.authenticate(
localizedReason: localizedReason,
options: const AuthenticationOptions(useErrorDialogs: false));
);
if (didAuthenticate) {
return true;
}
} on PlatformException catch (e) {
debugPrint(e.toString());
} on LocalAuthException catch (e) {
Log.error(e.toString());
if (!force) {
return true;
}
@ -218,171 +217,6 @@ String truncateString(String input, {int maxLength = 20}) {
return input;
}
Future<void> insertDemoContacts() async {
final commonUsernames = <String>[
'James',
'Mary',
'John',
'Patricia',
'Robert',
'Jennifer',
'Michael',
'Linda',
'William',
'Elizabeth',
'David',
'Barbara',
'Richard',
'Susan',
'Joseph',
'Jessica',
'Charles',
'Sarah',
'Thomas',
'Karen',
];
final contactConfigs = <Map<String, dynamic>>[
{'count': 3, 'requested': true},
{'count': 4, 'requested': false, 'accepted': true},
{'count': 1, 'accepted': true, 'blocked': true},
{'count': 1, 'accepted': true, 'archived': true},
{'count': 2, 'accepted': true, 'pinned': true},
{'count': 1, 'requested': false},
];
var counter = 0;
for (final config in contactConfigs) {
for (var i = 0; i < (config['count'] as int); i++) {
if (counter >= commonUsernames.length) {
break;
}
final username = commonUsernames[counter];
final userId = Random().nextInt(1000000);
await twonlyDB.contactsDao.insertContact(
ContactsCompanion(
username: Value(username),
userId: Value(userId),
requested: Value(config['requested'] as bool? ?? false),
accepted: Value(config['accepted'] as bool? ?? false),
blocked: Value(config['blocked'] as bool? ?? false),
archived: Value(config['archived'] as bool? ?? false),
pinned: Value(config['pinned'] as bool? ?? false),
),
);
if (config['accepted'] as bool? ?? false) {
for (var i = 0; i < 20; i++) {
final chatId = Random().nextInt(chatMessages.length);
await twonlyDB.messagesDao.insertMessage(
MessagesCompanion(
contactId: Value(userId),
kind: const Value(MessageKind.textMessage),
sendAt: Value(chatMessages[chatId][1] as DateTime),
acknowledgeByServer: const Value(true),
acknowledgeByUser: const Value(true),
messageOtherId:
Value(Random().nextBool() ? Random().nextInt(10000) : null),
// responseToOtherMessageId: Value(content.responseToMessageId),
// responseToMessageId: Value(content.responseToOtherMessageId),
downloadState: const Value(DownloadState.downloaded),
contentJson: Value(
jsonEncode(TextMessageContent(
text: chatMessages[chatId][0] as String)),
),
),
);
}
}
counter++;
}
}
}
Future<void> createFakeDemoData() async {
await insertDemoContacts();
}
List<List<dynamic>> chatMessages = [
[
'Lorem ipsum dolor sit amet.',
DateTime.now().subtract(const Duration(minutes: 20))
],
[
'Consectetur adipiscing elit.',
DateTime.now().subtract(const Duration(minutes: 19))
],
[
'Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
DateTime.now().subtract(const Duration(minutes: 18))
],
[
'Ut enim ad minim veniam.',
DateTime.now().subtract(const Duration(minutes: 17))
],
[
'Quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.',
DateTime.now().subtract(const Duration(minutes: 16))
],
[
'Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.',
DateTime.now().subtract(const Duration(minutes: 15))
],
[
'Excepteur sint occaecat cupidatat non proident.',
DateTime.now().subtract(const Duration(minutes: 14))
],
[
'Sunt in culpa qui officia deserunt mollit anim id est laborum.',
DateTime.now().subtract(const Duration(minutes: 13))
],
[
'Curabitur pretium tincidunt lacus.',
DateTime.now().subtract(const Duration(minutes: 12))
],
['Nulla facilisi.', DateTime.now().subtract(const Duration(minutes: 11))],
[
'Aenean lacinia bibendum nulla sed consectetur.',
DateTime.now().subtract(const Duration(minutes: 10))
],
[
'Sed posuere consectetur est at lobortis.',
DateTime.now().subtract(const Duration(minutes: 9))
],
[
'Vestibulum id ligula porta felis euismod semper.',
DateTime.now().subtract(const Duration(minutes: 8))
],
[
'Cras justo odio, dapibus ac facilisis in, egestas eget quam.',
DateTime.now().subtract(const Duration(minutes: 7))
],
[
'Morbi leo risus, porta ac consectetur ac, vestibulum at eros.',
DateTime.now().subtract(const Duration(minutes: 6))
],
[
'Praesent commodo cursus magna, vel scelerisque nisl consectetur et.',
DateTime.now().subtract(const Duration(minutes: 5))
],
[
'Donec ullamcorper nulla non metus auctor fringilla.',
DateTime.now().subtract(const Duration(minutes: 4))
],
[
'Etiam porta sem malesuada magna mollis euismod.',
DateTime.now().subtract(const Duration(minutes: 3))
],
[
'Aenean lacinia bibendum nulla sed consectetur.',
DateTime.now().subtract(const Duration(minutes: 2))
],
[
'Nullam quis risus eget urna mollis ornare vel eu leo.',
DateTime.now().subtract(const Duration(minutes: 1))
],
['Curabitur blandit tempus porttitor.', DateTime.now()],
];
String formatDateTime(BuildContext context, DateTime? dateTime) {
if (dateTime == null) {
return 'Never';
@ -426,7 +260,8 @@ MediaMessageContent? getMediaContent(Message message) {
try {
if (message.contentJson == null) return null;
return MediaMessageContent.fromJson(
jsonDecode(message.contentJson!) as Map);
jsonDecode(message.contentJson!) as Map,
);
} catch (e) {
Log.error(e);
return null;

2
lib/src/views/camera/camera_preview_components/permissions_view.dart
View file

@ -30,7 +30,7 @@ class PermissionHandlerViewState extends State<PermissionHandlerView> {
final statuses = await [
Permission.camera,
// Permission.microphone,
Permission.notification
Permission.notification,
].request();
// } catch (e) {}
// You can request multiple permissions at once.

12
lib/src/views/camera/camera_preview_components/save_to_gallery.dart
View file

@ -61,7 +61,8 @@ class SaveToGalleryButtonState extends State<SaveToGalleryButton> {
} else {
final random = Random();
final token = uint8ListToHex(
List<int>.generate(32, (i) => random.nextInt(256)));
List<int>.generate(32, (i) => random.nextInt(256)),
);
memoryPath = join(memoryPath, token);
}
final user = await getUser();
@ -113,16 +114,19 @@ class SaveToGalleryButtonState extends State<SaveToGalleryButton> {
const SizedBox(
width: 12,
height: 12,
child: CircularProgressIndicator(strokeWidth: 1))
child: CircularProgressIndicator(strokeWidth: 1),
)
else
_imageSaved
? const Icon(Icons.check)
: const FaIcon(FontAwesomeIcons.floppyDisk),
if (widget.displayButtonLabel) const SizedBox(width: 10),
if (widget.displayButtonLabel)
Text(_imageSaved
Text(
_imageSaved
? context.lang.shareImagedEditorSavedImage
: context.lang.shareImagedEditorSaveImage)
: context.lang.shareImagedEditorSaveImage,
),
],
),
);

4
lib/src/views/camera/camera_preview_components/video_recording_time.dart
View file

@ -47,11 +47,11 @@ class VideoRecordingTimer extends StatelessWidget {
Shadow(
color: Color.fromARGB(122, 0, 0, 0),
blurRadius: 5,
)
),
],
),
),
)
),
],
),
),

14
lib/src/views/camera/camera_preview_components/zoom_selector.dart
View file

@ -1,5 +1,6 @@
// ignore_for_file: avoid_dynamic_calls
import 'dart:async';
import 'dart:io';
import 'dart:math';
@ -45,7 +46,7 @@ class _CameraZoomButtonsState extends State<CameraZoomButtons> {
@override
void initState() {
super.initState();
initAsync();
unawaited(initAsync());
}
Future<void> initAsync() async {
@ -139,7 +140,8 @@ class _CameraZoomButtonsState extends State<CameraZoomButtons> {
? '${beautifulZoomScale(widget.scaleFactor)}x'
: '1.0x',
style: zoomTextStyle,
)),
),
),
TextButton(
style: zoomButtonStyle.copyWith(
foregroundColor: WidgetStateProperty.all(
@ -152,9 +154,11 @@ class _CameraZoomButtonsState extends State<CameraZoomButtons> {
.toDouble();
widget.updateScaleFactor(level);
},
child: Text('${beautifulZoomScale(maxLevel.toDouble())}x',
style: zoomTextStyle),
)
child: Text(
'${beautifulZoomScale(maxLevel.toDouble())}x',
style: zoomTextStyle,
),
),
],
),
),

41
lib/src/views/camera/camera_preview_controller_view.dart
View file

@ -94,7 +94,10 @@ class CameraPreviewControllerView extends StatelessWidget {
});
final Contact? sendTo;
final Future<CameraController?> Function(
int sCameraId, bool init, bool enableAudio) selectCamera;
int sCameraId,
bool init,
bool enableAudio,
) selectCamera;
final CameraController? cameraController;
final SelectedCameraDetails selectedCameraDetails;
final ScreenshotController screenshotController;
@ -114,10 +117,12 @@ class CameraPreviewControllerView extends StatelessWidget {
screenshotController: screenshotController,
);
} else {
return PermissionHandlerView(onSuccess: () {
return PermissionHandlerView(
onSuccess: () {
// setState(() {});
selectCamera(0, true, false);
});
},
);
}
} else {
return Container();
@ -138,7 +143,10 @@ class CameraPreviewView extends StatefulWidget {
});
final Contact? sendTo;
final Future<CameraController?> Function(
int sCameraId, bool init, bool enableAudio) selectCamera;
int sCameraId,
bool init,
bool enableAudio,
) selectCamera;
final CameraController? cameraController;
final SelectedCameraDetails selectedCameraDetails;
final ScreenshotController screenshotController;
@ -212,9 +220,12 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
widget.cameraController == null) {
return;
}
await widget.cameraController?.setZoomLevel(newScale.clamp(
await widget.cameraController?.setZoomLevel(
newScale.clamp(
widget.selectedCameraDetails.minAvailableZoom,
widget.selectedCameraDetails.maxAvailableZoom));
widget.selectedCameraDetails.maxAvailableZoom,
),
);
setState(() {
widget.selectedCameraDetails.scaleFactor = newScale;
});
@ -284,8 +295,10 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
}
Future<bool> pushMediaEditor(
Future<Uint8List?>? imageBytes, File? videoFilePath,
{bool sharedFromGallery = false}) async {
Future<Uint8List?>? imageBytes,
File? videoFilePath, {
bool sharedFromGallery = false,
}) async {
final shouldReturn = await Navigator.push(
context,
PageRouteBuilder(
@ -314,7 +327,6 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
if (!mounted) return true;
// shouldReturn is null when the user used the back button
if (shouldReturn != null && shouldReturn) {
// ignore: use_build_context_synchronously
if (widget.sendTo == null) {
globalUpdateOfHomeViewPageIndex(0);
} else {
@ -323,7 +335,10 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
return true;
}
await widget.selectCamera(
widget.selectedCameraDetails.cameraId, false, false);
widget.selectedCameraDetails.cameraId,
false,
false,
);
return false;
}
@ -466,7 +481,6 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
Log.error('$e');
try {
if (context.mounted) {
// ignore: use_build_context_synchronously
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Error: $e'),
@ -555,7 +569,8 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
await widget.selectCamera(
(widget.selectedCameraDetails.cameraId + 1) % 2,
false,
false);
false,
);
},
),
ActionButton(
@ -676,7 +691,7 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
),
),
),
if (!isVideoRecording) const SizedBox(width: 80)
if (!isVideoRecording) const SizedBox(width: 80),
],
),
],

17
lib/src/views/camera/camera_send_to_view.dart
View file

@ -1,3 +1,5 @@
import 'dart:async';
import 'package:camera/camera.dart';
import 'package:flutter/material.dart';
import 'package:screenshot/screenshot.dart';
@ -20,7 +22,7 @@ class CameraSendToViewState extends State<CameraSendToView> {
@override
void initState() {
super.initState();
selectCamera(0, true, false);
unawaited(selectCamera(0, true, false));
}
@override
@ -32,9 +34,16 @@ class CameraSendToViewState extends State<CameraSendToView> {
}
Future<CameraController?> selectCamera(
int sCameraId, bool init, bool enableAudio) async {
int sCameraId,
bool init,
bool enableAudio,
) async {
final opts = await initializeCameraController(
selectedCameraDetails, sCameraId, init, enableAudio);
selectedCameraDetails,
sCameraId,
init,
enableAudio,
);
if (opts != null) {
selectedCameraDetails = opts.$1;
cameraController = opts.$2;
@ -47,7 +56,7 @@ class CameraSendToViewState extends State<CameraSendToView> {
Future<void> toggleSelectedCamera() async {
if (cameraController == null) return;
// do not allow switching camera when recording
if (cameraController!.value.isRecordingVideo == true) {
if (cameraController!.value.isRecordingVideo) {
return;
}
await cameraController!.dispose();

2
lib/src/views/camera/image_editor/action_button.dart
View file

@ -31,7 +31,7 @@ class ActionButton extends StatelessWidget {
Shadow(
color: Color.fromARGB(122, 0, 0, 0),
blurRadius: 5,
)
),
],
),
onPressed: () {

2
lib/src/views/camera/image_editor/data/image_item.dart
View file

@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
class ImageItem {
ImageItem([dynamic image]) {
if (image != null) load(image);
if (image != null) unawaited(load(image));
}
int width = 1;
int height = 1;

9
lib/src/views/camera/image_editor/data/layer.dart
View file

@ -77,5 +77,12 @@ class DrawLayerData extends Layer {
super.hasCustomActionButtons = true,
super.isEditing = true,
});
final control = HandSignatureControl();
final control = HandSignatureControl(
// ignore: prefer_const_constructors
setup: () => SignaturePathSetup(
args: {
'color': null,
},
),
);
}

47
lib/src/views/camera/image_editor/layers/draw_layer.dart
View file

@ -1,6 +1,8 @@
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:hand_signature/signature.dart';
// ignore: implementation_imports
import 'package:hand_signature/src/utils.dart';
import 'package:screenshot/screenshot.dart';
import 'package:twonly/src/utils/misc.dart';
import 'package:twonly/src/views/camera/image_editor/action_button.dart';
@ -91,7 +93,7 @@ class _DrawLayerState extends State<DrawLayer> {
controller: screenshotController,
child: HandSignature(
control: widget.layerData.control,
drawer: LineSignatureDrawer(color: currentColor, width: 7),
drawer: CustomSignatureDrawer(color: currentColor, width: 7),
),
),
),
@ -167,8 +169,10 @@ class _DrawLayerState extends State<DrawLayer> {
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: colors,
stops: List.generate(colors.length,
(index) => index / (colors.length - 1)),
stops: List.generate(
colors.length,
(index) => index / (colors.length - 1),
),
),
borderRadius: BorderRadius.circular(10),
),
@ -187,12 +191,12 @@ class _DrawLayerState extends State<DrawLayer> {
onChangeStart: (value) => {
setState(() {
showMagnifyingGlass = true;
})
}),
},
onChangeEnd: (value) => {
setState(() {
showMagnifyingGlass = false;
})
}),
},
divisions: 100,
),
@ -211,7 +215,8 @@ class _DrawLayerState extends State<DrawLayer> {
Positioned.fill(
child: Container(
color: Colors.transparent,
))
),
),
],
);
}
@ -239,3 +244,33 @@ class MagnifyingGlass extends StatelessWidget {
);
}
}
class CustomSignatureDrawer extends HandSignatureDrawer {
const CustomSignatureDrawer({
this.width = 1.0,
this.color = Colors.black,
});
final Color color;
final double width;
@override
void paint(Canvas canvas, Size size, List<CubicPath> paths) {
for (final path in paths) {
var lineColor = color;
if (path.setup.args!['color'] != null) {
lineColor = path.setup.args!['color'] as Color;
} else {
path.setup.args!['color'] = color;
}
final paint = Paint()
..color = lineColor
..style = PaintingStyle.stroke
..strokeCap = StrokeCap.round
..strokeJoin = StrokeJoin.round
..strokeWidth = width;
if (path.isFilled) {
canvas.drawPath(PathUtil.toLinePath(path.lines), paint);
}
}
}
}

9
lib/src/views/camera/image_editor/layers/emoji_layer.dart
View file

@ -40,7 +40,8 @@ class _EmojiLayerState extends State<EmojiLayer> {
setState(() {
widget.layerData.offset = Offset(
MediaQuery.of(context).size.width / 2 - (153 / 2),
MediaQuery.of(context).size.height / 2 - (153 / 2) - 100);
MediaQuery.of(context).size.height / 2 - (153 / 2) - 100,
);
});
display = true;
});
@ -87,8 +88,8 @@ class _EmojiLayerState extends State<EmojiLayer> {
setState(() {});
},
onScaleUpdate: (details) {
if (twoPointerWhereDown == true && details.pointerCount != 2) {
onScaleUpdate: (details) async {
if (twoPointerWhereDown && details.pointerCount != 2) {
return;
}
final outlineBox =
@ -109,7 +110,7 @@ class _EmojiLayerState extends State<EmojiLayer> {
if (isAtTheBottom && isInTheCenter) {
if (!deleteLayer) {
HapticFeedback.heavyImpact();
await HapticFeedback.heavyImpact();
}
deleteLayer = true;
} else {

6
lib/src/views/camera/image_editor/layers/filter_layer.dart
View file

@ -1,3 +1,5 @@
import 'dart:async';
import 'package:collection/collection.dart';
import 'package:flutter/material.dart';
import 'package:twonly/src/views/camera/image_editor/data/layer.dart';
@ -61,7 +63,7 @@ class FilterText extends StatelessWidget {
Shadow(
color: Color.fromARGB(122, 0, 0, 0),
blurRadius: 5,
)
),
],
),
);
@ -83,7 +85,7 @@ class _FilterLayerState extends State<FilterLayer> {
WidgetsBinding.instance.addPostFrameCallback((_) {
pageController.jumpToPage(1);
});
initAsync();
unawaited(initAsync());
}
Future<void> initAsync() async {

3
lib/src/views/camera/image_editor/layers/filters/location_filter.dart
View file

@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:convert';
import 'dart:io';
@ -26,7 +27,7 @@ class _LocationFilterState extends State<LocationFilter> {
@override
void initState() {
super.initState();
initAsync();
unawaited(initAsync());
}
Future<void> initAsync() async {

33
lib/src/views/camera/image_editor/layers/text_layer.dart
View file

@ -43,7 +43,8 @@ class _TextViewState extends State<TextLayer> {
0,
MediaQuery.of(context).size.height / 2 -
150 +
(widget.layerData.textLayersBefore * 40));
(widget.layerData.textLayersBefore * 40),
);
textController.text = widget.layerData.text;
});
});
@ -68,38 +69,37 @@ class _TextViewState extends State<TextLayer> {
autofocus: true,
maxLines: null,
minLines: 1,
onEditingComplete: () {
onEditingComplete: () async {
setState(() {
widget.layerData.isDeleted = textController.text == '';
widget.layerData.isEditing = false;
widget.layerData.text = textController.text;
});
context
await context
.read<ImageEditorProvider>()
.updateSomeTextViewIsAlreadyEditing(false);
if (widget.onUpdate != null) {
widget.onUpdate!();
}
},
onTapOutside: (a) {
onTapOutside: (a) async {
widget.layerData.text = textController.text;
Future.delayed(const Duration(milliseconds: 100), () {
Future.delayed(const Duration(milliseconds: 100), () async {
if (context.mounted) {
setState(() {
widget.layerData.isDeleted = textController.text == '';
widget.layerData.isEditing = false;
context
await context
.read<ImageEditorProvider>()
.updateSomeTextViewIsAlreadyEditing(false);
if (widget.onUpdate != null) {
widget.onUpdate!();
}
});
if (mounted) setState(() {});
}
});
context
await context
.read<ImageEditorProvider>()
.updateSomeTextViewIsAlreadyEditing(false);
},
@ -149,25 +149,26 @@ class _TextViewState extends State<TextLayer> {
.watch<ImageEditorProvider>()
.someTextViewIsAlreadyEditing)
? null
: () {
setState(() {
context
: () async {
await context
.read<ImageEditorProvider>()
.updateSomeTextViewIsAlreadyEditing(true);
widget.layerData.isEditing = true;
});
if (mounted) setState(() {});
},
onScaleUpdate: (detail) {
onScaleUpdate: (detail) async {
if (detail.pointerCount == 1) {
widget.layerData.offset = Offset(
0, widget.layerData.offset.dy + detail.focalPointDelta.dy);
0,
widget.layerData.offset.dy + detail.focalPointDelta.dy,
);
}
final renderBox =
_widgetKey.currentContext!.findRenderObject()! as RenderBox;
if (widget.layerData.offset.dy > renderBox.size.height - 80) {
if (!deleteLayer) {
HapticFeedback.heavyImpact();
await HapticFeedback.heavyImpact();
}
deleteLayer = true;
} else {

6
lib/src/views/camera/image_editor/layers_viewer.dart
View file

@ -33,8 +33,10 @@ class LayersViewer extends StatelessWidget {
);
}),
...layers
.where((layerItem) =>
layerItem is EmojiLayerData || layerItem is DrawLayerData)
.where(
(layerItem) =>
layerItem is EmojiLayerData || layerItem is DrawLayerData,
)
.map((layerItem) {
if (layerItem is EmojiLayerData) {
return EmojiLayer(

13
lib/src/views/camera/image_editor/modules/all_emojis.dart
View file

@ -1,3 +1,5 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:twonly/src/utils/storage.dart';
import 'package:twonly/src/views/camera/image_editor/data/data.dart';
@ -16,7 +18,7 @@ class _EmojisState extends State<Emojis> {
@override
void initState() {
super.initState();
initAsync();
unawaited(initAsync());
}
Future<void> initAsync() async {
@ -87,8 +89,8 @@ class _EmojisState extends State<Emojis> {
children: lastUsed.map((String emoji) {
return GridTile(
child: GestureDetector(
onTap: () {
selectEmojis(emoji);
onTap: () async {
await selectEmojis(emoji);
},
child: Container(
padding: EdgeInsets.zero,
@ -98,10 +100,11 @@ class _EmojisState extends State<Emojis> {
style: const TextStyle(fontSize: 35),
),
),
));
),
);
}).toList(),
),
)
),
],
),
),

14
lib/src/views/camera/share_image_components/best_friends_selector.dart
View file

@ -59,8 +59,10 @@ class BestFriendsSelector extends StatelessWidget {
],
borderRadius: BorderRadius.circular(8),
),
child: Text(context.lang.shareImagedSelectAll,
style: const TextStyle(fontSize: 10)),
child: Text(
context.lang.shareImagedSelectAll,
style: const TextStyle(fontSize: 10),
),
),
),
],
@ -127,7 +129,8 @@ class UserCheckbox extends StatelessWidget {
return Container(
padding: const EdgeInsets.symmetric(
horizontal: 3), // Padding inside the container
horizontal: 3,
), // Padding inside the container
child: GestureDetector(
onTap: () {
onChanged(user.userId, !isChecked);
@ -172,7 +175,7 @@ class UserCheckbox extends StatelessWidget {
}
return FlameCounterWidget(user, snapshot.data!);
},
)
),
],
),
Expanded(child: Container()),
@ -184,7 +187,8 @@ class UserCheckbox extends StatelessWidget {
return const BorderSide(width: 0);
}
return BorderSide(
color: Theme.of(context).colorScheme.outline);
color: Theme.of(context).colorScheme.outline,
);
},
),
onChanged: (bool? value) {

41
lib/src/views/camera/share_image_editor_view.dart
View file

@ -74,14 +74,14 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
@override
void initState() {
super.initState();
initAsync();
initMediaFileUpload();
unawaited(initAsync());
unawaited(initMediaFileUpload());
layers.add(FilterLayerData());
if (widget.sendTo != null) {
selectedUserIds.add(widget.sendTo!.userId);
}
if (widget.imageBytes != null) {
loadImage(widget.imageBytes!);
unawaited(loadImage(widget.imageBytes!));
} else if (widget.videoFilePath != null) {
setState(() {
sendingOrLoadingImage = false;
@ -89,8 +89,8 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
});
videoController = VideoPlayerController.file(widget.videoFilePath!);
videoController?.setLooping(true);
videoController?.initialize().then((_) {
videoController!.play();
videoController?.initialize().then((_) async {
await videoController!.play();
setState(() {});
// ignore: invalid_return_type_for_catch_error, argument_type_not_assignable_to_error_handler
}).catchError(Log.error);
@ -155,9 +155,11 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
if (layers.any((x) => x.isEditing)) return;
undoLayers.clear();
removedLayers.clear();
layers.add(TextLayerData(
layers.add(
TextLayerData(
textLayersBefore: layers.whereType<TextLayerData>().length,
));
),
);
setState(() {});
},
),
@ -301,7 +303,7 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
setState(() {});
},
),
const SizedBox(width: 70)
const SizedBox(width: 70),
];
}
@ -329,7 +331,6 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
),
) as bool?;
if (wasSend != null && wasSend && mounted) {
// ignore: use_build_context_synchronously
Navigator.pop(context, true);
} else {
await videoController?.play();
@ -345,7 +346,8 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
}
setState(() {});
image = await screenshotController.capture(
pixelRatio: (widget.useHighQuality) ? pixelRatio : 1);
pixelRatio: (widget.useHighQuality) ? pixelRatio : 1,
);
for (final x in layers) {
x.showCustomButtons = true;
}
@ -397,11 +399,16 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
sendingOrLoadingImage = false;
});
if (mounted) {
await Navigator.push(context, MaterialPageRoute(builder: (context) {
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return SubscriptionView(
redirectError: err,
);
}));
},
),
);
}
} else {
final imageHandler = addOrModifyImageToUpload(mediaUploadId!, imageBytes);
@ -456,10 +463,12 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
layers = layers.where((x) => !x.isDeleted).toList();
undoLayers.clear();
removedLayers.clear();
layers.add(TextLayerData(
layers.add(
TextLayerData(
offset: Offset(0, tabDownPosition),
textLayersBefore: layers.whereType<TextLayerData>().length,
));
),
);
setState(() {});
},
child: MediaViewSizing(
@ -508,7 +517,9 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
style: ButtonStyle(
padding: WidgetStateProperty.all<EdgeInsets>(
const EdgeInsets.symmetric(
vertical: 10, horizontal: 30),
vertical: 10,
horizontal: 30,
),
),
),
label: Text(

66
lib/src/views/camera/share_image_view.dart
View file

@ -63,14 +63,14 @@ class _ShareImageView extends State<ShareImageView> {
final allContacts = twonlyDB.contactsDao.watchContactsForShareView();
contactSub = allContacts.listen((allContacts) {
contactSub = allContacts.listen((allContacts) async {
setState(() {
contacts = allContacts;
});
updateUsers(allContacts.where((x) => !x.archived).toList());
await updateUsers(allContacts.where((x) => !x.archived).toList());
});
initAsync();
unawaited(initAsync());
}
Future<void> initAsync() async {
@ -80,7 +80,10 @@ class _ShareImageView extends State<ShareImageView> {
addOrModifyImageToUpload(widget.mediaUploadId, imageBytes!);
// start with the pre upload of the media file...
await encryptMediaFiles(
widget.mediaUploadId, imageHandler, widget.videoUploadHandler);
widget.mediaUploadId,
imageHandler,
widget.videoUploadHandler,
);
}
if (!mounted) return;
setState(() {});
@ -88,8 +91,8 @@ class _ShareImageView extends State<ShareImageView> {
@override
void dispose() {
unawaited(contactSub.cancel());
super.dispose();
contactSub.cancel();
}
Future<void> updateUsers(List<Contact> users) async {
@ -103,7 +106,8 @@ class _ShareImageView extends State<ShareImageView> {
}
// If flameCounter is the same, compare by totalMediaCounter
return b.totalMediaCounter.compareTo(
a.totalMediaCounter); // Sort by totalMediaCounter in descending order
a.totalMediaCounter,
); // Sort by totalMediaCounter in descending order
});
// Separate best friends and other users
@ -132,18 +136,24 @@ class _ShareImageView extends State<ShareImageView> {
Future<void> _filterUsers(String query) async {
lastQuery = query;
if (query.isEmpty) {
await updateUsers(contacts
.where((x) =>
await updateUsers(
contacts
.where(
(x) =>
!x.archived ||
!hideArchivedUsers ||
widget.selectedUserIds.contains(x.userId))
.toList());
widget.selectedUserIds.contains(x.userId),
)
.toList(),
);
return;
}
final usersFiltered = contacts
.where((user) => getContactDisplayName(user)
.where(
(user) => getContactDisplayName(user)
.toLowerCase()
.contains(query.toLowerCase()))
.contains(query.toLowerCase()),
)
.toList();
await updateUsers(usersFiltered);
}
@ -214,21 +224,20 @@ class _ShareImageView extends State<ShareImageView> {
return const BorderSide(width: 0);
}
return BorderSide(
color: Theme.of(context)
.colorScheme
.outline);
color:
Theme.of(context).colorScheme.outline,
);
},
),
onChanged: (a) {
setState(() {
onChanged: (a) async {
hideArchivedUsers = !hideArchivedUsers;
_filterUsers(lastQuery);
});
await _filterUsers(lastQuery);
if (mounted) setState(() {});
},
),
)
),
],
)
),
],
),
Expanded(
@ -238,7 +247,7 @@ class _ShareImageView extends State<ShareImageView> {
isRealTwonly: widget.isRealTwonly,
updateStatus: updateStatus,
),
)
),
],
),
),
@ -270,12 +279,16 @@ class _ShareImageView extends State<ShareImageView> {
if (!context.mounted) return;
if (err != null) {
await Navigator.push(context,
MaterialPageRoute(builder: (context) {
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return SubscriptionView(
redirectError: err,
);
}));
},
),
);
} else {
setState(() {
sendingImage = true;
@ -312,7 +325,8 @@ class _ShareImageView extends State<ShareImageView> {
imageBytes == null || widget.selectedUserIds.isEmpty
? Theme.of(context).colorScheme.secondary
: Theme.of(context).colorScheme.primary,
)),
),
),
label: Text(
context.lang.shareImagedEditorSendImage,
style: const TextStyle(fontSize: 17),

29
lib/src/views/chats/add_new_user.view.dart
View file

@ -38,16 +38,16 @@ class _SearchUsernameView extends State<AddNewUserView> {
@override
void initState() {
super.initState();
contactsStream = twonlyDB.contactsDao
.watchNotAcceptedContacts()
.listen((update) => setState(() {
contactsStream = twonlyDB.contactsDao.watchNotAcceptedContacts().listen(
(update) => setState(() {
contacts = update;
}));
}),
);
}
@override
void dispose() {
contactsStream.cancel();
unawaited(contactsStream.cancel());
super.dispose();
}
@ -69,8 +69,11 @@ class _SearchUsernameView extends State<AddNewUserView> {
});
if (userdata == null) {
await showAlertDialog(context, context.lang.searchUsernameNotFound,
context.lang.searchUsernameNotFoundBody(searchUserName.text));
await showAlertDialog(
context,
context.lang.searchUsernameNotFound,
context.lang.searchUsernameNotFoundBody(searchUserName.text),
);
return;
}
@ -141,8 +144,8 @@ class _SearchUsernameView extends State<AddNewUserView> {
Padding(
padding: const EdgeInsets.symmetric(horizontal: 10),
child: TextField(
onSubmitted: (_) {
_addNewUser(context);
onSubmitted: (_) async {
await _addNewUser(context);
},
onChanged: (value) {
searchUserName.text = value.toLowerCase();
@ -166,7 +169,7 @@ class _SearchUsernameView extends State<AddNewUserView> {
),
Expanded(
child: ContactsListView(contacts),
)
),
],
),
),
@ -209,8 +212,10 @@ class ContactsListView extends StatelessWidget {
Tooltip(
message: context.lang.searchUserNameBlockUserTooltip,
child: IconButton(
icon: const Icon(Icons.person_off_rounded,
color: Color.fromARGB(164, 244, 67, 54)),
icon: const Icon(
Icons.person_off_rounded,
color: Color.fromARGB(164, 244, 67, 54),
),
onPressed: () async {
const update = ContactsCompanion(blocked: Value(true));
await twonlyDB.contactsDao.updateContact(contact.userId, update);

77
lib/src/views/chats/chat_list.view.dart
View file

@ -95,11 +95,16 @@ class _ChatListViewState extends State<ChatListView> {
// only show changelog to people who already have contacts
// this prevents that this is shown directly after the user registered
if (_contacts.isNotEmpty) {
await Navigator.push(context, MaterialPageRoute(builder: (context) {
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return ChangeLogView(
changeLog: changeLog,
);
}));
},
),
);
}
}
}
@ -117,13 +122,18 @@ class _ChatListViewState extends State<ChatListView> {
final planId = context.watch<CustomChangeProvider>().plan;
return Scaffold(
appBar: AppBar(
title: Row(children: [
title: Row(
children: [
GestureDetector(
onTap: () async {
await Navigator.push(context,
MaterialPageRoute(builder: (context) {
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return const ProfileView();
}));
},
),
);
_user = await getUser();
if (!mounted) return;
setState(() {});
@ -139,16 +149,22 @@ class _ChatListViewState extends State<ChatListView> {
if (planId != 'Free')
GestureDetector(
onTap: () {
Navigator.push(context, MaterialPageRoute(builder: (context) {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return const SubscriptionView();
}));
},
),
);
},
child: Container(
decoration: BoxDecoration(
color: context.color.primary,
borderRadius: BorderRadius.circular(15),
),
padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 3),
padding:
const EdgeInsets.symmetric(horizontal: 5, vertical: 3),
child: Text(
planId,
style: TextStyle(
@ -159,7 +175,8 @@ class _ChatListViewState extends State<ChatListView> {
),
),
),
]),
],
),
actions: [
const FeedbackIconButton(),
StreamBuilder(
@ -199,7 +216,7 @@ class _ChatListViewState extends State<ChatListView> {
setState(() {});
},
icon: const FaIcon(FontAwesomeIcons.gear, size: 19),
)
),
],
),
body: Stack(
@ -225,8 +242,8 @@ class _ChatListViewState extends State<ChatListView> {
),
);
},
label:
Text(context.lang.chatListViewSearchUserNameBtn)),
label: Text(context.lang.chatListViewSearchUserNameBtn),
),
),
)
: RefreshIndicator(
@ -288,9 +305,11 @@ class _ChatListViewState extends State<ChatListView> {
onPressed: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) {
MaterialPageRoute(
builder: (context) {
return const StartNewChatView();
}),
},
),
);
},
child: const FaIcon(FontAwesomeIcons.penToSquare),
@ -399,11 +418,14 @@ class _UserListItem extends State<UserListItem> {
Future<void> onTap() async {
if (currentMessage == null) {
await Navigator.push(context, MaterialPageRoute(
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return CameraSendToView(widget.user);
},
));
),
);
return;
}
@ -417,9 +439,11 @@ class _UserListItem extends State<UserListItem> {
case DownloadState.downloaded:
await Navigator.push(
context,
MaterialPageRoute(builder: (context) {
MaterialPageRoute(
builder: (context) {
return MediaViewerView(widget.user);
}),
},
),
);
return;
case DownloadState.downloading:
@ -429,9 +453,11 @@ class _UserListItem extends State<UserListItem> {
if (!mounted) return;
await Navigator.push(
context,
MaterialPageRoute(builder: (context) {
MaterialPageRoute(
builder: (context) {
return ChatMessagesView(widget.user);
}),
},
),
);
}
@ -481,7 +507,9 @@ class _UserListItem extends State<UserListItem> {
? null
: IconButton(
onPressed: () {
Navigator.push(context, MaterialPageRoute(
Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
if (hasNonOpenedMediaFile) {
return ChatMessagesView(widget.user);
@ -489,7 +517,8 @@ class _UserListItem extends State<UserListItem> {
return CameraSendToView(widget.user);
}
},
));
),
);
},
icon: FaIcon(
hasNonOpenedMediaFile
@ -500,7 +529,7 @@ class _UserListItem extends State<UserListItem> {
),
onTap: onTap,
),
)
),
],
);
}

8
lib/src/views/chats/chat_list_components/backup_notice.card.dart
View file

@ -1,3 +1,5 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:twonly/src/utils/misc.dart';
import 'package:twonly/src/utils/storage.dart';
@ -15,8 +17,8 @@ class _BackupNoticeCardState extends State<BackupNoticeCard> {
@override
void initState() {
initAsync();
super.initState();
unawaited(initAsync());
}
Future<void> initAsync() async {
@ -74,8 +76,8 @@ class _BackupNoticeCardState extends State<BackupNoticeCard> {
),
const SizedBox(width: 10),
FilledButton(
onPressed: () {
Navigator.push(
onPressed: () async {
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const BackupView(),

10
lib/src/views/chats/chat_list_components/connection_info.comp.dart
View file

@ -1,3 +1,5 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:twonly/src/utils/misc.dart';
@ -35,16 +37,18 @@ class _ConnectionInfoWidgetState extends State<ConnectionInfo>
_widthAnim = TweenSequence([
TweenSequenceItem(
tween: Tween<double>(begin: minBarWidth, end: maxBarWidth),
weight: 50),
weight: 50,
),
TweenSequenceItem(
tween: Tween<double>(begin: maxBarWidth, end: minBarWidth),
weight: 50),
weight: 50,
),
]).animate(CurvedAnimation(parent: _controller, curve: Curves.easeInOut));
// Delay start by 2 seconds
Future.delayed(const Duration(seconds: 2), () {
if (mounted) {
_controller.repeat(reverse: true);
unawaited(_controller.repeat(reverse: true));
setState(() {
showAnimation = true;
});

2
lib/src/views/chats/chat_list_components/demo_user.card.dart
View file

@ -30,7 +30,7 @@ class DemoUserCard extends StatelessWidget {
);
},
child: const Text('Register'),
)
),
],
),
);

8
lib/src/views/chats/chat_list_components/feedback_btn.dart
View file

@ -1,3 +1,5 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:twonly/src/utils/misc.dart';
@ -17,7 +19,7 @@ class _FeedbackIconButtonState extends State<FeedbackIconButton> {
@override
void initState() {
super.initState();
initAsync();
unawaited(initAsync());
}
Future<void> initAsync() async {
@ -35,8 +37,8 @@ class _FeedbackIconButtonState extends State<FeedbackIconButton> {
}
return IconButton(
onPressed: () {
Navigator.push(
onPressed: () async {
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const ContactUsView(),

34
lib/src/views/chats/chat_messages.view.dart
View file

@ -102,11 +102,11 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
@override
void dispose() {
super.dispose();
userSub.cancel();
messageSub.cancel();
tutorial?.cancel();
textFieldFocus.dispose();
super.dispose();
}
Future<void> initStreams() async {
@ -196,10 +196,14 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
chatItems.add(ChatItem.time(msg.sendAt));
lastDate = msg.sendAt;
}
chatItems.add(ChatItem.message(ChatMessage(
chatItems.add(
ChatItem.message(
ChatMessage(
message: msg,
responseTo: responseTo,
)));
),
),
);
}
}
@ -253,7 +257,8 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
Future<void> scrollToMessage(int messageId) async {
final index = messages.indexWhere(
(x) => x.isMessage && x.message!.message.messageId == messageId);
(x) => x.isMessage && x.message!.message.messageId == messageId,
);
if (index == -1) return;
setState(() {
focusedScrollItem = index;
@ -279,9 +284,14 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
appBar: AppBar(
title: GestureDetector(
onTap: () {
Navigator.push(context, MaterialPageRoute(builder: (context) {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return ContactView(widget.contact.userId);
}));
},
),
);
},
child: Row(
children: [
@ -298,7 +308,7 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
Text(getContactDisplayName(user)),
const SizedBox(width: 10),
if (user.verified)
VerifiedShield(key: verifyShieldKey, user)
VerifiedShield(key: verifyShieldKey, user),
],
),
),
@ -336,7 +346,8 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
? -8
: 8
: 0,
0),
0,
),
child: Transform.scale(
scale: (focusedScrollItem == i) ? 1.05 : 1,
child: ChatListEntry(
@ -389,7 +400,7 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
FontAwesomeIcons.xmark,
size: 16,
),
)
),
],
),
),
@ -425,7 +436,8 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
IconButton(
padding: const EdgeInsets.all(15),
icon: const FaIcon(
FontAwesomeIcons.solidPaperPlane),
FontAwesomeIcons.solidPaperPlane,
),
onPressed: _sendMessage,
)
else
@ -442,7 +454,7 @@ class _ChatMessagesViewState extends State<ChatMessagesView> {
),
);
},
)
),
],
),
),

6
lib/src/views/chats/chat_messages_components/chat_list_entry.dart
View file

@ -42,8 +42,10 @@ class _ChatListEntryState extends State<ChatListEntry> {
@override
void initState() {
super.initState();
final msgContent = MessageContent.fromJson(widget.msg.message.kind,
jsonDecode(widget.msg.message.contentJson!) as Map);
final msgContent = MessageContent.fromJson(
widget.msg.message.kind,
jsonDecode(widget.msg.message.contentJson!) as Map,
);
if (msgContent is TextMessageContent) {
textMessage = msgContent.text;
}

20
lib/src/views/chats/chat_messages_components/chat_media_entry.dart
View file

@ -1,3 +1,5 @@
import 'dart:async';
import 'package:drift/drift.dart' show Value;
import 'package:flutter/material.dart';
import 'package:twonly/globals.dart';
@ -39,7 +41,7 @@ class _ChatMediaEntryState extends State<ChatMediaEntry> {
@override
void initState() {
super.initState();
checkIfTutorialCanBeShown();
unawaited(checkIfTutorialCanBeShown());
}
Future<void> checkIfTutorialCanBeShown() async {
@ -60,9 +62,9 @@ class _ChatMediaEntryState extends State<ChatMediaEntry> {
canBeReopened = true;
});
}
Future.delayed(const Duration(seconds: 1), () {
Future.delayed(const Duration(seconds: 1), () async {
if (!mounted) return;
showReopenMediaFilesTutorial(context, reopenMediaFile);
await showReopenMediaFilesTutorial(context, reopenMediaFile);
});
}
}
@ -101,10 +103,14 @@ class _ChatMediaEntryState extends State<ChatMediaEntry> {
widget.message.openedAt == null) {
await Navigator.push(
context,
MaterialPageRoute(builder: (context) {
return MediaViewerView(widget.contact,
initialMessage: widget.message);
}),
MaterialPageRoute(
builder: (context) {
return MediaViewerView(
widget.contact,
initialMessage: widget.message,
);
},
),
);
await checkIfTutorialCanBeShown();
} else if (widget.message.downloadState == DownloadState.pending) {

4
lib/src/views/chats/chat_messages_components/chat_reaction_row.dart
View file

@ -29,7 +29,9 @@ class _ReactionRowState extends State<ReactionRow> {
var hasOneReopened = false;
for (final reaction in widget.otherReactions.reversed) {
final content = MessageContent.fromJson(
reaction.kind, jsonDecode(reaction.contentJson!) as Map);
reaction.kind,
jsonDecode(reaction.contentJson!) as Map,
);
if (content is ReopenedMediaFileContent) {
if (hasOneReopened) continue;

6
lib/src/views/chats/chat_messages_components/chat_text_entry.dart
View file

@ -34,7 +34,11 @@ class ChatTextEntry extends StatelessWidget {
maxWidth: MediaQuery.of(context).size.width * 0.8,
),
padding: EdgeInsets.only(
left: 10, top: 4, bottom: 4, right: hasReaction ? 30 : 10),
left: 10,
top: 4,
bottom: 4,
right: hasReaction ? 30 : 10,
),
decoration: BoxDecoration(
color: message.responseTo == null
? getMessageColor(message.message)

14
lib/src/views/chats/chat_messages_components/in_chat_media_viewer.dart
View file

@ -37,8 +37,8 @@ class _InChatMediaViewerState extends State<InChatMediaViewer> {
@override
void initState() {
super.initState();
loadIndexAsync();
initStream();
unawaited(loadIndexAsync());
unawaited(initStream());
}
Future<void> loadIndexAsync() async {
@ -55,8 +55,10 @@ class _InChatMediaViewerState extends State<InChatMediaViewer> {
bool loadIndex() {
if (widget.message.mediaStored) {
final index = widget.galleryItems.indexWhere((x) =>
x.id == (widget.message.mediaUploadId ?? widget.message.messageId));
final index = widget.galleryItems.indexWhere(
(x) =>
x.id == (widget.message.mediaUploadId ?? widget.message.messageId),
);
if (index != -1) {
galleryItemIndex = index;
return true;
@ -122,7 +124,9 @@ class _InChatMediaViewerState extends State<InChatMediaViewer> {
),
child: Padding(
padding: EdgeInsets.symmetric(
vertical: (widget.canBeReopened) ? 5 : 10.0, horizontal: 4),
vertical: (widget.canBeReopened) ? 5 : 10.0,
horizontal: 4,
),
child: MessageSendStateIcon(
[widget.message],
mainAxisAlignment: MainAxisAlignment.center,

4
lib/src/views/chats/chat_messages_components/message_actions.dart
View file

@ -1,4 +1,4 @@
// ignore_for_file: avoid_dynamic_calls, inference_failure_on_function_invocation
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -30,7 +30,7 @@ class _SlidingResponseWidgetState extends State<MessageActions> {
if (_offsetX > 40) {
_offsetX = 40;
if (!gotFeedback) {
HapticFeedback.heavyImpact();
unawaited(HapticFeedback.heavyImpact());
gotFeedback = true;
}
}

18
lib/src/views/chats/chat_messages_components/message_context_menu.dart
View file

@ -1,4 +1,4 @@
// ignore_for_file: avoid_dynamic_calls, inference_failure_on_function_invocation
// ignore_for_file: inference_failure_on_function_invocation
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -30,9 +30,9 @@ class MessageContextMenu extends StatelessWidget {
Widget build(BuildContext context) {
return PieMenu(
onPressed: () => (),
onToggle: (menuOpen) {
onToggle: (menuOpen) async {
if (menuOpen) {
HapticFeedback.heavyImpact();
await HapticFeedback.heavyImpact();
}
},
actions: [
@ -53,9 +53,9 @@ class MessageContextMenu extends StatelessWidget {
TextMessageContent(
text: layer.text,
responseToMessageId: message.messageOtherId,
responseToOtherMessageId: (message.messageOtherId == null)
? message.messageId
: null),
responseToOtherMessageId:
(message.messageOtherId == null) ? message.messageId : null,
),
(message.messageOtherId != null)
? PushNotification(
kind: (message.kind == MessageKind.textMessage)
@ -77,10 +77,10 @@ class MessageContextMenu extends StatelessWidget {
),
PieAction(
tooltip: Text(context.lang.copy),
onSelect: () {
onSelect: () async {
final text = getMessageText(message);
Clipboard.setData(ClipboardData(text: text));
HapticFeedback.heavyImpact();
await Clipboard.setData(ClipboardData(text: text));
await HapticFeedback.heavyImpact();
},
child: const FaIcon(FontAwesomeIcons.solidCopy),
),

4
lib/src/views/chats/chat_messages_components/message_send_state_icon.dart
View file

@ -198,8 +198,8 @@ class _MessageSendStateIconState extends State<MessageSendStateIcon> {
Transform(
transform: Matrix4.identity()
..scale(0.7) // Scale to half
..translate(3.0, 5),
..scaleByDouble(0.7, 0.7, 0.7, 0.7) // Scale to half
..translateByDouble(3, 5, 0, 1),
// Move down by 10 pixels (adjust as needed)
alignment: Alignment.center,
child: icons[1],

19
lib/src/views/chats/chat_messages_components/response_container.dart
View file

@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:convert';
import 'dart:io';
@ -126,8 +127,8 @@ class _ResponsePreviewState extends State<ResponsePreview> {
@override
void initState() {
initAsync();
super.initState();
unawaited(initAsync());
}
Future<void> initAsync() async {
@ -145,8 +146,10 @@ class _ResponsePreviewState extends State<ResponsePreview> {
if (widget.message.kind == MessageKind.textMessage) {
if (widget.message.contentJson != null) {
final content = MessageContent.fromJson(MessageKind.textMessage,
jsonDecode(widget.message.contentJson!) as Map);
final content = MessageContent.fromJson(
MessageKind.textMessage,
jsonDecode(widget.message.contentJson!) as Map,
);
if (content is TextMessageContent) {
subtitle = truncateString(content.text);
}
@ -154,7 +157,9 @@ class _ResponsePreviewState extends State<ResponsePreview> {
}
if (widget.message.kind == MessageKind.media) {
final content = MessageContent.fromJson(
MessageKind.media, jsonDecode(widget.message.contentJson!) as Map);
MessageKind.media,
jsonDecode(widget.message.contentJson!) as Map,
);
if (content is MediaMessageContent) {
subtitle = content.isVideo ? 'Video' : 'Image';
}
@ -189,7 +194,7 @@ class _ResponsePreviewState extends State<ResponsePreview> {
username,
style: const TextStyle(fontWeight: FontWeight.bold),
),
if (subtitle != null) Text(subtitle)
if (subtitle != null) Text(subtitle),
],
),
);
@ -216,7 +221,7 @@ class _ResponsePreviewState extends State<ResponsePreview> {
username,
style: const TextStyle(fontWeight: FontWeight.bold),
),
if (subtitle != null) Text(subtitle)
if (subtitle != null) Text(subtitle),
],
),
),
@ -224,7 +229,7 @@ class _ResponsePreviewState extends State<ResponsePreview> {
SizedBox(
height: widget.showBorder ? 100 : 210,
child: Image.file(thumbnailPath!),
)
),
],
),
);

42
lib/src/views/chats/media_viewer.view.dart
View file

@ -1,4 +1,4 @@
// ignore_for_file: inference_failure_on_collection_literal, avoid_dynamic_calls
// ignore_for_file: avoid_dynamic_calls
import 'dart:async';
import 'dart:convert';
@ -201,7 +201,9 @@ class _MediaViewerViewState extends State<MediaViewerView> {
}
Future<void> handleNextDownloadedMedia(
Message current, bool showTwonly) async {
Message current,
bool showTwonly,
) async {
final content =
MediaMessageContent.fromJson(jsonDecode(current.contentJson!) as Map);
@ -373,7 +375,8 @@ class _MediaViewerViewState extends State<MediaViewerView> {
const SizedBox(
width: 10,
height: 10,
child: CircularProgressIndicator(strokeWidth: 1))
child: CircularProgressIndicator(strokeWidth: 1),
)
else
imageSaved
? const Icon(Icons.check)
@ -443,11 +446,14 @@ class _MediaViewerViewState extends State<MediaViewerView> {
progressTimer?.cancel();
await videoController?.pause();
if (!mounted) return;
await Navigator.push(context, MaterialPageRoute(
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return CameraSendToView(widget.contact);
},
));
),
);
if (mounted && maxShowTime != gMediaShowInfinite) {
await nextMediaOrExit();
} else {
@ -501,8 +507,12 @@ class _MediaViewerViewState extends State<MediaViewerView> {
child: Image.memory(
imageBytes!,
fit: BoxFit.contain,
frameBuilder: (context, child, frame,
wasSynchronouslyLoaded) {
frameBuilder: (
context,
child,
frame,
wasSynchronouslyLoaded,
) {
if (wasSynchronouslyLoaded) return child;
return AnimatedSwitcher(
duration: const Duration(milliseconds: 200),
@ -604,7 +614,7 @@ class _MediaViewerViewState extends State<MediaViewerView> {
Shadow(
color: Color.fromARGB(122, 0, 0, 0),
blurRadius: 5,
)
),
],
),
),
@ -617,7 +627,11 @@ class _MediaViewerViewState extends State<MediaViewerView> {
child: Container(
color: context.color.surface,
padding: const EdgeInsets.only(
bottom: 10, left: 20, right: 20, top: 10),
bottom: 10,
left: 20,
right: 20,
top: 10,
),
child: Row(
children: [
IconButton(
@ -664,7 +678,7 @@ class _MediaViewerViewState extends State<MediaViewerView> {
showShortReactions = false;
});
},
)
),
],
),
),
@ -765,14 +779,16 @@ class _ReactionButtonsState extends State<ReactionButtons> {
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.end,
children: secondRowEmojis
.map((emoji) => EmojiReactionWidget(
.map(
(emoji) => EmojiReactionWidget(
userId: widget.userId,
responseToMessageId: widget.responseToMessageId,
hide: widget.hide,
show: widget.show,
isVideo: widget.isVideo,
emoji: emoji as String,
))
),
)
.toList(),
),
if (secondRowEmojis.isNotEmpty) const SizedBox(height: 15),
@ -848,10 +864,12 @@ class _EmojiReactionWidgetState extends State<EmojiReactionWidget> {
selectedShortReaction = 0; // Assuming index is 0 for this example
});
Future.delayed(const Duration(milliseconds: 300), () {
if (mounted) {
setState(() {
widget.hide();
selectedShortReaction = -1;
});
}
});
},
child: (selectedShortReaction ==

46
lib/src/views/chats/start_new_chat.view.dart
View file

@ -32,20 +32,21 @@ class _StartNewChatView extends State<StartNewChatView> {
final stream = twonlyDB.contactsDao.watchContactsForStartNewChat();
contactSub = stream.listen((update) {
update.sort((a, b) =>
getContactDisplayName(a).compareTo(getContactDisplayName(b)));
contactSub = stream.listen((update) async {
update.sort(
(a, b) => getContactDisplayName(a).compareTo(getContactDisplayName(b)),
);
setState(() {
allContacts = update;
});
filterUsers();
await filterUsers();
});
}
@override
void dispose() {
unawaited(contactSub.cancel());
super.dispose();
contactSub.cancel();
}
Future<void> filterUsers() async {
@ -56,9 +57,11 @@ class _StartNewChatView extends State<StartNewChatView> {
return;
}
final usersFiltered = allContacts
.where((user) => getContactDisplayName(user)
.where(
(user) => getContactDisplayName(user)
.toLowerCase()
.contains(searchUserName.value.text.toLowerCase()))
.contains(searchUserName.value.text.toLowerCase()),
)
.toList();
setState(() {
contacts = usersFiltered;
@ -82,8 +85,8 @@ class _StartNewChatView extends State<StartNewChatView> {
Padding(
padding: const EdgeInsets.symmetric(horizontal: 10),
child: TextField(
onChanged: (_) {
filterUsers();
onChanged: (_) async {
await filterUsers();
},
controller: searchUserName,
decoration: getInputDecoration(
@ -97,7 +100,7 @@ class _StartNewChatView extends State<StartNewChatView> {
child: UserList(
contacts,
),
)
),
],
),
),
@ -130,8 +133,8 @@ class UserList extends StatelessWidget {
size: 13,
),
),
onTap: () {
Navigator.push(
onTap: () async {
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const AddNewUserView(),
@ -160,9 +163,11 @@ class UserList extends StatelessWidget {
),
const Spacer(),
IconButton(
icon: FaIcon(FontAwesomeIcons.boxOpen,
icon: FaIcon(
FontAwesomeIcons.boxOpen,
size: 13,
color: user.archived ? null : Colors.transparent),
color: user.archived ? null : Colors.transparent,
),
onPressed: user.archived
? () async {
const update =
@ -170,19 +175,22 @@ class UserList extends StatelessWidget {
await twonlyDB.contactsDao
.updateContact(user.userId, update);
}
: null)
: null,
),
],
),
leading: ContactAvatar(
contact: user,
fontSize: 13,
),
onTap: () {
Navigator.pushReplacement(
onTap: () async {
await Navigator.pushReplacement(
context,
MaterialPageRoute(builder: (context) {
MaterialPageRoute(
builder: (context) {
return ChatMessagesView(user);
}),
},
),
);
},
),

7
lib/src/views/components/animate_icon.dart
View file

File diff suppressed because one or more lines are too long

9
lib/src/views/components/app_outdated.dart
View file

@ -100,9 +100,12 @@ class _AppOutdatedState extends State<AppOutdated> {
if (Platform.isAndroid) const SizedBox(height: 5),
if (Platform.isAndroid)
ElevatedButton(
onPressed: () {
launchUrl(Uri.parse(
'https://play.google.com/store/apps/details?id=eu.twonly'));
onPressed: () async {
await launchUrl(
Uri.parse(
'https://play.google.com/store/apps/details?id=eu.twonly',
),
);
},
style: ElevatedButton.styleFrom(
shape: RoundedRectangleBorder(

7
lib/src/views/components/better_list_title.dart
View file

@ -2,14 +2,15 @@ import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
class BetterListTile extends StatelessWidget {
const BetterListTile(
{required this.icon,
const BetterListTile({
required this.icon,
required this.text,
required this.onTap,
super.key,
this.color,
this.subtitle,
this.iconSize = 20});
this.iconSize = 20,
});
final IconData icon;
final String text;
final Widget? subtitle;

6
lib/src/views/components/better_text.dart
View file

@ -27,7 +27,8 @@ class BetterText extends StatelessWidget {
}
final url = match.group(0);
spans.add(TextSpan(
spans.add(
TextSpan(
text: url,
style: const TextStyle(
decoration: TextDecoration.underline,
@ -43,7 +44,8 @@ class BetterText extends StatelessWidget {
Log.error('Could not launch $e');
}
},
));
),
);
lastMatchEnd = match.end;
}

3
lib/src/views/components/flame.dart
View file

@ -28,7 +28,8 @@ class FlameCounterWidget extends StatelessWidget {
SizedBox(
height: 15,
child: EmojiAnimation(
emoji: (globalBestFriendUserId == user.userId) ? '❤️‍🔥' : '🔥'),
emoji: (globalBestFriendUserId == user.userId) ? '❤️‍🔥' : '🔥',
),
),
],
);

9
lib/src/views/components/notification_badge.dart
View file

@ -1,8 +1,11 @@
import 'package:flutter/material.dart';
class NotificationBadge extends StatelessWidget {
const NotificationBadge(
{required this.count, required this.child, super.key});
const NotificationBadge({
required this.count,
required this.child,
super.key,
});
final String count;
final Widget child;
@ -35,7 +38,7 @@ class NotificationBadge extends StatelessWidget {
),
),
),
)
),
],
);
}

2
lib/src/views/components/radio_button.dart
View file

@ -1,3 +1,5 @@
// ignore_for_file: deprecated_member_use
import 'package:flutter/material.dart';
class RadioButton<T> extends StatelessWidget {

28
lib/src/views/components/user_context_menu.dart
View file

@ -27,9 +27,9 @@ class _UserContextMenuState extends State<UserContextMenu> {
Widget build(BuildContext context) {
return PieMenu(
onPressed: () => (),
onToggle: (menuOpen) {
onToggle: (menuOpen) async {
if (menuOpen) {
HapticFeedback.heavyImpact();
await HapticFeedback.heavyImpact();
}
},
actions: [
@ -59,12 +59,15 @@ class _UserContextMenuState extends State<UserContextMenu> {
),
PieAction(
tooltip: Text(context.lang.contextMenuOpenChat),
onSelect: () {
Navigator.push(context, MaterialPageRoute(
onSelect: () async {
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return ChatMessagesView(widget.contact);
},
));
),
);
},
child: const FaIcon(FontAwesomeIcons.solidComments),
),
@ -82,9 +85,11 @@ class _UserContextMenuState extends State<UserContextMenu> {
.updateContact(widget.contact.userId, update);
}
},
child: FaIcon(widget.contact.pinned
child: FaIcon(
widget.contact.pinned
? FontAwesomeIcons.thumbtackSlash
: FontAwesomeIcons.thumbtack),
: FontAwesomeIcons.thumbtack,
),
),
],
child: widget.child,
@ -137,12 +142,15 @@ class _UserContextMenuBlocked extends State<UserContextMenuBlocked> {
),
PieAction(
tooltip: Text(context.lang.contextMenuUserProfile),
onSelect: () {
Navigator.push(context, MaterialPageRoute(
onSelect: () async {
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return ContactView(widget.contact.userId);
},
));
),
);
},
child: const FaIcon(FontAwesomeIcons.user),
),

9
lib/src/views/components/verified_shield.dart
View file

@ -11,12 +11,15 @@ class VerifiedShield extends StatelessWidget {
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () {
Navigator.push(context, MaterialPageRoute(
onTap: () async {
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return ContactVerifyView(contact);
},
));
),
);
},
child: Tooltip(
message: contact.verified

27
lib/src/views/components/video_player_wrapper.dart
View file

@ -1,11 +1,15 @@
import 'dart:async';
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:video_player/video_player.dart';
class VideoPlayerWrapper extends StatefulWidget {
const VideoPlayerWrapper(
{required this.videoPath, required this.mirrorVideo, super.key});
const VideoPlayerWrapper({
required this.videoPath,
required this.mirrorVideo,
super.key,
});
final File videoPath;
final bool mirrorVideo;
@ -19,21 +23,22 @@ class _VideoPlayerWrapperState extends State<VideoPlayerWrapper> {
@override
void initState() {
super.initState();
_controller = VideoPlayerController.file(widget.videoPath)
..initialize().then((_) {
_controller = VideoPlayerController.file(widget.videoPath);
unawaited(
_controller.initialize().then((_) async {
if (context.mounted) {
setState(() {
_controller
..setLooping(true)
..play();
});
await _controller.setLooping(true);
await _controller.play();
setState(() {});
}
});
}),
);
}
@override
void dispose() {
_controller.dispose();
unawaited(_controller.dispose());
super.dispose();
}

22
lib/src/views/contact/contact.view.dart
View file

@ -72,7 +72,8 @@ class _ContactViewState extends State<ContactView> {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text(
'Es ist ein Fehler aufgetreten. Bitte versuche es später erneut.'),
'Es ist ein Fehler aufgetreten. Bitte versuche es später erneut.',
),
duration: Duration(seconds: 3),
),
);
@ -117,7 +118,8 @@ class _ContactViewState extends State<ContactView> {
children: [
Padding(
padding: const EdgeInsets.only(right: 10),
child: VerifiedShield(contact)),
child: VerifiedShield(contact),
),
Text(
getContactDisplayName(contact),
style: const TextStyle(fontSize: 20),
@ -151,12 +153,15 @@ class _ContactViewState extends State<ContactView> {
BetterListTile(
icon: FontAwesomeIcons.shieldHeart,
text: context.lang.contactVerifyNumberTitle,
onTap: () {
Navigator.push(context, MaterialPageRoute(
onTap: () async {
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return ContactVerifyView(contact);
},
));
),
);
},
),
BetterListTile(
@ -168,7 +173,8 @@ class _ContactViewState extends State<ContactView> {
context,
context.lang.deleteAllContactMessages,
context.lang.deleteAllContactMessagesBody(
getContactDisplayName(contact)),
getContactDisplayName(contact),
),
);
if (block) {
if (context.mounted) {
@ -204,7 +210,9 @@ class _ContactViewState extends State<ContactView> {
}
Future<String?> showNicknameChangeDialog(
BuildContext context, Contact contact) {
BuildContext context,
Contact contact,
) {
final controller =
TextEditingController(text: getContactDisplayName(contact));

27
lib/src/views/contact/contact_verify.view.dart
View file

@ -39,12 +39,12 @@ class _ContactVerifyViewState extends State<ContactVerifyView> {
void initState() {
super.initState();
_contact = widget.contact;
loadAsync();
unawaited(loadAsync());
}
@override
void dispose() {
_contactSub.cancel();
unawaited(_contactSub.cancel());
super.dispose();
}
@ -86,14 +86,17 @@ class _ContactVerifyViewState extends State<ContactVerifyView> {
Future<void> openQrScanner() async {
if (_fingerprint == null) return;
final isValid = await Navigator.push(context, MaterialPageRoute(
final isValid = await Navigator.push(
context,
MaterialPageRoute(
builder: (context) {
return ContactVerifyQrScanView(
widget.contact,
fingerprint: _fingerprint!,
);
},
)) as bool?;
),
) as bool?;
if (isValid == null) {
return; // user just returned...
}
@ -205,7 +208,8 @@ class _ContactVerifyViewState extends State<ContactVerifyView> {
padding: const EdgeInsets.symmetric(horizontal: 30),
child: Text(
context.lang.contactVerifyNumberLongDesc(
getContactDisplayName(_contact)),
getContactDisplayName(_contact),
),
textAlign: TextAlign.center,
),
),
@ -213,9 +217,12 @@ class _ContactVerifyViewState extends State<ContactVerifyView> {
padding:
const EdgeInsets.symmetric(horizontal: 30, vertical: 10),
child: GestureDetector(
onTap: () {
launchUrl(Uri.parse(
'https://twonly.eu/en/faq/security/verify-security-number.html'));
onTap: () async {
await launchUrl(
Uri.parse(
'https://twonly.eu/en/faq/security/verify-security-number.html',
),
);
},
child: Text(
'Read more.',
@ -226,7 +233,7 @@ class _ContactVerifyViewState extends State<ContactVerifyView> {
),
),
),
)
),
],
),
bottomNavigationBar: SafeArea(
@ -248,7 +255,7 @@ class _ContactVerifyViewState extends State<ContactVerifyView> {
label: Text(
context.lang.contactVerifyNumberMarkAsVerified,
),
)
),
],
),
),

7
lib/src/views/contact/contact_verify_qr_scan.view.dart
View file

@ -7,8 +7,11 @@ import 'package:twonly/src/database/twonly_database.dart';
import 'package:twonly/src/utils/log.dart';
class ContactVerifyQrScanView extends StatefulWidget {
const ContactVerifyQrScanView(this.contact,
{required this.fingerprint, super.key});
const ContactVerifyQrScanView(
this.contact, {
required this.fingerprint,
super.key,
});
final Fingerprint fingerprint;
final Contact contact;

37
lib/src/views/home.view.dart
View file

@ -72,11 +72,11 @@ class HomeViewState extends State<HomeView> {
}
if (cameraController == null && !initCameraStarted && offsetRatio < 1) {
initCameraStarted = true;
selectCamera(selectedCameraDetails.cameraId, false, false);
unawaited(selectCamera(selectedCameraDetails.cameraId, false, false));
}
if (offsetRatio == 1) {
disableCameraTimer = Timer(const Duration(milliseconds: 500), () {
cameraController?.dispose();
disableCameraTimer = Timer(const Duration(milliseconds: 500), () async {
await cameraController?.dispose();
cameraController = null;
selectedCameraDetails = SelectedCameraDetails();
disableCameraTimer = null;
@ -99,13 +99,13 @@ class HomeViewState extends State<HomeView> {
.listen((NotificationResponse? response) async {
globalUpdateOfHomeViewPageIndex(0);
});
selectCamera(0, true, false);
initAsync();
unawaited(selectCamera(0, true, false));
unawaited(initAsync());
}
@override
void dispose() {
selectNotificationStream.close();
unawaited(selectNotificationStream.close());
disableCameraTimer?.cancel();
cameraController?.dispose();
super.dispose();
@ -117,7 +117,11 @@ class HomeViewState extends State<HomeView> {
bool enableAudio,
) async {
final opts = await initializeCameraController(
selectedCameraDetails, sCameraId, init, enableAudio);
selectedCameraDetails,
sCameraId,
init,
enableAudio,
);
if (opts != null) {
selectedCameraDetails = opts.$1;
cameraController = opts.$2;
@ -131,7 +135,7 @@ class HomeViewState extends State<HomeView> {
Future<void> toggleSelectedCamera() async {
if (cameraController == null) return;
// do not allow switching camera when recording
if (cameraController!.value.isRecordingVideo == true) {
if (cameraController!.value.isRecordingVideo) {
return;
}
await cameraController!.dispose();
@ -199,7 +203,8 @@ class HomeViewState extends State<HomeView> {
selectedCameraDetails: selectedCameraDetails,
selectCamera: selectCamera,
),
)),
),
),
],
),
),
@ -207,10 +212,11 @@ class HomeViewState extends State<HomeView> {
showSelectedLabels: false,
showUnselectedLabels: false,
unselectedIconTheme: IconThemeData(
color:
Theme.of(context).colorScheme.inverseSurface.withAlpha(150)),
color: Theme.of(context).colorScheme.inverseSurface.withAlpha(150),
),
selectedIconTheme: IconThemeData(
color: Theme.of(context).colorScheme.inverseSurface),
color: Theme.of(context).colorScheme.inverseSurface,
),
items: const [
BottomNavigationBarItem(
icon: FaIcon(FontAwesomeIcons.solidComments),
@ -225,15 +231,14 @@ class HomeViewState extends State<HomeView> {
label: '',
),
],
onTap: (int index) {
onTap: (int index) async {
activePageIdx = index;
setState(() {
homeViewPageController.animateToPage(
await homeViewPageController.animateToPage(
index,
duration: const Duration(milliseconds: 100),
curve: Curves.bounceIn,
);
});
if (mounted) setState(() {});
},
currentIndex: activePageIdx,
),

24
lib/src/views/memories/memories.view.dart
View file

@ -29,7 +29,7 @@ class MemoriesViewState extends State<MemoriesView> {
@override
void initState() {
super.initState();
initAsync();
unawaited(initAsync());
}
@override
@ -71,7 +71,8 @@ class MemoriesViewState extends State<MemoriesView> {
break;
}
final creationDate = file.lastModifiedSync();
items.add(MemoryItem(
items.add(
MemoryItem(
id: int.parse(fileName.split('.')[0]),
messages: [],
date: creationDate,
@ -79,7 +80,8 @@ class MemoriesViewState extends State<MemoriesView> {
thumbnailPath: thumbnailFile,
imagePath: imagePath,
videoPath: videoPath,
));
),
);
}
}
}
@ -98,8 +100,9 @@ class MemoriesViewState extends State<MemoriesView> {
var lastMonth = '';
galleryItems = await loadMemoriesDirectory();
for (final item in galleryItems) {
items.remove(item
.id); // prefer the stored one and not the saved on in the chat....
items.remove(
item.id,
); // prefer the stored one and not the saved on in the chat....
}
galleryItems += items.values.toList();
galleryItems.sort((a, b) => b.date.compareTo(a.date));
@ -127,17 +130,18 @@ class MemoriesViewState extends State<MemoriesView> {
child: Text(
context.lang.memoriesEmpty,
textAlign: TextAlign.center,
))
),
)
: ListView.builder(
itemCount: months.length * 2,
itemBuilder: (context, mIndex) {
if (mIndex.isEven) {
return Padding(
padding: const EdgeInsets.all(8),
child: Text(months[(mIndex / 2).toInt()]),
child: Text(months[(mIndex ~/ 2)]),
);
}
final index = ((mIndex - 1) / 2).toInt();
final index = (mIndex - 1) ~/ 2;
return GridView.builder(
shrinkWrap: true,
physics: const ClampingScrollPhysics(),
@ -151,8 +155,8 @@ class MemoriesViewState extends State<MemoriesView> {
final gaIndex = orderedByMonth[months[index]]![gIndex];
return MemoriesItemThumbnail(
galleryItem: galleryItems[gaIndex],
onTap: () {
open(context, gaIndex);
onTap: () async {
await open(context, gaIndex);
},
);
},

19
lib/src/views/memories/memories_photo_slider.view.dart
View file

@ -126,8 +126,8 @@ class _MemoriesPhotoSliderViewState extends State<MemoriesPhotoSliderView> {
children: [
FilledButton.icon(
icon: const FaIcon(FontAwesomeIcons.solidPaperPlane),
onPressed: () {
Navigator.push(
onPressed: () async {
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => ShareImageEditorView(
@ -146,11 +146,14 @@ class _MemoriesPhotoSliderViewState extends State<MemoriesPhotoSliderView> {
style: ButtonStyle(
padding: WidgetStateProperty.all<EdgeInsets>(
const EdgeInsets.symmetric(
vertical: 10, horizontal: 30),
vertical: 10,
horizontal: 30,
),
),
backgroundColor: WidgetStateProperty.all<Color>(
Theme.of(context).colorScheme.primary,
)),
),
),
label: Text(
context.lang.shareImagedEditorSendImage,
style: const TextStyle(fontSize: 17),
@ -173,12 +176,12 @@ class _MemoriesPhotoSliderViewState extends State<MemoriesPhotoSliderView> {
Positioned(
right: 5,
child: PopupMenuButton<String>(
onSelected: (String result) {
onSelected: (String result) async {
if (result == 'delete') {
deleteFile();
await deleteFile();
}
if (result == 'export') {
exportFile();
await exportFile();
}
},
itemBuilder: (BuildContext context) =>
@ -197,7 +200,7 @@ class _MemoriesPhotoSliderViewState extends State<MemoriesPhotoSliderView> {
// ),
],
),
)
),
],
),
),

Some files were not shown because too many files have changed in this diff Show more