diff --git a/lib/src/services/api.service.dart b/lib/src/services/api.service.dart index b434fa2..dea88dc 100644 --- a/lib/src/services/api.service.dart +++ b/lib/src/services/api.service.dart @@ -185,7 +185,7 @@ class ApiService { } Future _onError(dynamic e) async { - Log.error('websocket error: $e'); + Log.warn('websocket error: $e'); await onClosed(); } @@ -206,7 +206,7 @@ class ApiService { Future _waitForResponse(Int64 seq) async { final startTime = DateTime.now(); - const timeout = Duration(seconds: 20); + const timeout = Duration(seconds: 60); while (true) { if (messagesV0[seq] != null) { @@ -215,7 +215,7 @@ class ApiService { return tmp; } if (DateTime.now().difference(startTime) > timeout) { - Log.error('Timeout for message $seq'); + Log.warn('Timeout for message $seq'); return null; } await Future.delayed(const Duration(milliseconds: 10)); @@ -417,7 +417,7 @@ class ApiService { final result = await sendRequestSync(req, authenticated: false); if (result.isError) { - Log.error('could not request auth challenge', result); + Log.warn('could not request auth challenge', result); return; } diff --git a/lib/src/services/api/mediafiles/download.service.dart b/lib/src/services/api/mediafiles/download.service.dart index f8315ce..12ea9dc 100644 --- a/lib/src/services/api/mediafiles/download.service.dart +++ b/lib/src/services/api/mediafiles/download.service.dart @@ -112,7 +112,6 @@ Future handleDownloadStatusUpdate(TaskStatusUpdate update) async { } if (failed) { - Log.error('Background media upload failed: ${update.status}'); await requestMediaReupload(mediaId); } else { await handleEncryptedFile(mediaId); diff --git a/lib/src/services/mediafiles/mediafile.service.dart b/lib/src/services/mediafiles/mediafile.service.dart index 0425efa..24b4e37 100644 --- a/lib/src/services/mediafiles/mediafile.service.dart +++ b/lib/src/services/mediafiles/mediafile.service.dart @@ -35,11 +35,7 @@ class MediaFileService { final service = await MediaFileService.fromMediaId(mediaId); - if (service == null) { - Log.error( - 'Purging media file, as it is not in the database $mediaId.', - ); - } else { + if (service != null) { if (service.mediaFile.isDraftMedia) { delete = false; } diff --git a/lib/src/services/signal/encryption.signal.dart b/lib/src/services/signal/encryption.signal.dart index 50aad34..3c24598 100644 --- a/lib/src/services/signal/encryption.signal.dart +++ b/lib/src/services/signal/encryption.signal.dart @@ -112,7 +112,7 @@ Future<(EncryptedContent?, PlaintextContent_DecryptionErrorMessage_Type?)> return (EncryptedContent.fromBuffer(plaintext), null); } on InvalidKeyIdException catch (e) { - Log.error(e); + Log.warn(e); return (null, PlaintextContent_DecryptionErrorMessage_Type.PREKEY_UNKNOWN); } catch (e) { Log.error(e); diff --git a/lib/src/services/signal/prekeys.signal.dart b/lib/src/services/signal/prekeys.signal.dart index e70d239..f2dcde2 100644 --- a/lib/src/services/signal/prekeys.signal.dart +++ b/lib/src/services/signal/prekeys.signal.dart @@ -50,8 +50,7 @@ Future requestNewPrekeysForContact(int contactId) async { .toList(); await twonlyDB.signalDao.insertPreKeys(preKeys); } else { - // 104400 - Log.error('[PREKEY] Could not load new pre keys for user $contactId'); + Log.warn('[PREKEY] Could not load new pre keys for user $contactId'); } }); } @@ -85,7 +84,7 @@ Future requestNewSignedPreKeyForContact(int contactId) async { ), ); } else { - Log.error('could not load new signed pre key for user $contactId'); + Log.warn('could not load new signed pre key for user $contactId'); } }); } diff --git a/lib/src/utils/log.dart b/lib/src/utils/log.dart index 7bd51f7..7eefe2a 100644 --- a/lib/src/utils/log.dart +++ b/lib/src/utils/log.dart @@ -23,9 +23,9 @@ void initLogger() { class Log { static String filterLogMessage(String msg) { - if (msg.contains("SqliteException")) { + if (msg.contains('SqliteException')) { // Do not log data which would be inserted into the DB. - return msg.substring(0, msg.indexOf("parameters: ")); + return msg.substring(0, msg.indexOf('parameters: ')); } return msg; } diff --git a/lib/src/views/camera/camera_preview_components/zoom_selector.dart b/lib/src/views/camera/camera_preview_components/zoom_selector.dart index d5824b0..c6d78cf 100644 --- a/lib/src/views/camera/camera_preview_components/zoom_selector.dart +++ b/lib/src/views/camera/camera_preview_components/zoom_selector.dart @@ -6,7 +6,6 @@ import 'dart:math'; import 'package:camera/camera.dart'; import 'package:flutter/material.dart'; import 'package:twonly/globals.dart'; -import 'package:twonly/src/utils/log.dart'; import 'package:twonly/src/views/camera/camera_preview_controller_view.dart'; class CameraZoomButtons extends StatefulWidget { @@ -51,7 +50,6 @@ class _CameraZoomButtonsState extends State { Future initAsync() async { showWideAngleZoom = (await widget.controller.getMinZoomLevel()) < 1; - Log.info('Found ${gCameras.length} cameras for zoom.'); var index = gCameras.indexWhere((t) => t.lensType == CameraLensType.ultraWide);