Merge pull request #228 from Wolfteam/feature/remove_appcenter

feature/remove_appcenter

Author: Wolfteam

.fvm/fvm_config.json

@@ -1,3 +1,3 @@
 {
-  "flutterSdkVersion": "3.22.2"
+  "flutterSdkVersion": "3.22.3"
 }

.fvmrc

@@ -1,4 +1,4 @@
 {
-  "flutter": "3.22.2",
+  "flutter": "3.22.3",
   "flavors": {}
 }

android/app/build.gradle

@@ -104,10 +104,6 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation "com.jakewharton.threetenabp:threetenabp:1.2.3"
 
-    def appCenterSdkVersion = '4.4.5'
-    implementation "com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}"
-    implementation "com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}"
-
     // Required by the notifications plugin
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
     implementation 'androidx.window:window:1.0.0'

android/app/src/main/kotlin/com/miraisoft/shiori/MainActivity.kt

@@ -2,9 +2,6 @@ package com.miraisoft.shiori
 
 import android.util.Log
 import androidx.annotation.NonNull
-import com.microsoft.appcenter.AppCenter
-import com.microsoft.appcenter.analytics.Analytics
-import com.microsoft.appcenter.crashes.Crashes
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodCall
@@ -25,49 +22,6 @@ class MainActivity : FlutterActivity() {
         Log.d("onMethodCall", "[$methodChannelName] ${call.method}")
         try {
             when (call.method) {
-                "start" -> {
-                    if (activity.application == null) {
-                        val error = "Fail to resolve Application on registration"
-                        Log.e(call.method, error)
-                        result.error(call.method, error, Exception(error))
-                        return
-                    }
-
-                    val appSecret = call.argument<String>("secret")
-                    if (appSecret == null || appSecret.isEmpty()) {
-                        val error = "App secret is not set"
-                        Log.e(call.method, error)
-                        result.error(call.method, error, Exception(error))
-                        return
-                    }
-
-                    AppCenter.start(activity.application, appSecret, Analytics::class.java, Crashes::class.java)
-                }
-                "trackEvent" -> {
-                    val name = call.argument<String>("name")
-                    val properties = call.argument<Map<String, String>>("properties")
-                    Analytics.trackEvent(name, properties)
-                }
-                "getInstallId" -> {
-                    result.success(AppCenter.getInstallId().get()?.toString())
-                    return
-                }
-                "isCrashesEnabled" -> {
-                    result.success(Crashes.isEnabled().get())
-                    return
-                }
-                "configureCrashes" -> {
-                    val value = call.arguments as Boolean
-                    Crashes.setEnabled(value).get()
-                }
-                "isAnalyticsEnabled" -> {
-                    result.success(Analytics.isEnabled().get())
-                    return
-                }
-                "configureAnalytics" -> {
-                    val value = call.arguments as Boolean
-                    Analytics.setEnabled(value).get()
-                }
                 else -> {
                     result.notImplemented()
                 }

ios/Podfile

@@ -39,5 +39,3 @@ post_install do |installer|
     flutter_additional_ios_build_settings(target)
   end
 end
-
-pod 'AppCenter'

ios/Podfile.lock

@@ -1,12 +1,4 @@
 PODS:
-  - AppCenter (5.0.4):
-    - AppCenter/Analytics (= 5.0.4)
-    - AppCenter/Crashes (= 5.0.4)
-  - AppCenter/Analytics (5.0.4):
-    - AppCenter/Core
-  - AppCenter/Core (5.0.4)
-  - AppCenter/Crashes (5.0.4):
-    - AppCenter/Core
   - device_info_plus (0.0.1):
     - Flutter
   - devicelocale (0.0.1):
@@ -74,15 +66,15 @@ PODS:
     - FlutterMacOS
   - permission_handler_apple (9.3.0):
     - Flutter
-  - purchases_flutter (6.29.3):
+  - purchases_flutter (6.30.1):
     - Flutter
-    - PurchasesHybridCommon (= 10.8.0)
-  - PurchasesHybridCommon (10.8.0):
-    - RevenueCat (= 4.42.0)
+    - PurchasesHybridCommon (= 11.1.0)
+  - PurchasesHybridCommon (11.1.0):
+    - RevenueCat (= 4.43.2)
   - rate_my_app (2.2.0):
     - Flutter
     - FlutterMacOS
-  - RevenueCat (4.42.0)
+  - RevenueCat (4.43.2)
   - SDWebImage (5.18.3):
     - SDWebImage/Core (= 5.18.3)
   - SDWebImage/Core (5.18.3)
@@ -101,7 +93,6 @@ PODS:
     - Flutter
 
 DEPENDENCIES:
-  - AppCenter
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - devicelocale (from `.symlinks/plugins/devicelocale/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
@@ -126,7 +117,6 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
-    - AppCenter
     - DKImagePickerController
     - DKPhotoGallery
     - OrderedSet
@@ -181,7 +171,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
-  AppCenter: 85c92db0759d2792a65eb61d6842d2e86611a49a
   device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
   devicelocale: 35ba84dc7f45f527c3001535d8c8d104edd5d926
   DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
@@ -199,10 +188,10 @@ SPEC CHECKSUMS:
   package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
   path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
-  purchases_flutter: 71bcb09c0ef69612abe998ab895277421e85e968
-  PurchasesHybridCommon: dff07d838f74ac859a6ce20f0fbee527ba61e035
+  purchases_flutter: a7dba78a5da88e0672a881372d2a34478e723537
+  PurchasesHybridCommon: 4022d5944cb30ec44ba5159e42aa161fe0e30175
   rate_my_app: cd3e1c44d12f387482698ffaf6ea9bd669a69b94
-  RevenueCat: 39f2fbf5eda66f0f87bb72329406f45488f6916e
+  RevenueCat: 3d934653b7e8b09af88fd47e9e84cfaf5d0a89ba
   SDWebImage: 96e0c18ef14010b7485210e92fac888587ebb958
   share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
   shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
@@ -212,6 +201,6 @@ SPEC CHECKSUMS:
   url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586
   wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
 
-PODFILE CHECKSUM: a1eaf986c30d5a84309bbcd4434682ef102516a3
+PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
 
 COCOAPODS: 1.15.2

ios/Runner/AppDelegate.swift

@@ -1,8 +1,5 @@
 import UIKit
 import Flutter
-import AppCenter
-import AppCenterAnalytics
-import AppCenterCrashes
 
 @UIApplicationMain
 @objc class AppDelegate: FlutterAppDelegate {
@@ -29,52 +26,10 @@ import AppCenterCrashes
     public func methodChannelHandler(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
         debugPrint(call.method)
         switch call.method {
-        case "start":
-            guard let args: [String: Any] = (call.arguments as? [String: Any]) else {
-                result(FlutterError(code: "400", message:  "Bad arguments", details: "iOS could not recognize flutter arguments in method: (start)") )
-                return
-            }
-            
-            let secret = args["secret"] as! String
-            AppCenter.start(withAppSecret: secret, services: [
-                Analytics.self,
-                Crashes.self,
-            ])
-        case "trackEvent":
-            trackEvent(call: call, result: result)
-            return
-        case "getInstallId":
-            result(AppCenter.installId.uuidString)
-            return
-        case "isCrashesEnabled":
-            result(Crashes.enabled)
-            return
-        case "configureCrashes":
-            Crashes.enabled = call.arguments as! Bool
-        case "isAnalyticsEnabled":
-            result(Analytics.enabled)
-            return
-        case "configureAnalytics":
-            Analytics.enabled = call.arguments as! Bool
         default:
             result(FlutterMethodNotImplemented);
             return
         }
         result(nil);
     }
-    
-    private func trackEvent(call: FlutterMethodCall, result: FlutterResult) {
-        guard let args:[String: Any] = (call.arguments as? [String: Any]) else {
-            result(FlutterError(code: "400", message:  "Bad arguments", details: "iOS could not recognize flutter arguments in method: (trackEvent)") )
-            return
-        }
-        
-        let name = args["name"] as? String
-        let properties = args["properties"] as? [String: String]
-        if(name != nil) {
-            Analytics.trackEvent(name!, withProperties: properties)
-        }
-        
-        result(nil)
-    }
 }

lib/application/game_codes/game_codes_bloc.dart

@@ -162,7 +162,7 @@ class GameCodesBloc extends Bloc<GameCodesEvent, GameCodesState> {
       return true;
     }
 
-    final isAfter = DateTime.now().isAfter(lastCheckedDate.add(const Duration(hours: 4)));
+    final isAfter = DateTime.now().isAfter(lastCheckedDate.add(const Duration(hours: 3)));
     if (!isAfter) {
       return false;
     }

lib/application/main/main_bloc.dart

@@ -67,11 +67,7 @@ class MainBloc extends Bloc<MainEvent, MainState> {
     yield s;
   }
 
-  Future<MainState> _init({
-    bool languageChanged = false,
-    bool init = false,
-    AppResourceUpdateResultType? updateResult,
-  }) async {
+  Future<MainState> _init({bool languageChanged = false, bool init = false, AppResourceUpdateResultType? updateResult}) async {
     _logger.info(runtimeType, '_init: Initializing all..');
     await _genshinService.init(_settingsService.language, noResourcesHaveBeenDownloaded: _settingsService.noResourcesHasBeenDownloaded);
 

lib/application/splash/splash_bloc.dart

@@ -3,9 +3,15 @@ import 'dart:async';
 import 'package:bloc/bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:shiori/domain/enums/enums.dart';
+import 'package:shiori/domain/extensions/datetime_extensions.dart';
+import 'package:shiori/domain/models/dtos.dart';
+import 'package:shiori/domain/models/entities.dart';
 import 'package:shiori/domain/models/models.dart';
+import 'package:shiori/domain/services/api_service.dart';
+import 'package:shiori/domain/services/data_service.dart';
 import 'package:shiori/domain/services/device_info_service.dart';
 import 'package:shiori/domain/services/locale_service.dart';
+import 'package:shiori/domain/services/network_service.dart';
 import 'package:shiori/domain/services/resources_service.dart';
 import 'package:shiori/domain/services/settings_service.dart';
 import 'package:shiori/domain/services/telemetry_service.dart';
@@ -20,6 +26,9 @@ class SplashBloc extends Bloc<SplashEvent, SplashState> {
   final SettingsService _settingsService;
   final DeviceInfoService _deviceInfoService;
   final TelemetryService _telemetryService;
+  final DataService _dataService;
+  final ApiService _apiService;
+  final NetworkService _networkService;
   final LanguageModel _language;
 
   StreamSubscription? _downloadStream;
@@ -29,12 +38,17 @@ class SplashBloc extends Bloc<SplashEvent, SplashState> {
     this._settingsService,
     this._deviceInfoService,
     this._telemetryService,
+    this._dataService,
+    this._apiService,
+    this._networkService,
     LocaleService localeService,
   )   : _language = localeService.getLocaleWithoutLang(),
         super(const SplashState.loading());
 
   @override
   Stream<SplashState> mapEventToState(SplashEvent event) async* {
+    await _sendTelemetryData();
+
     if (event is _Init) {
       final noResourcesHasBeenDownloaded = _settingsService.noResourcesHasBeenDownloaded;
       //This is just to trigger a change in the ui
@@ -209,4 +223,23 @@ class SplashBloc extends Bloc<SplashEvent, SplashState> {
     return (type == AppResourceUpdateResultType.unknownError || type == AppResourceUpdateResultType.apiIsUnavailable) &&
         _settingsService.noResourcesHasBeenDownloaded;
   }
+
+  Future<void> _sendTelemetryData() async {
+    final bool isNetworkAvailable = await _networkService.isInternetAvailable();
+    if (!isNetworkAvailable) {
+      return;
+    }
+    final List<Telemetry> telemetryData = _dataService.telemetry.getAll();
+    final bool send = telemetryData.isNotEmpty && telemetryData.length > 5;
+    if (!send) {
+      return;
+    }
+
+    final logs = telemetryData.map((t) => SaveAppLogRequestDto(timestamp: t.createdAt.ticks, message: t.message)).toList();
+    final request = SaveAppLogsRequestDto(logs: logs);
+    await Future.wait([
+      _apiService.sendTelemetryData(request),
+      _dataService.telemetry.deleteByIds(telemetryData.map((t) => t.id).toList()),
+    ]);
+  }
 }