Setup fixes

Author: TaeHagen

.dart_tool/build/fcd1995bc647fb959e82ea360c6c2c9a/asset_graph.json

@@ -168,6 +168,38 @@ class ChatCreatorState extends OptimizedState<ChatCreator> {
     selectedContacts.add(c);
     try {
       c.iMessage.value = await backend.handleiMessageState(c.address);
+      if (!c.iMessage.value! && !ss.settings.nonIMessageWarning.value) {
+        await showDialog(
+          context: Get.context!,
+          barrierDismissible: false,
+          builder: (BuildContext context) {
+            return AlertDialog(
+              title: Text(
+                "This recipient is GREEN because they do not have iMessage or you are being rate-limited.",
+                style: context.theme.textTheme.titleLarge,
+              ),
+              content: Text(
+                "${ss.settings.smsForwardingTargets.isEmpty ? 'You can start a text here, and sending it will open your default messaging app. ' : ''}Rate limits can start at 0 users for brand new accounts. The only way to resolve a rate limit is patience, trying to reconfigure or re-install to 'fix' the rate limit will result in being temporarily blocked from iMessage.",
+                style: context.theme.textTheme.bodyLarge,
+              ),
+              backgroundColor: context.theme.colorScheme.properSurface,
+              actions: <Widget>[
+                TextButton(
+                  child: Text(
+                    "Ok",
+                    style: context.theme.textTheme.bodyLarge!.copyWith(color: context.theme.colorScheme.primary),
+                  ),
+                  onPressed: () async {
+                    Navigator.of(context).pop();
+                    ss.settings.nonIMessageWarning.value = true;
+                    await ss.settings.saveOne('nonIMessageWarning');
+                  },
+                ),
+              ],
+            );
+          },
+        );
+      }
     } catch (_) {}
     addressController.text = "";
     findExistingChat();

lib/app/layouts/chat_creator/chat_creator.dart

@@ -287,7 +287,23 @@ class _AppleId2FAState extends OptimizedState<AppleId2FA> {
     } catch (e) {
       if (e is AnyhowException) {
         if (e.message.contains("MOBILEME_TERMS_OF_SERVICE_UPDATE")) {
-          await controller.updateAccountUi((finished) => setState(() { loading = finished; }));
+          await controller.updateAccountUi((finished) => setState(() { 
+            loading = finished; 
+            if (!finished) {
+              if (controller.success) {
+                controller.pageController.nextPage(
+                  duration: const Duration(milliseconds: 300),
+                  curve: Curves.easeInOut,
+                );
+              } else {
+                controller.pageController.previousPage(
+                  duration: const Duration(milliseconds: 300),
+                  curve: Curves.easeInOut,
+                );
+              }
+              FocusManager.instance.primaryFocus?.unfocus();  
+            }
+            }));
         }
         controller.updateConnectError(e.message);
       }

lib/app/layouts/setup/pages/rustpush/appleid_2fa.dart

@@ -451,15 +451,16 @@ class _AppleIdLoginState extends OptimizedState<AppleIdLogin> {
       loading = true;
     });
     try {
-      var (account, result, user) = await api.tryAuth(
+      var (account, result) = await api.tryAuth(
         path: pushService.statePath,
         conf: controller.config!,
         conn: controller.connection!,
         anisette: controller.anisette!, 
         creds: password == null ? null : (appleId, password),
       );
-      controller.currentAppleUser = user;
       controller.currentAppleAccount = account;
+      controller.currentAppleUser = await api.tryIcloudLogin(path: pushService.statePath, conf: controller.config!, account: account);
+
       result = await controller.updateLoginState(result);
 
 
@@ -498,7 +499,21 @@ class _AppleIdLoginState extends OptimizedState<AppleIdLogin> {
     } catch (e) {
       if (e is AnyhowException) {
         if (e.message.contains("MOBILEME_TERMS_OF_SERVICE_UPDATE")) {
-          await controller.updateAccountUi((finished) => setState(() { loading = finished; }));
+          await controller.updateAccountUi((finished) => setState(() { 
+            loading = finished; 
+            if (!finished) {
+              if (!controller.success) {
+                return;
+              }
+              controller.goingTo2fa = false;
+              controller.pageController.animateToPage(
+                controller.pageController.page!.toInt() + 2,
+                duration: const Duration(milliseconds: 300),
+                curve: Curves.easeInOut,
+              );
+              FocusManager.instance.primaryFocus?.unfocus();
+            }
+          }));
         }
         controller.updateConnectError(e.message);
       }

lib/app/layouts/setup/pages/rustpush/appleid_login.dart

@@ -192,11 +192,11 @@ class SetupViewController extends StatefulController {
     availableIAP.value = details.productDetailsList.first.subscriptionOfferDetails?.first;
   }
 
-  void updateSucceeded(Function finish) async {
+  void updateSucceeded(Function finish, api.UpdateAccountFinish updateFinish) async {
     finish(true);
     updateConnectError('');
     try {
-      currentAppleUser = await api.doLogin(path: pushService.statePath, account: currentAppleAccount!, anisette: anisette!, osConfig: config!, cookie: "termsAccepted=true");
+      currentAppleUser = await api.doLogin(path: pushService.statePath, account: currentAppleAccount!, osConfig: config!, finish: updateFinish);
       ss.settings.userName.value = await api.getUserName(state: currentAppleAccount!);
       await doRegister();
     } catch (e) {
@@ -213,80 +213,93 @@ class SetupViewController extends StatefulController {
   }
 
   Future<void> updateAccountUi(Function finish) async {
-    var data = await api.updateAccountHeaders(account: currentAppleAccount!);
+    var (data, finalI) = await api.updateAccountHeaders(account: currentAppleAccount!, config: config!);
     var request = URLRequest(url: WebUri("https://inappwebview.dev/"));
 
     double height = 400;
     showDialog(
       context: Get.context!,
       builder: (context) => StatefulBuilder(
-      builder: (context, setState) {
-        return Center(child: Container(
-        height: height,
-      child: InAppWebView(
-        initialUrlRequest: request,
-        initialData: InAppWebViewInitialData(data: data, baseUrl: WebUri("https://setup.icloud.com/setup/update_account_ui")),
-        initialSettings: InAppWebViewSettings(
-          useShouldInterceptAjaxRequest: true,
-          interceptOnlyAsyncAjaxRequests: false,
-          useShouldInterceptFetchRequest: true,
-        ),
-        shouldInterceptAjaxRequest: (controller, request) async {
-          var anisette = await api.getAnisetteHeaders(state: this.anisette!, config: config!);
-          for (var header in anisette.entries) {
-            request.headers!.setRequestHeader(header.key, header.value);
-          }
-          return request;
-        },
-        shouldInterceptFetchRequest: (controller, request) async {
-          var anisette = await api.getAnisetteHeaders(state: this.anisette!, config: config!);
-          request.headers ??= {};
-          request.headers!.addAll(anisette);
-          return request;
-        },
-        onWebViewCreated: (controller) {
-          controller.addJavaScriptHandler(handlerName: 'log', callback: (args) {
-            Logger.info("AppleAccountSetup ${args[0]}");
-          });
-          controller.addJavaScriptHandler(handlerName: 'cancel', callback: (args) {
-            Get.back();
-          });
-          controller.addJavaScriptHandler(handlerName: 'updateSucceeded', callback: (args) {
-            updateSucceeded(finish);
-            Get.back();
-          });
-          // for ios, also hijacks macos because ios doesn't load prefpange-setupservice.js, loads ios-setupservice.js but that doesn't work
-          controller.addJavaScriptHandler(handlerName: 'confirmWithCallback', callback: (args) {
-            updateSucceeded(finish);
-            Get.back();
-          });
-          controller.addJavaScriptHandler(handlerName: 'resizeToWindow', callback: (args) {
-            setState(() {
-              height = args[1];
-            });
-          });
-          controller.injectJavascriptFileFromAsset(assetFilePath: "assets/scripts/AppleAccountSetup.js");
-        },
-      )),);
-      })
+        builder: (context, setState) {
+          return Center(child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Container(
+                height: height,
+                child: InAppWebView(
+                  initialUrlRequest: request,
+                  initialData: InAppWebViewInitialData(data: data, baseUrl: WebUri("https://setup.icloud.com/setup/update_account_ui")),
+                  initialSettings: InAppWebViewSettings(
+                    useShouldInterceptAjaxRequest: true,
+                    interceptOnlyAsyncAjaxRequests: false,
+                    useShouldInterceptFetchRequest: true,
+                  ),
+                  shouldInterceptAjaxRequest: (controller, request) async {
+                    var anisette = await api.getAnisetteHeaders(state: this.anisette!, config: config!);
+                    for (var header in anisette.entries) {
+                      request.headers!.setRequestHeader(header.key, header.value);
+                    }
+                    return request;
+                  },
+                  shouldInterceptFetchRequest: (controller, request) async {
+                    var anisette = await api.getAnisetteHeaders(state: this.anisette!, config: config!);
+                    request.headers ??= {};
+                    request.headers!.addAll(anisette);
+                    return request;
+                  },
+                  onWebViewCreated: (controller) {
+                    controller.addJavaScriptHandler(handlerName: 'log', callback: (args) {
+                      Logger.info("AppleAccountSetup ${args[0]}");
+                    });
+                    controller.addJavaScriptHandler(handlerName: 'cancel', callback: (args) {
+                      Get.back();
+                    });
+                    controller.addJavaScriptHandler(handlerName: 'updateSucceeded', callback: (args) {
+                      updateSucceeded(finish, finalI);
+                      Get.back();
+                    });
+                    // for ios, also hijacks macos because ios doesn't load prefpange-setupservice.js, loads ios-setupservice.js but that doesn't work
+                    controller.addJavaScriptHandler(handlerName: 'confirmWithCallback', callback: (args) {
+                      updateSucceeded(finish, finalI);
+                      Get.back();
+                    });
+                    controller.addJavaScriptHandler(handlerName: 'resizeToWindow', callback: (args) {
+                      setState(() {
+                        height = args[1];
+                      });
+                    });
+                    controller.injectJavascriptFileFromAsset(assetFilePath: "assets/scripts/AppleAccountSetup.js");
+                  },
+                )
+              ),
+              TextButton(
+                onPressed: () {
+                  updateSucceeded(finish, finalI);
+                  Get.back();
+                },
+                child: const Text('Accept Terms'),
+              ),
+            ],
+          ));
+        }
+      )
     );
   }
 
   Future<api.LoginState> updateLoginState(api.LoginState ret) async {
     if (ret is api.LoginState_NeedsLogin) {
-      api.IdsUser? user;
       ArcMutexAppleAccountDefaultAnisetteProvider account;
-      (account, ret, user) = await api.tryAuth(
+      (account, ret) = await api.tryAuth(
         path: pushService.statePath,
         conf: config!,
         conn: connection!,
         anisette: anisette!, 
 
         creds: twoFaCreds
       );
-      currentAppleUser = user;
       currentAppleAccount?.dispose();
       currentAppleAccount = account;
+      currentAppleUser = await api.tryIcloudLogin(path: pushService.statePath, conf: config!, account: account);
     }
     if (ret is api.LoginState_NeedsDevice2FA) {
       // subscribe now to not miss the 2fa message
@@ -446,7 +459,7 @@ class SetupViewController extends StatefulController {
                     Align(
                       alignment: Alignment.center,
                       child: Text(
-                        "The above message is from Apple.\nWarning: Do not contact Apple support for help with OpenBubbles. For assistance, join our Discord from our website. If you can't login on this Mac, call Apple support.\n${RustPushBBUtils.modelToUser(devInfo.name)}\nS/N: ${devInfo.serial}\nmacOS ${devInfo.osVersion}",
+                        "The above message is from Apple.\nWarning: Do not contact Apple support for help with OpenBubbles. For assistance, join our Discord from our website. If you can't login on this Apple Device, call Apple support. When clicking the contact button below, choose 'Get Started,' not 'Chat,' and then choose 'Apple Device.' Do not mention you are using OpenBubbles.\n${RustPushBBUtils.modelToUser(devInfo.name)}\nS/N: ${devInfo.serial}\nmacOS ${devInfo.osVersion}",
                         textAlign: TextAlign.center,
                         style: Get.textTheme.bodySmall,
                       )
@@ -456,7 +469,7 @@ class SetupViewController extends StatefulController {
                 actions: [
                   if (response.action != null)
                     TextButton(
-                        onPressed: () => launchUrl(Uri.parse(response.action!.url), mode: LaunchMode.externalApplication),
+                        onPressed: () => launchUrl(Uri.parse("https://apple.co/IMFT-mac"), mode: LaunchMode.externalApplication),
                         child: Text(response.action!.button, style: context.theme.textTheme.bodyLarge!.copyWith(color: context.theme.colorScheme.primary))),
                   TextButton(
                       onPressed: () => Get.back(),
@@ -725,7 +738,7 @@ class SetupViewController extends StatefulController {
                     if (status.data.toString().contains("No device available!")) {
                       Timer(const Duration(milliseconds: 100), () => pushService.offerHostedRefund(false));
                     }
-                    throw Exception("Failed to swap ${status.statusCode}");
+                    throw Exception("Failed to swap ${status.statusCode} ${status.data.toString()}");
                   }
 
                   var newTicket = status.data["new_ticket"];
@@ -1262,4 +1275,4 @@ class _ErrorTextState extends CustomState<ErrorText, String, SetupViewController
       ],
     );
   }
-}
+}

lib/app/layouts/setup/setup_view.dart

@@ -202,6 +202,7 @@ class Settings {
   final RxList<String> smsRoutingTargets = <String>[].obs;
   final RxMap<String, String> smsForwardingTargets = <String, String>{}.obs;
   final RxBool warnedTextChats = false.obs;
+  final RxBool nonIMessageWarning = false.obs;
   final RxBool isTester = false.obs;
 
   final RxBool enableShareZen = false.obs;
@@ -436,6 +437,7 @@ class Settings {
       'lastLocation': lastLocation,
       'enableShareZen': enableShareZen.value,
       'warnedTextChats': warnedTextChats.value,
+      'nonIMessageWarning': nonIMessageWarning.value,
       'zenModeAware': zenModeAware.value,
       'isTester': isTester.value,
       'cloudSyncingEnabled': cloudSyncingEnabled.value,
@@ -613,6 +615,7 @@ class Settings {
     ss.settings.smsForwardingTargets.value = map['smsIncomingTargets'] ?? {};
     ss.settings.enableShareZen.value = map['enableShareZen'] ?? false;
     ss.settings.warnedTextChats.value = map['warnedTextChats'] ?? false;
+    ss.settings.nonIMessageWarning.value = map['nonIMessageWarning'] ?? false;
     ss.settings.zenModeAware.value = map['zenModeAware'] ?? false;
     ss.settings.smsRoutingTargets.value = (map['smsForwardingTargets']?.runtimeType == String ? jsonDecode(map['smsForwardingTargets']) as List : []).cast<String>();
     ss.settings.developerMode.value = (map['developerMode']?.runtimeType == String ? jsonDecode(map['developerMode']) as List : []).cast<String>();
@@ -788,6 +791,7 @@ class Settings {
     s.smsForwardingTargets.value = map['smsIncomingTargets'] is String ? jsonDecode(map['smsIncomingTargets']).cast<String, String>() : <String, String>{};
     s.enableShareZen.value = map['enableShareZen'] ?? false;
     s.warnedTextChats.value = map['warnedTextChats'] ?? false;
+    s.nonIMessageWarning.value = map['nonIMessageWarning'] ?? false;
     s.zenModeAware.value = map['zenModeAware'] ?? false;
     s.smsRoutingTargets.value = (map['smsForwardingTargets']?.runtimeType == String ? jsonDecode(map['smsForwardingTargets']) as List : []).cast<String>();
     s.developerMode.value = (map['developerMode']?.runtimeType == String ? jsonDecode(map['developerMode']) as List : []).cast<String>();