From c94ed3b088c47f21190e1615a935b00c0000708a Mon Sep 17 00:00:00 2001 From: otsmr Date: Thu, 19 Jun 2025 08:48:34 +0200 Subject: [PATCH] rename files --- lib/app.dart | 2 +- lib/main.dart | 6 ++--- lib/src/model/memory_item.model.dart | 2 +- lib/src/services/api.service.dart | 4 ++-- ...edia_received.dart => media_download.dart} | 2 +- .../{media_send.dart => media_upload.dart} | 4 ++-- lib/src/services/api/server_messages.dart | 4 ++-- ....service.dart => twonly_safe.service.dart} | 4 ++-- .../save_to_gallery.dart | 2 +- .../views/camera/share_image_editor_view.dart | 2 +- lib/src/views/camera/share_image_view.dart | 2 +- lib/src/views/chats/chat_list.view.dart | 2 +- .../chat_media_entry.dart | 2 +- .../in_chat_media_viewer.dart | 2 +- lib/src/views/chats/media_viewer.view.dart | 2 +- lib/src/views/memories/memories.view.dart | 2 +- .../memories/memories_photo_slider.view.dart | 4 ++-- lib/src/views/register.view.dart | 24 +++++++++---------- .../views/settings/backup/backup.view.dart | 2 +- .../backup/twonly_safe_backup.view.dart | 2 +- .../views/settings/data_and_storage.view.dart | 2 +- 21 files changed, 39 insertions(+), 39 deletions(-) rename lib/src/services/api/{media_received.dart => media_download.dart} (99%) rename lib/src/services/api/{media_send.dart => media_upload.dart} (99%) rename lib/src/services/{backup.identitiy.service.dart => twonly_safe.service.dart} (98%) diff --git a/lib/app.dart b/lib/app.dart index dd85911..732065a 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -3,7 +3,7 @@ import 'package:twonly/globals.dart'; import 'package:twonly/src/localization/generated/app_localizations.dart'; import 'package:twonly/src/providers/connection.provider.dart'; import 'package:twonly/src/providers/settings.provider.dart'; -import 'package:twonly/src/services/api/media_send.dart'; +import 'package:twonly/src/services/api/media_upload.dart'; import 'package:twonly/src/services/notification.service.dart'; import 'package:twonly/src/utils/storage.dart'; import 'package:twonly/src/views/onboarding.view.dart'; diff --git a/lib/main.dart b/lib/main.dart index 25e7768..11eaca3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,13 +4,13 @@ import 'package:provider/provider.dart'; import 'package:twonly/globals.dart'; import 'package:twonly/src/database/twonly_database.dart'; import 'package:twonly/src/providers/image_editor.provider.dart'; -import 'package:twonly/src/services/api/media_received.dart'; -import 'package:twonly/src/services/api/media_send.dart'; +import 'package:twonly/src/services/api/media_download.dart'; +import 'package:twonly/src/services/api/media_upload.dart'; import 'package:twonly/src/services/api.service.dart'; import 'package:flutter/material.dart'; import 'package:twonly/src/providers/connection.provider.dart'; import 'package:twonly/src/providers/settings.provider.dart'; -import 'package:twonly/src/services/backup.identitiy.service.dart'; +import 'package:twonly/src/services/twonly_safe.service.dart'; import 'package:twonly/src/services/fcm.service.dart'; import 'package:twonly/src/services/notification.service.dart'; import 'package:twonly/src/utils/log.dart'; diff --git a/lib/src/model/memory_item.model.dart b/lib/src/model/memory_item.model.dart index de36fcd..ad34245 100644 --- a/lib/src/model/memory_item.model.dart +++ b/lib/src/model/memory_item.model.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:drift/drift.dart'; import 'package:twonly/src/model/json/message.dart'; -import 'package:twonly/src/services/api/media_send.dart' as send; +import 'package:twonly/src/services/api/media_upload.dart' as send; import 'package:twonly/globals.dart'; import 'package:twonly/src/database/twonly_database.dart'; diff --git a/lib/src/services/api.service.dart b/lib/src/services/api.service.dart index f43da76..60ba797 100644 --- a/lib/src/services/api.service.dart +++ b/lib/src/services/api.service.dart @@ -21,8 +21,8 @@ import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pbserver.dart'; import 'package:twonly/src/services/api/messages.dart'; import 'package:twonly/src/services/api/utils.dart'; -import 'package:twonly/src/services/api/media_received.dart'; -import 'package:twonly/src/services/api/media_send.dart'; +import 'package:twonly/src/services/api/media_download.dart'; +import 'package:twonly/src/services/api/media_upload.dart'; import 'package:twonly/src/services/api/server_messages.dart'; import 'package:twonly/src/services/signal/identity.signal.dart'; import 'package:twonly/src/services/signal/prekeys.signal.dart'; diff --git a/lib/src/services/api/media_received.dart b/lib/src/services/api/media_download.dart similarity index 99% rename from lib/src/services/api/media_received.dart rename to lib/src/services/api/media_download.dart index c9b8231..0048864 100644 --- a/lib/src/services/api/media_received.dart +++ b/lib/src/services/api/media_download.dart @@ -9,7 +9,7 @@ import 'package:twonly/globals.dart'; import 'package:twonly/src/database/twonly_database.dart'; import 'package:twonly/src/database/tables/messages_table.dart'; import 'package:twonly/src/model/json/message.dart'; -import 'package:twonly/src/services/api/media_send.dart'; +import 'package:twonly/src/services/api/media_upload.dart'; import 'package:cryptography_plus/cryptography_plus.dart'; import 'package:twonly/src/services/api/utils.dart'; import 'package:twonly/src/utils/log.dart'; diff --git a/lib/src/services/api/media_send.dart b/lib/src/services/api/media_upload.dart similarity index 99% rename from lib/src/services/api/media_send.dart rename to lib/src/services/api/media_upload.dart index 568fab2..ba8110e 100644 --- a/lib/src/services/api/media_send.dart +++ b/lib/src/services/api/media_upload.dart @@ -20,8 +20,8 @@ import 'package:twonly/src/database/twonly_database.dart'; import 'package:twonly/src/model/json/message.dart'; import 'package:twonly/src/model/protobuf/api/http/http_requests.pb.dart'; import 'package:twonly/src/model/protobuf/api/websocket/error.pb.dart'; -import 'package:twonly/src/services/api/media_received.dart'; -import 'package:twonly/src/services/backup.identitiy.service.dart'; +import 'package:twonly/src/services/api/media_download.dart'; +import 'package:twonly/src/services/twonly_safe.service.dart'; import 'package:twonly/src/services/notification.service.dart'; import 'package:twonly/src/services/signal/encryption.signal.dart'; import 'package:twonly/src/utils/log.dart'; diff --git a/lib/src/services/api/server_messages.dart b/lib/src/services/api/server_messages.dart index f11482a..d19129e 100644 --- a/lib/src/services/api/server_messages.dart +++ b/lib/src/services/api/server_messages.dart @@ -14,10 +14,10 @@ import 'package:twonly/src/model/protobuf/api/websocket/client_to_server.pbserve import 'package:twonly/src/model/protobuf/api/websocket/error.pb.dart'; import 'package:twonly/src/model/protobuf/api/websocket/server_to_client.pb.dart' as server; -import 'package:twonly/src/services/api/media_send.dart'; +import 'package:twonly/src/services/api/media_upload.dart'; import 'package:twonly/src/services/api/messages.dart'; import 'package:twonly/src/services/api/utils.dart'; -import 'package:twonly/src/services/api/media_received.dart'; +import 'package:twonly/src/services/api/media_download.dart'; import 'package:twonly/src/services/notification.service.dart'; import 'package:twonly/src/services/signal/encryption.signal.dart'; import 'package:twonly/src/services/signal/identity.signal.dart'; diff --git a/lib/src/services/backup.identitiy.service.dart b/lib/src/services/twonly_safe.service.dart similarity index 98% rename from lib/src/services/backup.identitiy.service.dart rename to lib/src/services/twonly_safe.service.dart index 3414758..166f7b7 100644 --- a/lib/src/services/backup.identitiy.service.dart +++ b/lib/src/services/twonly_safe.service.dart @@ -13,7 +13,7 @@ import 'package:twonly/src/constants/secure_storage_keys.dart'; import 'package:twonly/src/database/twonly_database.dart'; import 'package:twonly/src/model/json/userdata.dart'; import 'package:twonly/src/model/protobuf/backup/backup.pb.dart'; -import 'package:twonly/src/services/api/media_send.dart'; +import 'package:twonly/src/services/api/media_upload.dart'; import 'package:twonly/src/utils/log.dart'; import 'package:twonly/src/utils/storage.dart'; import 'package:twonly/src/views/settings/backup/backup.view.dart'; @@ -37,7 +37,7 @@ Future getTwonlySafeBackupUrl() async { Future performTwonlySafeBackup({bool force = false}) async { final user = await getUser(); - if (user == null || user.twonlySafeBackup == null) { + if (user == null || user.twonlySafeBackup == null || user.isDemoUser) { Log.warn("perform twonly safe backup was called while it is disabled"); return; } diff --git a/lib/src/views/camera/camera_preview_components/save_to_gallery.dart b/lib/src/views/camera/camera_preview_components/save_to_gallery.dart index 5a99696..1d55386 100644 --- a/lib/src/views/camera/camera_preview_components/save_to_gallery.dart +++ b/lib/src/views/camera/camera_preview_components/save_to_gallery.dart @@ -3,7 +3,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:path/path.dart'; -import 'package:twonly/src/services/api/media_send.dart'; +import 'package:twonly/src/services/api/media_upload.dart'; import 'dart:typed_data'; import 'package:twonly/src/utils/misc.dart'; diff --git a/lib/src/views/camera/share_image_editor_view.dart b/lib/src/views/camera/share_image_editor_view.dart index 2a2e30f..469de3c 100644 --- a/lib/src/views/camera/share_image_editor_view.dart +++ b/lib/src/views/camera/share_image_editor_view.dart @@ -6,7 +6,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:twonly/globals.dart'; import 'package:twonly/src/model/protobuf/api/websocket/error.pb.dart' show ErrorCode; -import 'package:twonly/src/services/api/media_send.dart'; +import 'package:twonly/src/services/api/media_upload.dart'; import 'package:twonly/src/utils/log.dart'; import 'package:twonly/src/views/camera/camera_preview_components/save_to_gallery.dart'; import 'package:twonly/src/views/camera/image_editor/action_button.dart'; diff --git a/lib/src/views/camera/share_image_view.dart b/lib/src/views/camera/share_image_view.dart index 6797e9b..bd65a56 100644 --- a/lib/src/views/camera/share_image_view.dart +++ b/lib/src/views/camera/share_image_view.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:twonly/globals.dart'; import 'package:twonly/src/model/protobuf/api/websocket/error.pb.dart'; -import 'package:twonly/src/services/api/media_send.dart'; +import 'package:twonly/src/services/api/media_upload.dart'; import 'package:twonly/src/views/camera/share_image_components/best_friends_selector.dart'; import 'package:twonly/src/views/components/flame.dart'; import 'package:twonly/src/views/components/headline.dart'; diff --git a/lib/src/views/chats/chat_list.view.dart b/lib/src/views/chats/chat_list.view.dart index f531063..46e0389 100644 --- a/lib/src/views/chats/chat_list.view.dart +++ b/lib/src/views/chats/chat_list.view.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:provider/provider.dart'; import 'package:twonly/globals.dart'; -import 'package:twonly/src/services/api/media_received.dart'; +import 'package:twonly/src/services/api/media_download.dart'; import 'package:twonly/src/views/chats/chat_list_components/backup_notice.card.dart'; import 'package:twonly/src/views/chats/chat_list_components/connection_info.comp.dart'; import 'package:twonly/src/views/chats/chat_list_components/demo_user.card.dart'; diff --git a/lib/src/views/chats/chat_messages_components/chat_media_entry.dart b/lib/src/views/chats/chat_messages_components/chat_media_entry.dart index f732ba5..ea3e0fd 100644 --- a/lib/src/views/chats/chat_messages_components/chat_media_entry.dart +++ b/lib/src/views/chats/chat_messages_components/chat_media_entry.dart @@ -6,7 +6,7 @@ import 'package:twonly/src/database/twonly_database.dart'; import 'package:twonly/src/database/tables/messages_table.dart'; import 'package:twonly/src/model/json/message.dart'; import 'package:twonly/src/services/api/messages.dart'; -import 'package:twonly/src/services/api/media_received.dart' as received; +import 'package:twonly/src/services/api/media_download.dart' as received; import 'package:twonly/src/services/notification.service.dart'; import 'package:twonly/src/views/chats/media_viewer.view.dart'; import 'package:twonly/src/model/memory_item.model.dart'; diff --git a/lib/src/views/chats/chat_messages_components/in_chat_media_viewer.dart b/lib/src/views/chats/chat_messages_components/in_chat_media_viewer.dart index 110a86b..fdc5c8b 100644 --- a/lib/src/views/chats/chat_messages_components/in_chat_media_viewer.dart +++ b/lib/src/views/chats/chat_messages_components/in_chat_media_viewer.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:flutter/material.dart'; import 'package:twonly/globals.dart'; -import 'package:twonly/src/services/api/media_send.dart' as send; +import 'package:twonly/src/services/api/media_upload.dart' as send; import 'package:twonly/src/utils/log.dart'; import 'package:twonly/src/views/components/message_send_state_icon.dart'; import 'package:twonly/src/database/twonly_database.dart'; diff --git a/lib/src/views/chats/media_viewer.view.dart b/lib/src/views/chats/media_viewer.view.dart index 86fba28..9835a36 100644 --- a/lib/src/views/chats/media_viewer.view.dart +++ b/lib/src/views/chats/media_viewer.view.dart @@ -17,7 +17,7 @@ import 'package:twonly/src/database/twonly_database.dart'; import 'package:twonly/src/database/tables/messages_table.dart'; import 'package:twonly/src/model/json/message.dart'; import 'package:twonly/src/services/api/messages.dart'; -import 'package:twonly/src/services/api/media_received.dart'; +import 'package:twonly/src/services/api/media_download.dart'; import 'package:twonly/src/services/notification.service.dart'; import 'package:twonly/src/utils/misc.dart'; import 'package:twonly/src/utils/storage.dart'; diff --git a/lib/src/views/memories/memories.view.dart b/lib/src/views/memories/memories.view.dart index c95df90..e0d223c 100644 --- a/lib/src/views/memories/memories.view.dart +++ b/lib/src/views/memories/memories.view.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; import 'package:intl/intl.dart'; -import 'package:twonly/src/services/api/media_send.dart' as send; +import 'package:twonly/src/services/api/media_upload.dart' as send; import 'package:flutter/material.dart'; import 'package:twonly/globals.dart'; import 'package:twonly/src/database/twonly_database.dart'; diff --git a/lib/src/views/memories/memories_photo_slider.view.dart b/lib/src/views/memories/memories_photo_slider.view.dart index b74e809..cc2b9c4 100644 --- a/lib/src/views/memories/memories_photo_slider.view.dart +++ b/lib/src/views/memories/memories_photo_slider.view.dart @@ -5,8 +5,8 @@ import 'package:photo_view/photo_view.dart'; import 'package:photo_view/photo_view_gallery.dart'; import 'package:twonly/globals.dart'; import 'package:twonly/src/database/twonly_database.dart'; -import 'package:twonly/src/services/api/media_received.dart' as received; -import 'package:twonly/src/services/api/media_send.dart' as send; +import 'package:twonly/src/services/api/media_download.dart' as received; +import 'package:twonly/src/services/api/media_upload.dart' as send; import 'package:twonly/src/utils/misc.dart'; import 'package:twonly/src/views/camera/share_image_editor_view.dart'; import 'package:twonly/src/views/components/alert_dialog.dart'; diff --git a/lib/src/views/register.view.dart b/lib/src/views/register.view.dart index aa68d8a..1ee3a1c 100644 --- a/lib/src/views/register.view.dart +++ b/lib/src/views/register.view.dart @@ -144,18 +144,18 @@ class _RegisterViewState extends State { context.lang.registerUsernameDecoration, ), ), - const SizedBox(height: 5), - Center( - child: Padding( - padding: EdgeInsets.only(left: 10, right: 10), - child: Text( - context.lang.registerUsernameLimits, - textAlign: TextAlign.center, - style: TextStyle(fontSize: 9), - ), - ), - ), - const SizedBox(height: 20), + // const SizedBox(height: 5), + // Center( + // child: Padding( + // padding: EdgeInsets.only(left: 10, right: 10), + // child: Text( + // context.lang.registerUsernameLimits, + // textAlign: TextAlign.center, + // style: TextStyle(fontSize: 9), + // ), + // ), + // ), + const SizedBox(height: 30), Center( child: Text( context.lang.registerTwonlyCodeText, diff --git a/lib/src/views/settings/backup/backup.view.dart b/lib/src/views/settings/backup/backup.view.dart index 05c1903..bff5eb5 100644 --- a/lib/src/views/settings/backup/backup.view.dart +++ b/lib/src/views/settings/backup/backup.view.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:twonly/src/model/json/userdata.dart'; -import 'package:twonly/src/services/backup.identitiy.service.dart'; +import 'package:twonly/src/services/twonly_safe.service.dart'; import 'package:twonly/src/utils/misc.dart'; import 'package:twonly/src/utils/storage.dart'; import 'package:twonly/src/views/components/alert_dialog.dart'; diff --git a/lib/src/views/settings/backup/twonly_safe_backup.view.dart b/lib/src/views/settings/backup/twonly_safe_backup.view.dart index 4befe2d..61791b3 100644 --- a/lib/src/views/settings/backup/twonly_safe_backup.view.dart +++ b/lib/src/views/settings/backup/twonly_safe_backup.view.dart @@ -2,7 +2,7 @@ import 'package:flutter/services.dart' show rootBundle; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:twonly/src/services/backup.identitiy.service.dart'; +import 'package:twonly/src/services/twonly_safe.service.dart'; import 'package:twonly/src/utils/misc.dart'; import 'package:twonly/src/views/components/alert_dialog.dart'; import 'package:twonly/src/views/settings/backup/twonly_safe_server.view.dart'; diff --git a/lib/src/views/settings/data_and_storage.view.dart b/lib/src/views/settings/data_and_storage.view.dart index 54b03dd..a381130 100644 --- a/lib/src/views/settings/data_and_storage.view.dart +++ b/lib/src/views/settings/data_and_storage.view.dart @@ -1,6 +1,6 @@ import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:flutter/material.dart'; -import 'package:twonly/src/services/api/media_received.dart'; +import 'package:twonly/src/services/api/media_download.dart'; import 'package:twonly/src/utils/storage.dart'; import 'package:twonly/src/utils/misc.dart';