Migrate from flutter_cloud to awesome_cloud

Replaces all flutter_cloud imports and usage with awesome_cloud across the codebase. Updates dependency references in pubspec.yaml and pubspec.lock, removes flutter_cloud package and files, and adds/renames awesome_cloud package and its files. Adjusts cloud service implementations and screens to use awesome_cloud APIs, and updates HuaweiCloudService to use custom endpoints and client ID.

Author: Robert-Stackflow

lib/Models/cloud_service_config.dart

@@ -58,6 +58,7 @@ enum CloudServiceType {
   static List<String> toEnableStrings() {
     return [
       CloudServiceType.OneDrive.label,
+      CloudServiceType.HuaweiCloud.label,
       CloudServiceType.Dropbox.label,
       CloudServiceType.Webdav.label,
       CloudServiceType.S3Cloud.label,

lib/Screens/Backup/cloud_service_screen.dart

@@ -16,6 +16,7 @@
 import 'package:awesome_chewie/awesome_chewie.dart';
 import 'package:cloudotp/Models/cloud_service_config.dart';
 import 'package:cloudotp/Screens/Backup/dropbox_service_screen.dart';
+import 'package:cloudotp/Screens/Backup/huawei_service_screen.dart';
 import 'package:cloudotp/Screens/Backup/onedrive_service_screen.dart';
 import 'package:cloudotp/Screens/Backup/s3_service_screen.dart';
 import 'package:cloudotp/Screens/Backup/webdav_service_screen.dart';
@@ -46,7 +47,7 @@ class _CloudServiceScreenState extends State<CloudServiceScreen>
   void initState() {
     super.initState();
     tabController = TabController(
-      length: 4,
+      length: 5,
       vsync: this,
     );
     _typeController.selectIndex(_currentType.index);
@@ -84,6 +85,7 @@ class _CloudServiceScreenState extends State<CloudServiceScreen>
             controller: tabController,
             children: const [
               OneDriveServiceScreen(),
+              HuaweiCloudServiceScreen(),
               DropboxServiceScreen(),
               WebDavServiceScreen(),
               S3CloudServiceScreen(),

lib/Screens/Backup/dropbox_service_screen.dart

@@ -19,7 +19,7 @@ import 'package:awesome_chewie/awesome_chewie.dart';
 import 'package:cloudotp/Models/cloud_service_config.dart';
 import 'package:cloudotp/TokenUtils/Cloud/cloud_service.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_cloud/dropbox_response.dart';
+import 'package:awesome_cloud/awesome_cloud.dart';
 
 import '../../Database/cloud_service_config_dao.dart';
 import '../../TokenUtils/Cloud/dropbox_cloud_service.dart';

lib/Screens/Backup/googledrive_service_screen.dart

@@ -18,12 +18,12 @@ import 'dart:typed_data';
 import 'package:cloudotp/Models/cloud_service_config.dart';
 import 'package:cloudotp/TokenUtils/Cloud/cloud_service.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_cloud/googledrive_response.dart';
 
 import '../../Database/cloud_service_config_dao.dart';
 import '../../TokenUtils/Cloud/googledrive_cloud_service.dart';
 import '../../TokenUtils/export_token_util.dart';
 import '../../TokenUtils/import_token_util.dart';
+import 'package:awesome_cloud/awesome_cloud.dart';
 import 'package:awesome_chewie/awesome_chewie.dart';
 import '../../Widgets/BottomSheet/Backups/googledrive_backups_bottom_sheet.dart';
 import '../../generated/l10n.dart';

lib/Screens/Backup/huawei_service_screen.dart

@@ -18,7 +18,7 @@ import 'dart:typed_data';
 import 'package:cloudotp/Models/cloud_service_config.dart';
 import 'package:cloudotp/TokenUtils/Cloud/cloud_service.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_cloud/huaweicloud_response.dart';
+import 'package:awesome_cloud/awesome_cloud.dart';
 
 import '../../Database/cloud_service_config_dao.dart';
 import '../../TokenUtils/Cloud/huawei_cloud_service.dart';

lib/Screens/Backup/onedrive_service_screen.dart

@@ -19,8 +19,8 @@ import 'package:cloudotp/Models/cloud_service_config.dart';
 import 'package:cloudotp/TokenUtils/Cloud/cloud_service.dart';
 import 'package:cloudotp/Widgets/BottomSheet/Backups/onedrive_backups_bottom_sheet.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_cloud/onedrive_response.dart';
 
+import 'package:awesome_cloud/awesome_cloud.dart';
 import '../../Database/cloud_service_config_dao.dart';
 import '../../TokenUtils/Cloud/onedrive_cloud_service.dart';
 import '../../TokenUtils/export_token_util.dart';

lib/TokenUtils/Cloud/dropbox_cloud_service.dart

@@ -15,9 +15,8 @@
 
 import 'dart:typed_data';
 
+import 'package:awesome_cloud/awesome_cloud.dart';
 import 'package:cloudotp/Utils/app_provider.dart';
-import 'package:flutter_cloud/dropbox.dart';
-import 'package:flutter_cloud/dropbox_response.dart';
 import 'package:path/path.dart';
 
 import '../../Models/cloud_service_config.dart';
@@ -28,8 +27,6 @@ import 'cloud_service.dart';
 class DropboxCloudService extends CloudService {
   @override
   CloudServiceType get type => CloudServiceType.Dropbox;
-  static const String _redirectUrl =
-      'https://apps.cloudchewie.com/oauth/cloudotp/dropbox/callback';
   static const String _callbackUrl = 'cloudotp://auth/dropbox/callback';
   static const String _clientId = 'ljyx5bk2jq92esr';
   static const String _dropboxEmptyPath = '';
@@ -48,7 +45,6 @@ class DropboxCloudService extends CloudService {
   @override
   Future<void> init() async {
     dropbox = Dropbox(
-      redirectUrl: _callbackUrl,
       callbackUrl: _callbackUrl,
       clientId: _clientId,
     );
@@ -96,7 +92,8 @@ class DropboxCloudService extends CloudService {
 
   @override
   Future<bool> deleteFile(String path) async {
-    DropboxResponse response = await dropbox.delete(join(_dropboxPath, path));
+    DropboxResponse response =
+        await dropbox.deleteById(join(_dropboxPath, path));
     return response.isSuccess;
   }
 
@@ -123,7 +120,7 @@ class DropboxCloudService extends CloudService {
     String path, {
     Function(int p1, int p2)? onProgress,
   }) async {
-    DropboxResponse response = await dropbox.pull(path);
+    DropboxResponse response = await dropbox.pullById(path);
     return response.isSuccess ? response.bodyBytes ?? Uint8List(0) : null;
   }
 

lib/TokenUtils/Cloud/googledrive_cloud_service.dart

@@ -15,8 +15,7 @@
 
 import 'dart:typed_data';
 
-import 'package:flutter_cloud/googledrive.dart';
-import 'package:flutter_cloud/googledrive_response.dart';
+import 'package:awesome_cloud/awesome_cloud.dart';
 
 import '../../Models/cloud_service_config.dart';
 import '../../Utils/app_provider.dart';
@@ -27,8 +26,6 @@ import 'cloud_service.dart';
 class GoogleDriveCloudService extends CloudService {
   @override
   CloudServiceType get type => CloudServiceType.GoogleDrive;
-  static const String _redirectUrl =
-      'https://apps.cloudchewie.com/oauth/cloudotp/googledrive/callback';
   static const String _callbackUrl = 'cloudotp://auth/googledrive/callback';
   static const String _clientId =
       '547353482361-fi716v2qnfvh3aj515ok1r4cdqqhdqbh.apps.googleusercontent.com';
@@ -48,7 +45,6 @@ class GoogleDriveCloudService extends CloudService {
   @override
   Future<void> init() async {
     googledrive = GoogleDrive(
-      redirectUrl: _callbackUrl,
       callbackUrl: _callbackUrl,
       clientId: _clientId,
     );
@@ -159,7 +155,7 @@ class GoogleDriveCloudService extends CloudService {
     GoogleDriveResponse response = await googledrive.push(
       fileData,
       fileName,
-      _googledrivePathName,
+      fileName: _googledrivePathName,
     );
     deleteOldBackup();
     return response.isSuccess;

lib/TokenUtils/Cloud/huawei_cloud_service.dart

@@ -15,8 +15,7 @@
 
 import 'dart:typed_data';
 
-import 'package:flutter_cloud/huaweicloud.dart';
-import 'package:flutter_cloud/huaweicloud_response.dart';
+import 'package:awesome_cloud/awesome_cloud.dart';
 
 import '../../Models/cloud_service_config.dart';
 import '../../Utils/hive_util.dart';
@@ -26,10 +25,12 @@ import 'cloud_service.dart';
 class HuaweiCloudService extends CloudService {
   @override
   CloudServiceType get type => CloudServiceType.HuaweiCloud;
-  static const String _redirectUrl =
-      'https://apps.cloudchewie.com/oauth/cloudotp/huaweicloud/callback';
+  static const String _customAuthEndpoint =
+      'http://localhost:3009/oauth/cloudotp/huaweicloud/login';
+  static const String _customTokenEndpoint =
+      'http://localhost:3009/oauth/cloudotp/huaweicloud/token';
   static const String _callbackUrl = "cloudotp://auth/huaweicloud/callback";
-  static const String _clientId = '111829035';
+  static const String _clientId = '114701957';
   static const String _huaweiCloudEmptyPath = '';
   static const String _huaweiCloudPath = 'CloudOTP';
   final CloudServiceConfig _config;
@@ -45,8 +46,10 @@ class HuaweiCloudService extends CloudService {
 
   @override
   Future<void> init() async {
-    huaweiCloud = HuaweiCloud(
-      redirectUrl: _redirectUrl,
+    huaweiCloud = HuaweiCloud.server(
+      customAuthEndpoint: _customAuthEndpoint,
+      customTokenEndpoint: _customTokenEndpoint,
+      customRevokeEndpoint: "",
       callbackUrl: _callbackUrl,
       clientId: _clientId,
     );
@@ -158,7 +161,7 @@ class HuaweiCloudService extends CloudService {
     HuaweiCloudResponse response = await huaweiCloud.push(
       fileData,
       _huaweiCloudPath,
-      fileName,
+      fileName: fileName,
     );
     deleteOldBackup();
     return response.isSuccess;

lib/TokenUtils/Cloud/onedrive_cloud_service.dart

@@ -15,8 +15,7 @@
 
 import 'dart:typed_data';
 
-import 'package:flutter_cloud/onedrive.dart';
-import 'package:flutter_cloud/onedrive_response.dart';
+import 'package:awesome_cloud/awesome_cloud.dart';
 import 'package:path/path.dart';
 
 import '../../Models/cloud_service_config.dart';
@@ -28,8 +27,6 @@ import 'cloud_service.dart';
 class OneDriveCloudService extends CloudService {
   @override
   CloudServiceType get type => CloudServiceType.OneDrive;
-  static const String _redirectUrl =
-      'https://apps.cloudchewie.com/oauth/cloudotp/onedrive/callback';
   static const String _callbackUrl = 'cloudotp://auth/onedrive/callback';
   static const String _clientId = '3b953ca4-3dd4-4148-a80b-b1ac8c39fd97';
   static const String _onedrivePath = '/CloudOTP';
@@ -47,7 +44,6 @@ class OneDriveCloudService extends CloudService {
   @override
   Future<void> init() async {
     onedrive = OneDrive(
-      redirectUrl: _callbackUrl,
       callbackUrl: _callbackUrl,
       clientId: _clientId,
     );