diff --git a/lib/encryption/encryption.dart b/lib/encryption/encryption.dart index f23b74b0..ba5effd2 100644 --- a/lib/encryption/encryption.dart +++ b/lib/encryption/encryption.dart @@ -135,7 +135,7 @@ class Encryption { try { return await olmManager.decryptToDeviceEvent(event); } catch (e, s) { - Logs().e( + Logs().w( '[LibOlm] Could not decrypt to device event from ${event.sender} with content: ${event.content}', e, s); diff --git a/lib/encryption/olm_manager.dart b/lib/encryption/olm_manager.dart index 81d71f8c..4a2fddf6 100644 --- a/lib/encryption/olm_manager.dart +++ b/lib/encryption/olm_manager.dart @@ -127,7 +127,7 @@ class OlmManager { isValid = true; } catch (e, s) { isValid = false; - Logs().e('[LibOlm] Signature check failed', e, s); + Logs().w('[LibOlm] Signature check failed', e, s); } finally { olmutil.free(); } @@ -516,7 +516,7 @@ class OlmManager { data[device.userId][device.deviceId] = await encryptToDeviceMessagePayload(device, type, payload); } catch (e, s) { - Logs().e('[LibOlm] Error encrypting to-device event', e, s); + Logs().w('[LibOlm] Error encrypting to-device event', e, s); continue; } } diff --git a/lib/encryption/utils/json_signature_check_extension.dart b/lib/encryption/utils/json_signature_check_extension.dart index 20cef691..920ca393 100644 --- a/lib/encryption/utils/json_signature_check_extension.dart +++ b/lib/encryption/utils/json_signature_check_extension.dart @@ -20,7 +20,7 @@ extension JsonSignatureCheckExtension on Map { isValid = true; } catch (e, s) { isValid = false; - Logs().e('[LibOlm] Signature check failed', e, s); + Logs().w('[LibOlm] Signature check failed', e, s); } finally { olmutil.free(); } diff --git a/lib/matrix_api/utils/logs.dart b/lib/matrix_api/utils/logs.dart index 249f9c19..7e15f379 100644 --- a/lib/matrix_api/utils/logs.dart +++ b/lib/matrix_api/utils/logs.dart @@ -31,7 +31,7 @@ class Logs extends Logger { Logs._internal() : super( - printer: PrettyPrinter(methodCount: 0), + printer: PrettyPrinter(methodCount: 0, lineLength: 100), filter: _MatrixSdkFilter(), output: _CacheOutput(), ); diff --git a/test/canonical_json_test.dart b/test/canonical_json_test.dart index 1125c487..93731e53 100644 --- a/test/canonical_json_test.dart +++ b/test/canonical_json_test.dart @@ -17,11 +17,14 @@ */ import 'package:canonical_json/canonical_json.dart'; +import 'package:famedlysdk/matrix_api/utils/logs.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; void main() { /// All Tests related to the ChatTime group('Canonical Json', () { + Logs().level = Level.error; var textMap = >{ '{}': {}, '{"one":1,"two":"Two"}': {'one': 1, 'two': 'Two'}, diff --git a/test/client_test.dart b/test/client_test.dart index 5782dbfe..683d946e 100644 --- a/test/client_test.dart +++ b/test/client_test.dart @@ -26,6 +26,7 @@ import 'package:famedlysdk/src/utils/event_update.dart'; import 'package:famedlysdk/matrix_api/utils/logs.dart'; import 'package:famedlysdk/src/utils/room_update.dart'; import 'package:famedlysdk/src/utils/matrix_file.dart'; +import 'package:logger/logger.dart'; import 'package:olm/olm.dart' as olm; import 'package:test/test.dart'; @@ -48,6 +49,8 @@ void main() { /// All Tests related to the Login group('Client', () { + Logs().level = Level.error; + /// Check if all Elements get created matrix = Client('testclient', httpClient: FakeMatrixApi()); diff --git a/test/device_keys_list_test.dart b/test/device_keys_list_test.dart index d99ad7ad..ae69029c 100644 --- a/test/device_keys_list_test.dart +++ b/test/device_keys_list_test.dart @@ -20,6 +20,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api/utils/logs.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; @@ -29,6 +30,7 @@ import './fake_matrix_api.dart'; void main() { /// All Tests related to device keys group('Device keys', () { + Logs().level = Level.error; test('fromJson', () async { var rawJson = { 'user_id': '@alice:example.com', @@ -78,7 +80,7 @@ void main() { olm.Account(); } catch (e) { olmEnabled = false; - Logs().e('[LibOlm] Failed to load LibOlm', e); + Logs().w('[LibOlm] Failed to load LibOlm', e); } Logs().i('[LibOlm] Enabled: $olmEnabled'); diff --git a/test/encryption/bootstrap_test.dart b/test/encryption/bootstrap_test.dart index 34790857..5b257d40 100644 --- a/test/encryption/bootstrap_test.dart +++ b/test/encryption/bootstrap_test.dart @@ -22,6 +22,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/encryption.dart'; import 'package:famedlysdk/matrix_api/utils/logs.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; @@ -29,13 +30,14 @@ import '../fake_client.dart'; void main() { group('Bootstrap', () { + Logs().level = Level.error; var olmEnabled = true; try { olm.init(); olm.Account(); } catch (e) { olmEnabled = false; - Logs().e('[LibOlm] Failed to load LibOlm', e); + Logs().w('[LibOlm] Failed to load LibOlm', e); } Logs().i('[LibOlm] Enabled: $olmEnabled'); diff --git a/test/encryption/cross_signing_test.dart b/test/encryption/cross_signing_test.dart index d3f682e8..52d73bbe 100644 --- a/test/encryption/cross_signing_test.dart +++ b/test/encryption/cross_signing_test.dart @@ -20,6 +20,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api/utils/logs.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; @@ -28,13 +29,14 @@ import '../fake_matrix_api.dart'; void main() { group('Cross Signing', () { + Logs().level = Level.error; var olmEnabled = true; try { olm.init(); olm.Account(); } catch (e) { olmEnabled = false; - Logs().e('[LibOlm] Failed to load LibOlm', e); + Logs().w('[LibOlm] Failed to load LibOlm', e); } Logs().i('[LibOlm] Enabled: $olmEnabled'); diff --git a/test/encryption/encrypt_decrypt_room_message_test.dart b/test/encryption/encrypt_decrypt_room_message_test.dart index 7ed415ec..a8903b10 100644 --- a/test/encryption/encrypt_decrypt_room_message_test.dart +++ b/test/encryption/encrypt_decrypt_room_message_test.dart @@ -18,6 +18,7 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api/utils/logs.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; @@ -25,13 +26,14 @@ import '../fake_client.dart'; void main() { group('Encrypt/Decrypt room message', () { + Logs().level = Level.error; var olmEnabled = true; try { olm.init(); olm.Account(); } catch (e) { olmEnabled = false; - Logs().e('[LibOlm] Failed to load LibOlm', e); + Logs().w('[LibOlm] Failed to load LibOlm', e); } Logs().i('[LibOlm] Enabled: $olmEnabled'); diff --git a/test/encryption/encrypt_decrypt_to_device_test.dart b/test/encryption/encrypt_decrypt_to_device_test.dart index 2e6f65cc..0d84b227 100644 --- a/test/encryption/encrypt_decrypt_to_device_test.dart +++ b/test/encryption/encrypt_decrypt_to_device_test.dart @@ -18,6 +18,7 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api/utils/logs.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; @@ -31,13 +32,14 @@ void main() { 'VWhVApbkcilKAEGppsPDf9nNVjaK8/IxT3asSR0sYg0S5KgbfE8vXEPwoiKBX2cEvwX3OessOBOkk+ZE7TTbjlrh/KEd31p8Wo+47qj0AP+Ky+pabnhi+/rTBvZy+gfzTqUfCxZrkzfXI9Op4JnP6gYmy7dVX2lMYIIs9WCO1jcmIXiXum5jnfXu1WLfc7PZtO2hH+k9CDKosOFaXRBmsu8k/BGXPSoWqUpvu6WpEG9t5STk4FeAzA'; group('Encrypt/Decrypt to-device messages', () { + Logs().level = Level.error; var olmEnabled = true; try { olm.init(); olm.Account(); } catch (e) { olmEnabled = false; - Logs().e('[LibOlm] Failed to load LibOlm', e); + Logs().w('[LibOlm] Failed to load LibOlm', e); } Logs().i('[LibOlm] Enabled: $olmEnabled'); diff --git a/test/encryption/key_manager_test.dart b/test/encryption/key_manager_test.dart index e57ba6ca..8606661c 100644 --- a/test/encryption/key_manager_test.dart +++ b/test/encryption/key_manager_test.dart @@ -20,6 +20,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api/utils/logs.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; @@ -27,13 +28,14 @@ import '../fake_client.dart'; void main() { group('Key Manager', () { + Logs().level = Level.error; var olmEnabled = true; try { olm.init(); olm.Account(); } catch (e) { olmEnabled = false; - Logs().e('[LibOlm] Failed to load LibOlm', e); + Logs().w('[LibOlm] Failed to load LibOlm', e); } Logs().i('[LibOlm] Enabled: $olmEnabled'); diff --git a/test/encryption/key_request_test.dart b/test/encryption/key_request_test.dart index 132426f1..99bd1c96 100644 --- a/test/encryption/key_request_test.dart +++ b/test/encryption/key_request_test.dart @@ -19,6 +19,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api/utils/logs.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; @@ -40,13 +41,14 @@ Map jsonDecode(dynamic payload) { void main() { /// All Tests related to device keys group('Key Request', () { + Logs().level = Level.error; var olmEnabled = true; try { olm.init(); olm.Account(); } catch (e) { olmEnabled = false; - Logs().e('[LibOlm] Failed to load LibOlm', e); + Logs().w('[LibOlm] Failed to load LibOlm', e); } Logs().i('[LibOlm] Enabled: $olmEnabled'); diff --git a/test/encryption/key_verification_test.dart b/test/encryption/key_verification_test.dart index 8f24400d..e003d1f1 100644 --- a/test/encryption/key_verification_test.dart +++ b/test/encryption/key_verification_test.dart @@ -21,6 +21,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/encryption.dart'; import 'package:famedlysdk/matrix_api/utils/logs.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; @@ -62,13 +63,14 @@ EventUpdate getLastSentEvent(KeyVerification req) { void main() { /// All Tests related to the ChatTime group('Key Verification', () { + Logs().level = Level.error; var olmEnabled = true; try { olm.init(); olm.Account(); } catch (e) { olmEnabled = false; - Logs().e('[LibOlm] Failed to load LibOlm', e); + Logs().w('[LibOlm] Failed to load LibOlm', e); } Logs().i('[LibOlm] Enabled: $olmEnabled'); diff --git a/test/encryption/olm_manager_test.dart b/test/encryption/olm_manager_test.dart index 6690cf80..ba1e7646 100644 --- a/test/encryption/olm_manager_test.dart +++ b/test/encryption/olm_manager_test.dart @@ -19,6 +19,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api/utils/logs.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; import 'package:famedlysdk/encryption/utils/json_signature_check_extension.dart'; @@ -28,13 +29,14 @@ import '../fake_matrix_api.dart'; void main() { group('Olm Manager', () { + Logs().level = Level.error; var olmEnabled = true; try { olm.init(); olm.Account(); } catch (e) { olmEnabled = false; - Logs().e('[LibOlm] Failed to load LibOlm', e); + Logs().w('[LibOlm] Failed to load LibOlm', e); } Logs().i('[LibOlm] Enabled: $olmEnabled'); diff --git a/test/encryption/online_key_backup_test.dart b/test/encryption/online_key_backup_test.dart index b067c4c2..957bc0a6 100644 --- a/test/encryption/online_key_backup_test.dart +++ b/test/encryption/online_key_backup_test.dart @@ -21,6 +21,7 @@ import 'dart:convert'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api/utils/logs.dart'; import 'package:famedlysdk/matrix_api.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; @@ -29,13 +30,14 @@ import '../fake_matrix_api.dart'; void main() { group('Online Key Backup', () { + Logs().level = Level.error; var olmEnabled = true; try { olm.init(); olm.Account(); } catch (e) { olmEnabled = false; - Logs().e('[LibOlm] Failed to load LibOlm', e); + Logs().w('[LibOlm] Failed to load LibOlm', e); } Logs().i('[LibOlm] Enabled: $olmEnabled'); diff --git a/test/encryption/ssss_test.dart b/test/encryption/ssss_test.dart index a7aedfe4..de7594eb 100644 --- a/test/encryption/ssss_test.dart +++ b/test/encryption/ssss_test.dart @@ -23,6 +23,7 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api.dart'; import 'package:famedlysdk/encryption.dart'; import 'package:famedlysdk/matrix_api/utils/logs.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:encrypt/encrypt.dart'; import 'package:olm/olm.dart' as olm; @@ -45,13 +46,14 @@ class MockSSSS extends SSSS { void main() { group('SSSS', () { + Logs().level = Level.error; var olmEnabled = true; try { olm.init(); olm.Account(); } catch (e) { olmEnabled = false; - Logs().e('[LibOlm] Failed to load LibOlm', e); + Logs().w('[LibOlm] Failed to load LibOlm', e); } Logs().i('[LibOlm] Enabled: $olmEnabled'); diff --git a/test/event_test.dart b/test/event_test.dart index a070460a..e5f8f7ea 100644 --- a/test/event_test.dart +++ b/test/event_test.dart @@ -24,6 +24,7 @@ import 'package:famedlysdk/matrix_api.dart'; import 'package:famedlysdk/encryption.dart'; import 'package:famedlysdk/src/event.dart'; import 'package:famedlysdk/matrix_api/utils/logs.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; @@ -34,13 +35,14 @@ import 'fake_matrix_localizations.dart'; void main() { /// All Tests related to the Event group('Event', () { + Logs().level = Level.error; var olmEnabled = true; try { olm.init(); olm.Account(); } catch (e) { olmEnabled = false; - Logs().e('[LibOlm] Failed to load LibOlm', e); + Logs().w('[LibOlm] Failed to load LibOlm', e); } Logs().i('[LibOlm] Enabled: $olmEnabled'); diff --git a/test/matrix_api_test.dart b/test/matrix_api_test.dart index cc1dbd80..488bd0f0 100644 --- a/test/matrix_api_test.dart +++ b/test/matrix_api_test.dart @@ -25,6 +25,7 @@ import 'package:famedlysdk/matrix_api/model/presence_content.dart'; import 'package:famedlysdk/matrix_api/model/push_rule_set.dart'; import 'package:famedlysdk/matrix_api/model/pusher.dart'; import 'package:famedlysdk/matrix_api/utils/logs.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'fake_matrix_api.dart'; @@ -32,23 +33,10 @@ import 'fake_matrix_api.dart'; void main() { /// All Tests related to device keys group('Matrix API', () { + Logs().level = Level.error; final matrixApi = MatrixApi( httpClient: FakeMatrixApi(), ); - - test('Logs', () { - Logs().i('Info'); - Logs().d('Debug'); - Logs().v('Verbose'); - Logs().w('Warning'); - Logs().wtf('Critical Error'); - Logs().e('Error'); - try { - throw 'Exception'; - } catch (e, s) { - Logs().e('Caught', e, s); - } - }); test('MatrixException test', () async { final exception = MatrixException.fromJson({ 'flows': [ diff --git a/test/matrix_database_test.dart b/test/matrix_database_test.dart index ef02b138..8ecd8c8a 100644 --- a/test/matrix_database_test.dart +++ b/test/matrix_database_test.dart @@ -18,11 +18,13 @@ */ import 'package:famedlysdk/famedlysdk.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'fake_database.dart'; void main() { group('Databse', () { + Logs().level = Level.error; var clientId = -1; var room = Room(id: '!room:blubb'); test('setupDatabase', () async { diff --git a/test/matrix_exception_test.dart b/test/matrix_exception_test.dart index 159ed8c1..d71ce02e 100644 --- a/test/matrix_exception_test.dart +++ b/test/matrix_exception_test.dart @@ -17,11 +17,13 @@ */ import 'package:famedlysdk/matrix_api.dart'; import 'package:http/http.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; void main() { /// All Tests related to device keys group('Matrix Exception', () { + Logs().level = Level.error; test('Matrix Exception', () async { final matrixException = MatrixException( Response( diff --git a/test/matrix_file_test.dart b/test/matrix_file_test.dart index 7722851e..d1109c89 100644 --- a/test/matrix_file_test.dart +++ b/test/matrix_file_test.dart @@ -19,12 +19,14 @@ import 'dart:typed_data'; import 'package:famedlysdk/famedlysdk.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; void main() { /// All Tests related to device keys group('Matrix File', () { + Logs().level = Level.error; test('Decrypt', () async { final text = 'hello world'; final file = MatrixFile( diff --git a/test/mxc_uri_extension_test.dart b/test/mxc_uri_extension_test.dart index 37fdca22..d43ac1da 100644 --- a/test/mxc_uri_extension_test.dart +++ b/test/mxc_uri_extension_test.dart @@ -16,6 +16,8 @@ * along with this program. If not, see . */ +import 'package:famedlysdk/matrix_api/utils/logs.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:famedlysdk/src/client.dart'; import 'package:famedlysdk/src/utils/uri_extension.dart'; @@ -25,6 +27,7 @@ import 'fake_matrix_api.dart'; void main() { /// All Tests related to the MxContent group('MxContent', () { + Logs().level = Level.error; test('Formatting', () async { var client = Client('testclient', httpClient: FakeMatrixApi()); await client.checkHomeserver('https://fakeserver.notexisting'); diff --git a/test/room_test.dart b/test/room_test.dart index e17a3145..ff9c711c 100644 --- a/test/room_test.dart +++ b/test/room_test.dart @@ -27,6 +27,7 @@ import 'package:famedlysdk/src/event.dart'; import 'package:famedlysdk/src/room.dart'; import 'package:famedlysdk/src/user.dart'; import 'package:famedlysdk/src/utils/matrix_file.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'fake_client.dart'; @@ -38,6 +39,7 @@ void main() { /// All Tests related to the Event group('Room', () { + Logs().level = Level.error; test('Login', () async { matrix = await getClient(); }); diff --git a/test/states_map_test.dart b/test/states_map_test.dart index 5e0aa7d4..00386a00 100644 --- a/test/states_map_test.dart +++ b/test/states_map_test.dart @@ -17,12 +17,14 @@ */ import 'package:famedlysdk/famedlysdk.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:famedlysdk/src/utils/states_map.dart'; void main() { /// All Tests related to the ChatTime group('StateKeys', () { + Logs().level = Level.error; test('Operator overload', () async { var states = StatesMap(); states['m.room.name'] = Event( diff --git a/test/sync_filter_test.dart b/test/sync_filter_test.dart index 71ac01b4..33d8aa91 100644 --- a/test/sync_filter_test.dart +++ b/test/sync_filter_test.dart @@ -17,6 +17,7 @@ */ import 'package:famedlysdk/famedlysdk.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; const UPDATES = { @@ -135,6 +136,7 @@ void testUpdates(bool Function(SyncUpdate s) test, Map expected) { void main() { group('Sync Filters', () { + Logs().level = Level.error; test('room update', () { var testFn = (SyncUpdate s) => s.hasRoomUpdate; final expected = { diff --git a/test/timeline_test.dart b/test/timeline_test.dart index 428e7726..de00e626 100644 --- a/test/timeline_test.dart +++ b/test/timeline_test.dart @@ -17,6 +17,7 @@ */ import 'package:famedlysdk/matrix_api.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'package:famedlysdk/src/client.dart'; import 'package:famedlysdk/src/room.dart'; @@ -28,6 +29,7 @@ import 'fake_matrix_api.dart'; void main() { /// All Tests related to the MxContent group('Timeline', () { + Logs().level = Level.error; final roomID = '!1234:example.com'; final testTimeStamp = DateTime.now().millisecondsSinceEpoch; var updateCount = 0; diff --git a/test/uia_test.dart b/test/uia_test.dart index c49c9e59..5407f05b 100644 --- a/test/uia_test.dart +++ b/test/uia_test.dart @@ -19,10 +19,12 @@ import 'dart:async'; import 'package:famedlysdk/famedlysdk.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; void main() { group('UIA', () { + Logs().level = Level.error; test('it should work', () async { var completed = []; var updated = 0; diff --git a/test/user_test.dart b/test/user_test.dart index e136bb8e..e3d19ebc 100644 --- a/test/user_test.dart +++ b/test/user_test.dart @@ -20,6 +20,7 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api.dart'; import 'package:famedlysdk/src/event.dart'; import 'package:famedlysdk/src/user.dart'; +import 'package:logger/logger.dart'; import 'package:test/test.dart'; import 'fake_matrix_api.dart'; @@ -27,6 +28,7 @@ import 'fake_matrix_api.dart'; void main() { /// All Tests related to the Event group('User', () { + Logs().level = Level.error; var client = Client('testclient', httpClient: FakeMatrixApi()); final user1 = User( '@alice:example.com',