feat: improve appearance at the different sizes

feat: hide space labels when showing same-space windows (closes #3766 )
chore: preload fewer recycled views ahead of time
2024-11-02 00:05:27 +01:00 · 2024-11-02 00:05:27 +01:00 · 2024-11-02 00:05:27 +01:00 · 2024-11-02 00:05:27 +01:00 · 2024-10-31 22:57:53 +01:00 · 2024-10-31 22:57:53 +01:00
405 changed files with 47366 additions and 13663 deletions
@@ -0,0 +1,2 @@
+github: lwouis
+patreon: lwouis
@@ -13,7 +13,7 @@ A clear and concise description of what the bug is. What happened, and what you

 **Screenshots / video**

-Add screenshots to help explain your problem. You can also use Loom to easily record your screen to show the bug in action. That is *really* helpful!
+Add screenshots to help explain your problem. You can also record your screen to show the bug in action. That is *really* helpful!

 **Steps to reproduce the bug**

@@ -21,3 +21,9 @@ Add screenshots to help explain your problem. You can also use Loom to easily re
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
+
+**Your environment**
+
+* AltTab version: 
+* macOS version: 
+* Other relevant info: e.g. using external keyboard, multiple monitors, etc
@@ -6,7 +6,8 @@ IDEWorkspaceChecks.plist
 /DerivedData/
 /build/
 .DS_Store
-docs/_site/
+/docs/_site/
+/docs/vendor/
 codesign.conf
 codesign.crt
 codesign.key
@@ -0,0 +1,8 @@
+retain_objc_accessible: true
+schemes:
+  - Release
+targets:
+  - alt-tab-macos
+workspace: alt-tab-macos.xcworkspace
+report_exclude:
+  - src/api-wrappers/PrivateApis.swift
@@ -0,0 +1,6 @@
+# We can find the rules here.
+# https://github.com/nicklockwood/SwiftFormat/blob/main/Rules.md
+
+--swiftversion 5.5
+
+--maxwidth 120
@@ -0,0 +1,11 @@
+# **/*.swift: Matches all .swift files in the current directory and all its subdirectories.
+# src/**/*.swift: Matches all .swift files in the src directory and all its subdirectories.
+# !node_modules/**: Excludes all files in the node_modules directory and all its subdirectories.
+
+Pods/**
+Generated/**
+
+**/PrivateApis.swift
+
+# We will open a new branch to deal with code format issues at the next release.
+**/*
@@ -1,11 +1,12 @@
 branches:
  only:
    - master
+    - develop
 os: osx
-osx_image: xcode12.3
+osx_image: xcode13.4
 language: node_js
 node_js:
-  - 10
+  - 16
 addons:
  ssh_known_hosts: github.com
  homebrew:
@@ -20,13 +21,14 @@ env:
    - APP_NAME="$(awk -F ' = ' '/PRODUCT_NAME/ { print $2; }' < config/base.xcconfig)"
 install: true # disable default install
 script: scripts/travis.sh
+before_deploy: if [[ $TRAVIS_TEST_RESULT == 1 ]]; then echo "build failed; exiting to prevent deploy phases"; sleep 2; exit 1; fi
 deploy:
  provider: releases
  token:
-    secure: wcAMT2rbXhhdk6lsc6EG9VZZkSW0BjOwjYSyXzHjKrgiXsQcZAzAsOkuisj8EfeYN9/uhpa8XX7f5KsdkE5reMqVGGWqdmJU4NnmK5Aew0LmBbzFHfffliQecVCzMmGYPmhPcDxAjidYxgCMrMbvQFaElc0WXdIsQNcaNieSkEgZw6TwGsTxgHXABD2e575K3SN/PPcq7Nx5mRZkURI7YLmo2KfsD2OPR4IcEXFpJRFbPcAZIpKaHUIC2VzpayJA93pBe+siwU150p04PzfSs/nTH/nUO9m24SUi6kAIzVN77cExvX+JDnQoVLz0V45L0iJjkKDTVb07rVOsfm6Pcuaaj2ZVXlpujSb7B5LDUIspUn/NnqMLOtzbSTuaGcx2u+zCcC0b17KooznilQ/sFq3YpeNdmjL4VL5fsw1hdpjcP6S9DqZ90TJZqy6xBQP5NubuJukH//BRilhWGfnq5rOFUlqrN8aApJ7gYry0K2rB8rVWWvA9cU+zX351iy0EERICEU6q3rQwq8gFUbdNATPJJgNg7n0PaNXSQTTF9VluZTRVUtMrpA0hWe7dn+Tvrvhrnhmqvccw3Qfw/i3SECIDHHtsjwLqHCx5gkz/xUdf7+t3k6x+r6Veua0Z3jvyVhdHprU47VTSUhM/n87EiKyNRuKa9IpA18eSlZ59exU=
+    secure: wZUHfOs+JQ0ikNMJ8BnM+8fuoQdhgOEQpNd01ueZxe760GAAjSbq1icME8qaYJJMk1G6n14jo9ecEhzxF0XV8hSdy4WtikK7l5SXiOx5Efuh/tNscmHggGk235eLwQD9pglePZsP3xJUB1BHEj260rypkjnSx5kVOfLUeB1ASeg4+KdxZd2vXjwel+YQf+dYbNUYtwoWqjiLbqT1ao+0q04MPgD2c9jb+HnsA94LUGb44lPXqfUJ+xG2LxBpcDW/q1JhFXL/AmJb0dOOEVzzrBqfWysPukgPMONexZse4c3BBqkMI52ZuF3OoEVAffofmuGKiR5OoyU/hW17xi9jGeb79r+Xt4RdaJAgwcn7/7GtemYKUJp8jhLGsy9XZJShENX7UHTkP3L4iyOrd2Wz+ctZWAebyNReLt985/xTaplpDiQrPcKAuQNBa4sgWk5rIsf7Z0tcBfZau/fQl9Q4100xTbwC+GeAbL0IyXG3kVzQGsGllXHr/2JM1sj7rmKA7lmDlp7xiOBCPscn2YCT87U+F6VbYoNvnxne0igQOUwrvX4qa4XlYrUXDeHcyKku0m8znY74nOu+m6LXkIt8r29pi6Xac0/ZGMwKZRUvKg/skamWPRoy9DAVd8TBQW1c91oYKmqDQRy0eWnD6X1djcKywJ7WlSQDejebJql0h+o=
  file_glob: true
  file: "$XCODE_BUILD_PATH/*.zip"
  skip_cleanup: true
  on:
    repo: lwouis/alt-tab-macos
-after_deploy: scripts/update_homebrew_cask.sh
+after_deploy: scripts/after_deploy.sh
@@ -52,7 +52,5 @@
 	<string>2e9SQOBoaKElchSa/4QDli/nvYkyuDNfynfzBF6vJK4=</string>
 	<key>SUScheduledCheckInterval</key>
 	<string>604800</string>
-	<key>NSAppleEventsUsageDescription</key>
-	<string>$(PRODUCT_NAME) needs this permission to toggle "Start at login"</string>
 </dict>
 </plist>
@@ -6,6 +6,12 @@ verify_ssl = true
 [dev-packages]

 [packages]
-fonttools = "*"
+fonttools = "==4.8.1"
+googletrans = "==3.0.0"

-[scripts]
+[requires]
+python_version = "3.6"
+
+[scripts]
+font2png = "scripts/convert_font_to_png.sh"
+translate = "python scripts/translate_i18n_tools.py resources/l10n --retry_translate"
@@ -1,7 +1,7 @@
 {
    "_meta": {
        "hash": {
-            "sha256": "8f11c81dff5e32871b7cb2314acb76fd1fb4a06fdb403a65bc6749fe3770eda6"
+            "sha256": "00c7c75d00988a027e56c90f3a0bbba05aec3b41b2f7fd9be24f3cb27bf15eaf"
        },
        "pipfile-spec": 6,
        "requires": {},
@@ -14,13 +14,111 @@
        ]
    },
    "default": {
+        "certifi": {
+            "hashes": [
+                "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8",
+                "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==2024.8.30"
+        },
+        "chardet": {
+            "hashes": [
+                "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
+                "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
+            ],
+            "version": "==3.0.4"
+        },
        "fonttools": {
            "hashes": [
                "sha256:596c0e8399c650dbf1048b7ca6fc7b12bd79a7db0981f3b87743de8c2b7512de",
                "sha256:6d241d319ea9eae4c4ee27cbd1db8656dbd496dd9aa884401debfab3a4c7d82b"
            ],
            "index": "pypi",
+            "markers": "python_version >= '3.6'",
            "version": "==4.8.1"
+        },
+        "googletrans": {
+            "hashes": [
+                "sha256:44caeea42d91ff6ead5c2d49db2b88de66c45c2fe874c8ec03eb9b4ceb3a533d"
+            ],
+            "index": "pypi",
+            "version": "==3.0.0"
+        },
+        "h11": {
+            "hashes": [
+                "sha256:33d4bca7be0fa039f4e84d50ab00531047e53d6ee8ffbc83501ea602c169cae1",
+                "sha256:4bc6d6a1238b7615b266ada57e0618568066f57dd6fa967d1290ec9309b2f2f1"
+            ],
+            "version": "==0.9.0"
+        },
+        "h2": {
+            "hashes": [
+                "sha256:61e0f6601fa709f35cdb730863b4e5ec7ad449792add80d1410d4174ed139af5",
+                "sha256:875f41ebd6f2c44781259005b157faed1a5031df3ae5aa7bcb4628a6c0782f14"
+            ],
+            "version": "==3.2.0"
+        },
+        "hpack": {
+            "hashes": [
+                "sha256:0edd79eda27a53ba5be2dfabf3b15780928a0dff6eb0c60a3d6767720e970c89",
+                "sha256:8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2"
+            ],
+            "version": "==3.0.0"
+        },
+        "hstspreload": {
+            "hashes": [
+                "sha256:2ab4518495a132c4ae430c474afffd12938852c6eec68ce1368c8f7858dc3076",
+                "sha256:9c1b2d0313899d3ff9dac03ab39d53fed95c32eef9862e7eabee8dc07dfd589c"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==2024.9.1"
+        },
+        "httpcore": {
+            "hashes": [
+                "sha256:9850fe97a166a794d7e920590d5ec49a05488884c9fc8b5dba8561effab0c2a0",
+                "sha256:ecc5949310d9dae4de64648a4ce529f86df1f232ce23dcfefe737c24d21dfbe9"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==0.9.1"
+        },
+        "httpx": {
+            "hashes": [
+                "sha256:32d930858eab677bc29a742aaa4f096de259f1c78c68a90ad11f5c3c04f08335",
+                "sha256:3642bd13e90b80ba8a243a730275eb10a4c26ec96f5fc16b87e458d4ab21efae"
+            ],
+            "markers": "python_version >= '3.6'",
+            "version": "==0.13.3"
+        },
+        "hyperframe": {
+            "hashes": [
+                "sha256:5187962cb16dcc078f23cb5a4b110098d546c3f41ff2d4038a9896893bbd0b40",
+                "sha256:a9f5c17f2cc3c719b917c4f33ed1c61bd1f8dfac4b1bd23b7c80b3400971b41f"
+            ],
+            "version": "==5.2.0"
+        },
+        "idna": {
+            "hashes": [
+                "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
+                "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
+            ],
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==2.10"
+        },
+        "rfc3986": {
+            "hashes": [
+                "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835",
+                "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"
+            ],
+            "version": "==1.5.0"
+        },
+        "sniffio": {
+            "hashes": [
+                "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2",
+                "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc"
+            ],
+            "markers": "python_version >= '3.7'",
+            "version": "==1.3.1"
        }
    },
    "develop": {}
@@ -4,7 +4,8 @@ target 'alt-tab-macos' do
  use_frameworks!
  pod 'LetsMove', :git => 'https://github.com/lwouis/LetsMove.git', :commit => '7abf4daed1a25218f2b52f2dfd190aee5a50071c'
  pod 'Sparkle', :podspec => 'https://raw.githubusercontent.com/lwouis/Sparkle/fix-iframe-popup-1.24/Sparkle.podspec'
-  pod 'ShortcutRecorder', :git => 'https://github.com/Kentzo/ShortcutRecorder.git', :commit => 'f718220854575bad86fa89dd2bb3decd0b14b2b0'
+  pod 'ShortcutRecorder', :git => 'https://github.com/lwouis/ShortcutRecorder.git', :branch => 'alt-tab-current'
  pod 'SwiftyMarkdown', '1.1.0'
-  pod 'AppCenter/Crashes', '4.1.0'
+  pod 'AppCenter/Crashes', '4.3.0'
+  pod 'SwiftyBeaver', '1.9.0'
 end
@@ -1,22 +1,25 @@
 PODS:
-  - AppCenter/Core (4.1.0)
-  - AppCenter/Crashes (4.1.0):
+  - AppCenter/Core (4.3.0)
+  - AppCenter/Crashes (4.3.0):
    - AppCenter/Core
  - LetsMove (1.24)
  - ShortcutRecorder (3.1)
  - Sparkle (1.24.0)
+  - SwiftyBeaver (1.9.0)
  - SwiftyMarkdown (1.1.0)

 DEPENDENCIES:
-  - AppCenter/Crashes (= 4.1.0)
+  - AppCenter/Crashes (= 4.3.0)
  - LetsMove (from `https://github.com/lwouis/LetsMove.git`, commit `7abf4daed1a25218f2b52f2dfd190aee5a50071c`)
-  - ShortcutRecorder (from `https://github.com/Kentzo/ShortcutRecorder.git`, commit `f718220854575bad86fa89dd2bb3decd0b14b2b0`)
+  - ShortcutRecorder (from `https://github.com/lwouis/ShortcutRecorder.git`, branch `alt-tab-current`)
  - Sparkle (from `https://raw.githubusercontent.com/lwouis/Sparkle/fix-iframe-popup-1.24/Sparkle.podspec`)
+  - SwiftyBeaver (= 1.9.0)
  - SwiftyMarkdown (= 1.1.0)

 SPEC REPOS:
  trunk:
    - AppCenter
+    - SwiftyBeaver
    - SwiftyMarkdown

 EXTERNAL SOURCES:
@@ -24,8 +27,8 @@ EXTERNAL SOURCES:
    :commit: 7abf4daed1a25218f2b52f2dfd190aee5a50071c
    :git: https://github.com/lwouis/LetsMove.git
  ShortcutRecorder:
-    :commit: f718220854575bad86fa89dd2bb3decd0b14b2b0
-    :git: https://github.com/Kentzo/ShortcutRecorder.git
+    :branch: alt-tab-current
+    :git: https://github.com/lwouis/ShortcutRecorder.git
  Sparkle:
    :podspec: https://raw.githubusercontent.com/lwouis/Sparkle/fix-iframe-popup-1.24/Sparkle.podspec

@@ -34,16 +37,17 @@ CHECKOUT OPTIONS:
    :commit: 7abf4daed1a25218f2b52f2dfd190aee5a50071c
    :git: https://github.com/lwouis/LetsMove.git
  ShortcutRecorder:
-    :commit: f718220854575bad86fa89dd2bb3decd0b14b2b0
-    :git: https://github.com/Kentzo/ShortcutRecorder.git
+    :commit: 5bb32febdab48038ce1762bf14f5ce8024b11fe7
+    :git: https://github.com/lwouis/ShortcutRecorder.git

 SPEC CHECKSUMS:
-  AppCenter: 8832b158d17e54845c3b88a91076218f0b07174d
+  AppCenter: 883369ab78427b0561c688158d689dfe1f993ea9
  LetsMove: fefe56bc7bc7fb7d37049e28a14f297961229fc5
  ShortcutRecorder: fdf620aca34101b0cba3b10fca815e0459254189
  Sparkle: 1fa490bb4ab2a9b37cfb9ea4feec19dd33b81cd2
+  SwiftyBeaver: d39e7c376bf15e9fffca8263b8fd1f42ea56aa2d
  SwiftyMarkdown: 033abc9dad9a37903f81aec5188cade436f40520

-PODFILE CHECKSUM: 6102fea2825ff3bd342fd007b8e6322858c9474e
+PODFILE CHECKSUM: 6e94a2963d935455790ee55be0ce938834d1bba5

 COCOAPODS: 1.9.1
@@ -6,18 +6,15 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_armv7_armv7s</string>
+			<string>tvos-arm64</string>
 			<key>LibraryPath</key>
 			<string>AppCenter.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>arm64e</string>
-				<string>armv7</string>
-				<string>armv7s</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>tvos</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
@@ -34,18 +31,6 @@
 			<key>SupportedPlatformVariant</key>
 			<string>maccatalyst</string>
 		</dict>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>tvos-arm64</string>
-			<key>LibraryPath</key>
-			<string>AppCenter.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>tvos</string>
-		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64_i386_x86_64-simulator</string>
@@ -64,16 +49,18 @@
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>ios-arm64_arm64e_armv7_armv7s</string>
 			<key>LibraryPath</key>
 			<string>AppCenter.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
+				<string>arm64e</string>
+				<string>armv7</string>
+				<string>armv7s</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>ios</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
@@ -90,6 +77,19 @@
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>macos-arm64_x86_64</string>
+			<key>LibraryPath</key>
+			<string>AppCenter.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>macos</string>
+		</dict>
 	</array>
 	<key>CFBundlePackageType</key>
 	<string>XFWK</string>
@@ -17,6 +17,7 @@
 #import <AppCenter/MSACLog.h>
 #import <AppCenter/MSACLogWithProperties.h>
 #import <AppCenter/MSACLogger.h>
+#import <AppCenter/MSACSerializableObject.h>
 #import <AppCenter/MSACService.h>
 #import <AppCenter/MSACServiceAbstract.h>
 #import <AppCenter/MSACWrapperLogger.h>
@@ -35,6 +36,7 @@
 #import "MSACLog.h"
 #import "MSACLogWithProperties.h"
 #import "MSACLogger.h"
+#import "MSACSerializableObject.h"
 #import "MSACService.h"
 #import "MSACServiceAbstract.h"
 #import "MSACWrapperLogger.h"
@@ -95,6 +95,14 @@ NS_SWIFT_NAME(AppCenter)
 */
@property(class, nonatomic, getter=isEnabled, setter=setEnabled:) BOOL enabled NS_SWIFT_NAME(enabled);

+/**
+ * Flag indicating whether SDK can send network requests.
+ *
+ * The state is persisted in the device's storage across application launches.
+ */
+@property(class, nonatomic, getter=isNetworkRequestsAllowed, setter=setNetworkRequestsAllowed:)
+    BOOL networkRequestsAllowed NS_SWIFT_NAME(networkRequestsAllowed);
+
 /**
 * The SDK's log level.
 */
@@ -103,7 +111,7 @@ NS_SWIFT_NAME(AppCenter)
 /**
 * Base URL to use for backend communication.
 */
-@property(class, nonatomic) NSString *logUrl;
+@property(class, nonatomic, strong) NSString *logUrl;

 /**
 * Set log handler.
@@ -114,7 +122,7 @@ NS_SWIFT_NAME(AppCenter)
 * Set wrapper SDK information to use when building device properties. This is intended in case you are building a SDK that uses the App
 * Center SDK under the hood, e.g. our Xamarin SDK or ReactNative SDk.
 */
-@property(class, nonatomic) MSACWrapperSdk *wrapperSdk;
+@property(class, nonatomic, strong) MSACWrapperSdk *wrapperSdk;

 #if !TARGET_OS_TV
 /**
@@ -181,14 +189,14 @@ NS_SWIFT_NAME(AppCenter)
 *
 * AppCenter must be configured or started before this API can be used.
 */
-@property(class, nonatomic) NSString *userId;
+@property(class, nonatomic, strong) NSString *userId;

 /**
 * Set country code to use when building device properties.
 *
 * @see https://www.iso.org/obp/ui/#search for more information.
 */
-@property(class, nonatomic) NSString *countryCode;
+@property(class, nonatomic, strong) NSString *countryCode;

@end

@@ -51,12 +51,12 @@ NS_SWIFT_NAME(ChannelGroupProtocol)
 /**
 * Change the base URL (schema + authority + port only) used to communicate with the backend.
 */
-@property(nonatomic) NSString *_Nullable logUrl;
+@property(nonatomic, strong) NSString *_Nullable logUrl;

 /**
 * Set the app secret.
 */
-@property(nonatomic) NSString *_Nullable appSecret;
+@property(nonatomic, strong) NSString *_Nullable appSecret;

 /**
 * Set the maximum size of the internal storage. This method must be called before App Center is started.
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#ifndef SERIALIZABLE_OBJECT_H
+#define SERIALIZABLE_OBJECT_H
+
+@protocol MSACSerializableObject <NSCoding>
+
+/**
+ * Serialize this object to a dictionary.
+ *
+ * @return A dictionary representing this object.
+ */
+- (NSMutableDictionary *)serializeToDictionary;
+
+@end
+#endif
@@ -10,6 +10,8 @@
@protocol MSACChannelProtocol;
@protocol MSACLog;

+NS_ASSUME_NONNULL_BEGIN
+
@protocol MSACChannelDelegate <NSObject>

@optional
@@ -69,7 +71,7 @@
 * @param log The log to be sent.
 * @param error The error that occured.
 */
- (void)channel:(id<MSACChannelProtocol>)channel didFailSendingLog:(id<MSACLog>)log withError:(NSError *)error;
+- (void)channel:(id<MSACChannelProtocol>)channel didFailSendingLog:(id<MSACLog>)log withError:(nullable NSError *)error;

 /**
 * A callback that is called when setEnabled has been invoked.
@@ -108,3 +110,5 @@
 - (BOOL)channelUnit:(id<MSACChannelUnitProtocol>)channelUnit shouldFilterLog:(id<MSACLog>)log;

@end
+
+NS_ASSUME_NONNULL_END
@@ -17,6 +17,7 @@
 #import <AppCenter/MSACLog.h>
 #import <AppCenter/MSACLogWithProperties.h>
 #import <AppCenter/MSACLogger.h>
+#import <AppCenter/MSACSerializableObject.h>
 #import <AppCenter/MSACService.h>
 #import <AppCenter/MSACServiceAbstract.h>
 #import <AppCenter/MSACWrapperLogger.h>
@@ -35,6 +36,7 @@
 #import "MSACLog.h"
 #import "MSACLogWithProperties.h"
 #import "MSACLogger.h"
+#import "MSACSerializableObject.h"
 #import "MSACService.h"
 #import "MSACServiceAbstract.h"
 #import "MSACWrapperLogger.h"
@@ -95,6 +95,14 @@ NS_SWIFT_NAME(AppCenter)
 */
@property(class, nonatomic, getter=isEnabled, setter=setEnabled:) BOOL enabled NS_SWIFT_NAME(enabled);

+/**
+ * Flag indicating whether SDK can send network requests.
+ *
+ * The state is persisted in the device's storage across application launches.
+ */
+@property(class, nonatomic, getter=isNetworkRequestsAllowed, setter=setNetworkRequestsAllowed:)
+    BOOL networkRequestsAllowed NS_SWIFT_NAME(networkRequestsAllowed);
+
 /**
 * The SDK's log level.
 */
@@ -103,7 +111,7 @@ NS_SWIFT_NAME(AppCenter)
 /**
 * Base URL to use for backend communication.
 */
-@property(class, nonatomic) NSString *logUrl;
+@property(class, nonatomic, strong) NSString *logUrl;

 /**
 * Set log handler.
@@ -114,7 +122,7 @@ NS_SWIFT_NAME(AppCenter)
 * Set wrapper SDK information to use when building device properties. This is intended in case you are building a SDK that uses the App
 * Center SDK under the hood, e.g. our Xamarin SDK or ReactNative SDk.
 */
-@property(class, nonatomic) MSACWrapperSdk *wrapperSdk;
+@property(class, nonatomic, strong) MSACWrapperSdk *wrapperSdk;

 #if !TARGET_OS_TV
 /**
@@ -181,14 +189,14 @@ NS_SWIFT_NAME(AppCenter)
 *
 * AppCenter must be configured or started before this API can be used.
 */
-@property(class, nonatomic) NSString *userId;
+@property(class, nonatomic, strong) NSString *userId;

 /**
 * Set country code to use when building device properties.
 *
 * @see https://www.iso.org/obp/ui/#search for more information.
 */
-@property(class, nonatomic) NSString *countryCode;
+@property(class, nonatomic, strong) NSString *countryCode;

@end

@@ -51,12 +51,12 @@ NS_SWIFT_NAME(ChannelGroupProtocol)
 /**
 * Change the base URL (schema + authority + port only) used to communicate with the backend.
 */
-@property(nonatomic) NSString *_Nullable logUrl;
+@property(nonatomic, strong) NSString *_Nullable logUrl;

 /**
 * Set the app secret.
 */
-@property(nonatomic) NSString *_Nullable appSecret;
+@property(nonatomic, strong) NSString *_Nullable appSecret;

 /**
 * Set the maximum size of the internal storage. This method must be called before App Center is started.
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#ifndef SERIALIZABLE_OBJECT_H
+#define SERIALIZABLE_OBJECT_H
+
+@protocol MSACSerializableObject <NSCoding>
+
+/**
+ * Serialize this object to a dictionary.
+ *
+ * @return A dictionary representing this object.
+ */
+- (NSMutableDictionary *)serializeToDictionary;
+
+@end
+#endif
@@ -10,6 +10,8 @@
@protocol MSACChannelProtocol;
@protocol MSACLog;

+NS_ASSUME_NONNULL_BEGIN
+
@protocol MSACChannelDelegate <NSObject>

@optional
@@ -69,7 +71,7 @@
 * @param log The log to be sent.
 * @param error The error that occured.
 */
- (void)channel:(id<MSACChannelProtocol>)channel didFailSendingLog:(id<MSACLog>)log withError:(NSError *)error;
+- (void)channel:(id<MSACChannelProtocol>)channel didFailSendingLog:(id<MSACLog>)log withError:(nullable NSError *)error;

 /**
 * A callback that is called when setEnabled has been invoked.
@@ -108,3 +110,5 @@
 - (BOOL)channelUnit:(id<MSACChannelUnitProtocol>)channelUnit shouldFilterLog:(id<MSACLog>)log;

@end
+
+NS_ASSUME_NONNULL_END
@@ -6,7 +6,7 @@
 	<dict>
 		<key>Headers/AppCenter.h</key>
 		<data>
-		qaTNZSZUTXwLe2rrosDNCarRqAM=
+		w9sW6K7DVhGfORLCjGXijaR25m0=
 		</data>
 		<key>Headers/MSACAbstractLog.h</key>
 		<data>
@@ -14,7 +14,7 @@
 		</data>
 		<key>Headers/MSACAppCenter.h</key>
 		<data>
-		fyZS3gRJvUizXP6KoVErqu2xyZE=
+		2cUgfgx3odOGivdk+n6FXq94KgU=
 		</data>
 		<key>Headers/MSACAppCenterErrors.h</key>
 		<data>
@@ -22,7 +22,7 @@
 		</data>
 		<key>Headers/MSACChannelGroupProtocol.h</key>
 		<data>
-		3ucRib1Bg8/nTJfvHHieHPd9o+s=
+		jyWCHN4PSygLVy0IM5565DvDQAc=
 		</data>
 		<key>Headers/MSACChannelProtocol.h</key>
 		<data>
@@ -60,6 +60,10 @@
 		<data>
 		CaYHmB3+psy5/txfMvd2+bWGJkc=
 		</data>
+		<key>Headers/MSACSerializableObject.h</key>
+		<data>
+		or5nqKvOQVn2ZieUCmYK6fIZkWY=
+		</data>
 		<key>Headers/MSACService.h</key>
 		<data>
 		lz5atiMe+oTdu9e6g74KPC0CjOs=
@@ -78,7 +82,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		zdZ/cUUa6uXVQ4cqVo6u7Rs1B38=
+		vQsDzcm1lLcpUNIaE5cw31rdoVk=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -86,7 +90,7 @@
 		</data>
 		<key>PrivateHeaders/MSACChannelDelegate.h</key>
 		<data>
-		WzX9TX1oxW4ezY/2JpPNH9dUE24=
+		Msff4BZ/b1IjaYeKTDBHtNtT7wI=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -95,11 +99,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			qaTNZSZUTXwLe2rrosDNCarRqAM=
+			w9sW6K7DVhGfORLCjGXijaR25m0=
 			</data>
 			<key>hash2</key>
 			<data>
-			2Wv2BhvzEcs7qHle8K3IXhWh7EVoAIrE2gOs4b0p39c=
+			e9qe35Ew1pz0RMBfwa2Jv+3188p8iTwwktkIgCa/ztg=
 			</data>
 		</dict>
 		<key>Headers/MSACAbstractLog.h</key>
@@ -117,11 +121,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			fyZS3gRJvUizXP6KoVErqu2xyZE=
+			2cUgfgx3odOGivdk+n6FXq94KgU=
 			</data>
 			<key>hash2</key>
 			<data>
-			nuBkrbyOl3jAk9o5WoL4cSZAFLBmtD3D0NhUzZh8XZ4=
+			C10z0NrhN4J4qdWbypOdjlQ8QLlq4tvPMP21geOS4vI=
 			</data>
 		</dict>
 		<key>Headers/MSACAppCenterErrors.h</key>
@@ -139,11 +143,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			3ucRib1Bg8/nTJfvHHieHPd9o+s=
+			jyWCHN4PSygLVy0IM5565DvDQAc=
 			</data>
 			<key>hash2</key>
 			<data>
-			ZygIkpz0WRFePrjQafoN7MektFloCZQARlOWc3ozcVw=
+			d36rCjxsURqDkFv+g5BwWNybz5Zksc9B91gqArFcJbk=
 			</data>
 		</dict>
 		<key>Headers/MSACChannelProtocol.h</key>
@@ -245,6 +249,17 @@
 			GipSaz+D+Z5eWauQP+10U8xvbAnxPeIRD4HTvn0F5DQ=
 			</data>
 		</dict>
+		<key>Headers/MSACSerializableObject.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			or5nqKvOQVn2ZieUCmYK6fIZkWY=
+			</data>
+			<key>hash2</key>
+			<data>
+			TdCeoNla8kUqc5HPES6WNwi7ycy+4vRr3HGDipEXNVE=
+			</data>
+		</dict>
 		<key>Headers/MSACService.h</key>
 		<dict>
 			<key>hash</key>
@@ -304,11 +319,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			WzX9TX1oxW4ezY/2JpPNH9dUE24=
+			Msff4BZ/b1IjaYeKTDBHtNtT7wI=
 			</data>
 			<key>hash2</key>
 			<data>
-			AbAoifmIR5SJez5erJnVgTIz81yIMmvbnw6siYXEvaM=
+			d1uS+ptvOX/o3CCB23FEJAtvcf7KIf/8ozlruAf1f0g=
 			</data>
 		</dict>
 	</dict>
@@ -17,6 +17,7 @@
 #import <AppCenter/MSACLog.h>
 #import <AppCenter/MSACLogWithProperties.h>
 #import <AppCenter/MSACLogger.h>
+#import <AppCenter/MSACSerializableObject.h>
 #import <AppCenter/MSACService.h>
 #import <AppCenter/MSACServiceAbstract.h>
 #import <AppCenter/MSACWrapperLogger.h>
@@ -35,6 +36,7 @@
 #import "MSACLog.h"
 #import "MSACLogWithProperties.h"
 #import "MSACLogger.h"
+#import "MSACSerializableObject.h"
 #import "MSACService.h"
 #import "MSACServiceAbstract.h"
 #import "MSACWrapperLogger.h"
@@ -95,6 +95,14 @@ NS_SWIFT_NAME(AppCenter)
 */
@property(class, nonatomic, getter=isEnabled, setter=setEnabled:) BOOL enabled NS_SWIFT_NAME(enabled);

+/**
+ * Flag indicating whether SDK can send network requests.
+ *
+ * The state is persisted in the device's storage across application launches.
+ */
+@property(class, nonatomic, getter=isNetworkRequestsAllowed, setter=setNetworkRequestsAllowed:)
+    BOOL networkRequestsAllowed NS_SWIFT_NAME(networkRequestsAllowed);
+
 /**
 * The SDK's log level.
 */
@@ -103,7 +111,7 @@ NS_SWIFT_NAME(AppCenter)
 /**
 * Base URL to use for backend communication.
 */
-@property(class, nonatomic) NSString *logUrl;
+@property(class, nonatomic, strong) NSString *logUrl;

 /**
 * Set log handler.
@@ -114,7 +122,7 @@ NS_SWIFT_NAME(AppCenter)
 * Set wrapper SDK information to use when building device properties. This is intended in case you are building a SDK that uses the App
 * Center SDK under the hood, e.g. our Xamarin SDK or ReactNative SDk.
 */
-@property(class, nonatomic) MSACWrapperSdk *wrapperSdk;
+@property(class, nonatomic, strong) MSACWrapperSdk *wrapperSdk;

 #if !TARGET_OS_TV
 /**
@@ -181,14 +189,14 @@ NS_SWIFT_NAME(AppCenter)
 *
 * AppCenter must be configured or started before this API can be used.
 */
-@property(class, nonatomic) NSString *userId;
+@property(class, nonatomic, strong) NSString *userId;

 /**
 * Set country code to use when building device properties.
 *
 * @see https://www.iso.org/obp/ui/#search for more information.
 */
-@property(class, nonatomic) NSString *countryCode;
+@property(class, nonatomic, strong) NSString *countryCode;

@end

@@ -51,12 +51,12 @@ NS_SWIFT_NAME(ChannelGroupProtocol)
 /**
 * Change the base URL (schema + authority + port only) used to communicate with the backend.
 */
-@property(nonatomic) NSString *_Nullable logUrl;
+@property(nonatomic, strong) NSString *_Nullable logUrl;

 /**
 * Set the app secret.
 */
-@property(nonatomic) NSString *_Nullable appSecret;
+@property(nonatomic, strong) NSString *_Nullable appSecret;

 /**
 * Set the maximum size of the internal storage. This method must be called before App Center is started.
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#ifndef SERIALIZABLE_OBJECT_H
+#define SERIALIZABLE_OBJECT_H
+
+@protocol MSACSerializableObject <NSCoding>
+
+/**
+ * Serialize this object to a dictionary.
+ *
+ * @return A dictionary representing this object.
+ */
+- (NSMutableDictionary *)serializeToDictionary;
+
+@end
+#endif
@@ -10,6 +10,8 @@
@protocol MSACChannelProtocol;
@protocol MSACLog;

+NS_ASSUME_NONNULL_BEGIN
+
@protocol MSACChannelDelegate <NSObject>

@optional
@@ -69,7 +71,7 @@
 * @param log The log to be sent.
 * @param error The error that occured.
 */
- (void)channel:(id<MSACChannelProtocol>)channel didFailSendingLog:(id<MSACLog>)log withError:(NSError *)error;
+- (void)channel:(id<MSACChannelProtocol>)channel didFailSendingLog:(id<MSACLog>)log withError:(nullable NSError *)error;

 /**
 * A callback that is called when setEnabled has been invoked.
@@ -108,3 +110,5 @@
 - (BOOL)channelUnit:(id<MSACChannelUnitProtocol>)channelUnit shouldFilterLog:(id<MSACLog>)log;

@end
+
+NS_ASSUME_NONNULL_END
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>19H15</string>
+	<string>19H1323</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,6 +17,7 @@
 #import <AppCenter/MSACLog.h>
 #import <AppCenter/MSACLogWithProperties.h>
 #import <AppCenter/MSACLogger.h>
+#import <AppCenter/MSACSerializableObject.h>
 #import <AppCenter/MSACService.h>
 #import <AppCenter/MSACServiceAbstract.h>
 #import <AppCenter/MSACWrapperLogger.h>
@@ -35,6 +36,7 @@
 #import "MSACLog.h"
 #import "MSACLogWithProperties.h"
 #import "MSACLogger.h"
+#import "MSACSerializableObject.h"
 #import "MSACService.h"
 #import "MSACServiceAbstract.h"
 #import "MSACWrapperLogger.h"
@@ -95,6 +95,14 @@ NS_SWIFT_NAME(AppCenter)
 */
@property(class, nonatomic, getter=isEnabled, setter=setEnabled:) BOOL enabled NS_SWIFT_NAME(enabled);

+/**
+ * Flag indicating whether SDK can send network requests.
+ *
+ * The state is persisted in the device's storage across application launches.
+ */
+@property(class, nonatomic, getter=isNetworkRequestsAllowed, setter=setNetworkRequestsAllowed:)
+    BOOL networkRequestsAllowed NS_SWIFT_NAME(networkRequestsAllowed);
+
 /**
 * The SDK's log level.
 */
@@ -103,7 +111,7 @@ NS_SWIFT_NAME(AppCenter)
 /**
 * Base URL to use for backend communication.
 */
-@property(class, nonatomic) NSString *logUrl;
+@property(class, nonatomic, strong) NSString *logUrl;

 /**
 * Set log handler.
@@ -114,7 +122,7 @@ NS_SWIFT_NAME(AppCenter)
 * Set wrapper SDK information to use when building device properties. This is intended in case you are building a SDK that uses the App
 * Center SDK under the hood, e.g. our Xamarin SDK or ReactNative SDk.
 */
-@property(class, nonatomic) MSACWrapperSdk *wrapperSdk;
+@property(class, nonatomic, strong) MSACWrapperSdk *wrapperSdk;

 #if !TARGET_OS_TV
 /**
@@ -181,14 +189,14 @@ NS_SWIFT_NAME(AppCenter)
 *
 * AppCenter must be configured or started before this API can be used.
 */
-@property(class, nonatomic) NSString *userId;
+@property(class, nonatomic, strong) NSString *userId;

 /**
 * Set country code to use when building device properties.
 *
 * @see https://www.iso.org/obp/ui/#search for more information.
 */
-@property(class, nonatomic) NSString *countryCode;
+@property(class, nonatomic, strong) NSString *countryCode;

@end

@@ -51,12 +51,12 @@ NS_SWIFT_NAME(ChannelGroupProtocol)
 /**
 * Change the base URL (schema + authority + port only) used to communicate with the backend.
 */
-@property(nonatomic) NSString *_Nullable logUrl;
+@property(nonatomic, strong) NSString *_Nullable logUrl;

 /**
 * Set the app secret.
 */
-@property(nonatomic) NSString *_Nullable appSecret;
+@property(nonatomic, strong) NSString *_Nullable appSecret;

 /**
 * Set the maximum size of the internal storage. This method must be called before App Center is started.
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#ifndef SERIALIZABLE_OBJECT_H
+#define SERIALIZABLE_OBJECT_H
+
+@protocol MSACSerializableObject <NSCoding>
+
+/**
+ * Serialize this object to a dictionary.
+ *
+ * @return A dictionary representing this object.
+ */
+- (NSMutableDictionary *)serializeToDictionary;
+
+@end
+#endif
@@ -10,6 +10,8 @@
@protocol MSACChannelProtocol;
@protocol MSACLog;

+NS_ASSUME_NONNULL_BEGIN
+
@protocol MSACChannelDelegate <NSObject>

@optional
@@ -69,7 +71,7 @@
 * @param log The log to be sent.
 * @param error The error that occured.
 */
- (void)channel:(id<MSACChannelProtocol>)channel didFailSendingLog:(id<MSACLog>)log withError:(NSError *)error;
+- (void)channel:(id<MSACChannelProtocol>)channel didFailSendingLog:(id<MSACLog>)log withError:(nullable NSError *)error;

 /**
 * A callback that is called when setEnabled has been invoked.
@@ -108,3 +110,5 @@
 - (BOOL)channelUnit:(id<MSACChannelUnitProtocol>)channelUnit shouldFilterLog:(id<MSACLog>)log;

@end
+
+NS_ASSUME_NONNULL_END
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>19H15</string>
+	<string>19H1323</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,6 +17,7 @@
 #import <AppCenter/MSACLog.h>
 #import <AppCenter/MSACLogWithProperties.h>
 #import <AppCenter/MSACLogger.h>
+#import <AppCenter/MSACSerializableObject.h>
 #import <AppCenter/MSACService.h>
 #import <AppCenter/MSACServiceAbstract.h>
 #import <AppCenter/MSACWrapperLogger.h>
@@ -35,6 +36,7 @@
 #import "MSACLog.h"
 #import "MSACLogWithProperties.h"
 #import "MSACLogger.h"
+#import "MSACSerializableObject.h"
 #import "MSACService.h"
 #import "MSACServiceAbstract.h"
 #import "MSACWrapperLogger.h"
@@ -95,6 +95,14 @@ NS_SWIFT_NAME(AppCenter)
 */
@property(class, nonatomic, getter=isEnabled, setter=setEnabled:) BOOL enabled NS_SWIFT_NAME(enabled);

+/**
+ * Flag indicating whether SDK can send network requests.
+ *
+ * The state is persisted in the device's storage across application launches.
+ */
+@property(class, nonatomic, getter=isNetworkRequestsAllowed, setter=setNetworkRequestsAllowed:)
+    BOOL networkRequestsAllowed NS_SWIFT_NAME(networkRequestsAllowed);
+
 /**
 * The SDK's log level.
 */
@@ -103,7 +111,7 @@ NS_SWIFT_NAME(AppCenter)
 /**
 * Base URL to use for backend communication.
 */
-@property(class, nonatomic) NSString *logUrl;
+@property(class, nonatomic, strong) NSString *logUrl;

 /**
 * Set log handler.
@@ -114,7 +122,7 @@ NS_SWIFT_NAME(AppCenter)
 * Set wrapper SDK information to use when building device properties. This is intended in case you are building a SDK that uses the App
 * Center SDK under the hood, e.g. our Xamarin SDK or ReactNative SDk.
 */
-@property(class, nonatomic) MSACWrapperSdk *wrapperSdk;
+@property(class, nonatomic, strong) MSACWrapperSdk *wrapperSdk;

 #if !TARGET_OS_TV
 /**
@@ -181,14 +189,14 @@ NS_SWIFT_NAME(AppCenter)
 *
 * AppCenter must be configured or started before this API can be used.
 */
-@property(class, nonatomic) NSString *userId;
+@property(class, nonatomic, strong) NSString *userId;

 /**
 * Set country code to use when building device properties.
 *
 * @see https://www.iso.org/obp/ui/#search for more information.
 */
-@property(class, nonatomic) NSString *countryCode;
+@property(class, nonatomic, strong) NSString *countryCode;

@end

@@ -51,12 +51,12 @@ NS_SWIFT_NAME(ChannelGroupProtocol)
 /**
 * Change the base URL (schema + authority + port only) used to communicate with the backend.
 */
-@property(nonatomic) NSString *_Nullable logUrl;
+@property(nonatomic, strong) NSString *_Nullable logUrl;

 /**
 * Set the app secret.
 */
-@property(nonatomic) NSString *_Nullable appSecret;
+@property(nonatomic, strong) NSString *_Nullable appSecret;

 /**
 * Set the maximum size of the internal storage. This method must be called before App Center is started.
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#ifndef SERIALIZABLE_OBJECT_H
+#define SERIALIZABLE_OBJECT_H
+
+@protocol MSACSerializableObject <NSCoding>
+
+/**
+ * Serialize this object to a dictionary.
+ *
+ * @return A dictionary representing this object.
+ */
+- (NSMutableDictionary *)serializeToDictionary;
+
+@end
+#endif
@@ -10,6 +10,8 @@
@protocol MSACChannelProtocol;
@protocol MSACLog;

+NS_ASSUME_NONNULL_BEGIN
+
@protocol MSACChannelDelegate <NSObject>

@optional
@@ -69,7 +71,7 @@
 * @param log The log to be sent.
 * @param error The error that occured.
 */
- (void)channel:(id<MSACChannelProtocol>)channel didFailSendingLog:(id<MSACLog>)log withError:(NSError *)error;
+- (void)channel:(id<MSACChannelProtocol>)channel didFailSendingLog:(id<MSACLog>)log withError:(nullable NSError *)error;

 /**
 * A callback that is called when setEnabled has been invoked.
@@ -108,3 +110,5 @@
 - (BOOL)channelUnit:(id<MSACChannelUnitProtocol>)channelUnit shouldFilterLog:(id<MSACLog>)log;

@end
+
+NS_ASSUME_NONNULL_END
@@ -17,6 +17,7 @@
 #import <AppCenter/MSACLog.h>
 #import <AppCenter/MSACLogWithProperties.h>
 #import <AppCenter/MSACLogger.h>
+#import <AppCenter/MSACSerializableObject.h>
 #import <AppCenter/MSACService.h>
 #import <AppCenter/MSACServiceAbstract.h>
 #import <AppCenter/MSACWrapperLogger.h>
@@ -35,6 +36,7 @@
 #import "MSACLog.h"
 #import "MSACLogWithProperties.h"
 #import "MSACLogger.h"
+#import "MSACSerializableObject.h"
 #import "MSACService.h"
 #import "MSACServiceAbstract.h"
 #import "MSACWrapperLogger.h"
@@ -95,6 +95,14 @@ NS_SWIFT_NAME(AppCenter)
 */
@property(class, nonatomic, getter=isEnabled, setter=setEnabled:) BOOL enabled NS_SWIFT_NAME(enabled);

+/**
+ * Flag indicating whether SDK can send network requests.
+ *
+ * The state is persisted in the device's storage across application launches.
+ */
+@property(class, nonatomic, getter=isNetworkRequestsAllowed, setter=setNetworkRequestsAllowed:)
+    BOOL networkRequestsAllowed NS_SWIFT_NAME(networkRequestsAllowed);
+
 /**
 * The SDK's log level.
 */
@@ -103,7 +111,7 @@ NS_SWIFT_NAME(AppCenter)
 /**
 * Base URL to use for backend communication.
 */
-@property(class, nonatomic) NSString *logUrl;
+@property(class, nonatomic, strong) NSString *logUrl;

 /**
 * Set log handler.
@@ -114,7 +122,7 @@ NS_SWIFT_NAME(AppCenter)
 * Set wrapper SDK information to use when building device properties. This is intended in case you are building a SDK that uses the App
 * Center SDK under the hood, e.g. our Xamarin SDK or ReactNative SDk.
 */
-@property(class, nonatomic) MSACWrapperSdk *wrapperSdk;
+@property(class, nonatomic, strong) MSACWrapperSdk *wrapperSdk;

 #if !TARGET_OS_TV
 /**
@@ -181,14 +189,14 @@ NS_SWIFT_NAME(AppCenter)
 *
 * AppCenter must be configured or started before this API can be used.
 */
-@property(class, nonatomic) NSString *userId;
+@property(class, nonatomic, strong) NSString *userId;

 /**
 * Set country code to use when building device properties.
 *
 * @see https://www.iso.org/obp/ui/#search for more information.
 */
-@property(class, nonatomic) NSString *countryCode;
+@property(class, nonatomic, strong) NSString *countryCode;

@end

@@ -51,12 +51,12 @@ NS_SWIFT_NAME(ChannelGroupProtocol)
 /**
 * Change the base URL (schema + authority + port only) used to communicate with the backend.
 */
-@property(nonatomic) NSString *_Nullable logUrl;
+@property(nonatomic, strong) NSString *_Nullable logUrl;

 /**
 * Set the app secret.
 */
-@property(nonatomic) NSString *_Nullable appSecret;
+@property(nonatomic, strong) NSString *_Nullable appSecret;

 /**
 * Set the maximum size of the internal storage. This method must be called before App Center is started.
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#ifndef SERIALIZABLE_OBJECT_H
+#define SERIALIZABLE_OBJECT_H
+
+@protocol MSACSerializableObject <NSCoding>
+
+/**
+ * Serialize this object to a dictionary.
+ *
+ * @return A dictionary representing this object.
+ */
+- (NSMutableDictionary *)serializeToDictionary;
+
+@end
+#endif
@@ -10,6 +10,8 @@
@protocol MSACChannelProtocol;
@protocol MSACLog;

+NS_ASSUME_NONNULL_BEGIN
+
@protocol MSACChannelDelegate <NSObject>

@optional
@@ -69,7 +71,7 @@
 * @param log The log to be sent.
 * @param error The error that occured.
 */
- (void)channel:(id<MSACChannelProtocol>)channel didFailSendingLog:(id<MSACLog>)log withError:(NSError *)error;
+- (void)channel:(id<MSACChannelProtocol>)channel didFailSendingLog:(id<MSACLog>)log withError:(nullable NSError *)error;

 /**
 * A callback that is called when setEnabled has been invoked.
@@ -108,3 +110,5 @@
 - (BOOL)channelUnit:(id<MSACChannelUnitProtocol>)channelUnit shouldFilterLog:(id<MSACLog>)log;

@end
+
+NS_ASSUME_NONNULL_END
@@ -6,7 +6,7 @@
 	<dict>
 		<key>Headers/AppCenter.h</key>
 		<data>
-		qaTNZSZUTXwLe2rrosDNCarRqAM=
+		w9sW6K7DVhGfORLCjGXijaR25m0=
 		</data>
 		<key>Headers/MSACAbstractLog.h</key>
 		<data>
@@ -14,7 +14,7 @@
 		</data>
 		<key>Headers/MSACAppCenter.h</key>
 		<data>
-		fyZS3gRJvUizXP6KoVErqu2xyZE=
+		2cUgfgx3odOGivdk+n6FXq94KgU=
 		</data>
 		<key>Headers/MSACAppCenterErrors.h</key>
 		<data>
@@ -22,7 +22,7 @@
 		</data>
 		<key>Headers/MSACChannelGroupProtocol.h</key>
 		<data>
-		3ucRib1Bg8/nTJfvHHieHPd9o+s=
+		jyWCHN4PSygLVy0IM5565DvDQAc=
 		</data>
 		<key>Headers/MSACChannelProtocol.h</key>
 		<data>
@@ -60,6 +60,10 @@
 		<data>
 		CaYHmB3+psy5/txfMvd2+bWGJkc=
 		</data>
+		<key>Headers/MSACSerializableObject.h</key>
+		<data>
+		or5nqKvOQVn2ZieUCmYK6fIZkWY=
+		</data>
 		<key>Headers/MSACService.h</key>
 		<data>
 		lz5atiMe+oTdu9e6g74KPC0CjOs=
@@ -78,7 +82,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		7sYncZtohI81qzz4TO0ZyfxPqSM=
+		nu+ldEv5cj3rjniF8N9Pt71xz68=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -86,7 +90,7 @@
 		</data>
 		<key>PrivateHeaders/MSACChannelDelegate.h</key>
 		<data>
-		WzX9TX1oxW4ezY/2JpPNH9dUE24=
+		Msff4BZ/b1IjaYeKTDBHtNtT7wI=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -95,11 +99,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			qaTNZSZUTXwLe2rrosDNCarRqAM=
+			w9sW6K7DVhGfORLCjGXijaR25m0=
 			</data>
 			<key>hash2</key>
 			<data>
-			2Wv2BhvzEcs7qHle8K3IXhWh7EVoAIrE2gOs4b0p39c=
+			e9qe35Ew1pz0RMBfwa2Jv+3188p8iTwwktkIgCa/ztg=
 			</data>
 		</dict>
 		<key>Headers/MSACAbstractLog.h</key>
@@ -117,11 +121,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			fyZS3gRJvUizXP6KoVErqu2xyZE=
+			2cUgfgx3odOGivdk+n6FXq94KgU=
 			</data>
 			<key>hash2</key>
 			<data>
-			nuBkrbyOl3jAk9o5WoL4cSZAFLBmtD3D0NhUzZh8XZ4=
+			C10z0NrhN4J4qdWbypOdjlQ8QLlq4tvPMP21geOS4vI=
 			</data>
 		</dict>
 		<key>Headers/MSACAppCenterErrors.h</key>
@@ -139,11 +143,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			3ucRib1Bg8/nTJfvHHieHPd9o+s=
+			jyWCHN4PSygLVy0IM5565DvDQAc=
 			</data>
 			<key>hash2</key>
 			<data>
-			ZygIkpz0WRFePrjQafoN7MektFloCZQARlOWc3ozcVw=
+			d36rCjxsURqDkFv+g5BwWNybz5Zksc9B91gqArFcJbk=
 			</data>
 		</dict>
 		<key>Headers/MSACChannelProtocol.h</key>
@@ -245,6 +249,17 @@
 			GipSaz+D+Z5eWauQP+10U8xvbAnxPeIRD4HTvn0F5DQ=
 			</data>
 		</dict>
+		<key>Headers/MSACSerializableObject.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			or5nqKvOQVn2ZieUCmYK6fIZkWY=
+			</data>
+			<key>hash2</key>
+			<data>
+			TdCeoNla8kUqc5HPES6WNwi7ycy+4vRr3HGDipEXNVE=
+			</data>
+		</dict>
 		<key>Headers/MSACService.h</key>
 		<dict>
 			<key>hash</key>
@@ -304,11 +319,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			WzX9TX1oxW4ezY/2JpPNH9dUE24=
+			Msff4BZ/b1IjaYeKTDBHtNtT7wI=
 			</data>
 			<key>hash2</key>
 			<data>
-			AbAoifmIR5SJez5erJnVgTIz81yIMmvbnw6siYXEvaM=
+			d1uS+ptvOX/o3CCB23FEJAtvcf7KIf/8ozlruAf1f0g=
 			</data>
 		</dict>
 	</dict>
@@ -6,18 +6,19 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_arm64e_armv7_armv7s</string>
+			<string>ios-arm64_i386_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>AppCenterCrashes.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>arm64e</string>
-				<string>armv7</string>
-				<string>armv7s</string>
+				<string>i386</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
@@ -31,19 +32,6 @@
 			<key>SupportedPlatform</key>
 			<string>tvos</string>
 		</dict>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
-			<key>LibraryPath</key>
-			<string>AppCenterCrashes.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>macos</string>
-		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
 			<string>tvos-arm64_x86_64-simulator</string>
@@ -59,6 +47,34 @@
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>macos-arm64_x86_64</string>
+			<key>LibraryPath</key>
+			<string>AppCenterCrashes.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>macos</string>
+		</dict>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_arm64e_armv7_armv7s</string>
+			<key>LibraryPath</key>
+			<string>AppCenterCrashes.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>arm64e</string>
+				<string>armv7</string>
+				<string>armv7s</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64_x86_64-maccatalyst</string>
@@ -74,22 +90,6 @@
 			<key>SupportedPlatformVariant</key>
 			<string>maccatalyst</string>
 		</dict>
-		<dict>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_i386_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>AppCenterCrashes.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>i386</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
 	</array>
 	<key>CFBundlePackageType</key>
 	<string>XFWK</string>
@@ -9,12 +9,18 @@
 #import <AppCenterCrashes/MSACCrashesDelegate.h>
 #import <AppCenterCrashes/MSACErrorAttachmentLog+Utility.h>
 #import <AppCenterCrashes/MSACErrorAttachmentLog.h>
+#import <AppCenterCrashes/MSACExceptionModel.h>
+#import <AppCenterCrashes/MSACStackFrame.h>
 #import <AppCenterCrashes/MSACWrapperCrashesHelper.h>
+#import <AppCenterCrashes/MSACWrapperExceptionModel.h>
 #else
 #import "MSACCrashHandlerSetupDelegate.h"
 #import "MSACCrashes.h"
 #import "MSACCrashesDelegate.h"
 #import "MSACErrorAttachmentLog+Utility.h"
 #import "MSACErrorAttachmentLog.h"
+#import "MSACExceptionModel.h"
+#import "MSACStackFrame.h"
 #import "MSACWrapperCrashesHelper.h"
+#import "MSACWrapperExceptionModel.h"
 #endif
@@ -14,6 +14,8 @@
 #endif

@class MSACCrashesDelegate;
+@class MSACExceptionModel;
+@class MSACErrorAttachmentLog;

 /**
 * Custom block that handles the alert that prompts the user whether crash reports need to be processed or not.
@@ -69,6 +71,32 @@ typedef NS_ENUM(NSUInteger, MSACUserConfirmation) {
 NS_SWIFT_NAME(Crashes)
@interface MSACCrashes : MSACServiceAbstract

+/**
+ * Track handled error.
+ *
+ * @param error error.
+ * @param properties dictionary of properties.
+ * @param attachments a list of attachments.
+ *
+ * @return handled error ID.
+ */
+ (NSString *_Nonnull)trackError:(NSError *_Nonnull)error
+                  withProperties:(nullable NSDictionary<NSString *, NSString *> *)properties
+                     attachments:(nullable NSArray<MSACErrorAttachmentLog *> *)attachments NS_SWIFT_NAME(trackError(_:properties:attachments:));
+
+/**
+ * Track handled exception from custom exception model.
+ *
+ * @param exception custom model exception.
+ * @param properties dictionary of properties.
+ * @param attachments a list of attachments.
+ *
+ * @return handled error ID.
+ */
+ (NSString *_Nonnull)trackException:(MSACExceptionModel *_Nonnull)exception
+                      withProperties:(nullable NSDictionary<NSString *, NSString *> *)properties
+                         attachments:(nullable NSArray<MSACErrorAttachmentLog *> *)attachments NS_SWIFT_NAME(trackException(_:properties:attachments:));
+
 ///-----------------------------------------------------------------------------
 /// @name Testing Crashes Feature
 ///-----------------------------------------------------------------------------
@@ -51,7 +51,7 @@ NS_SWIFT_NAME(CrashesDelegate)
 * @param errorReport The errorReport that App Center tried to send.
 * @param error The error that occurred.
 */
- (void)crashes:(MSACCrashes *)crashes didFailSendingErrorReport:(MSACErrorReport *)errorReport withError:(NSError *)error;
+- (void)crashes:(MSACCrashes *)crashes didFailSendingErrorReport:(MSACErrorReport *)errorReport withError:(nullable NSError *)error;

 /**
 * Method to get the attachments associated to an error report.
@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#ifndef MSAC_EXCEPTION_MODEL_H
+#define MSAC_EXCEPTION_MODEL_H
+
+#if __has_include(<AppCenter/MSACSerializableObject.h>)
+#import <AppCenter/MSACSerializableObject.h>
+#else
+#import "MSACSerializableObject.h"
+#endif
+
+@class MSACStackFrame;
+
+NS_SWIFT_NAME(ExceptionModel)
+@interface MSACExceptionModel : NSObject <MSACSerializableObject>
+
+/**
+ * Creates an instance of exception model.
+ *
+ * @param error error.
+ *
+ * @return A new instance of exception.
+ */
+- (instancetype)initWithError:(NSError *)error NS_SWIFT_NAME(init(withError:));
+
+/**
+ * Creates an instance of exception model.
+ *
+ * @param exceptionType exception type.
+ * @param exceptionMessage exception message.
+ * @param stackTrace stack trace.
+ *
+ * @return A new instance of exception.
+ */
+- (instancetype)initWithType:(NSString *)exceptionType
+            exceptionMessage:(NSString *)exceptionMessage
+                  stackTrace:(NSArray<NSString *> *)stackTrace
+               NS_SWIFT_NAME(init(withType:exceptionMessage:stackTrace:));
+
+/**
+ * Creates an instance of exception model.
+ *
+ * @exception exception.
+ *
+ * @return A new instance of exception.
+ */
+- (instancetype)initWithException:(NSException *)exception NS_SWIFT_NAME(init(withException:));
+
+/**
+ * Exception type.
+ */
+@property(nonatomic, copy) NSString *type;
+
+/**
+ * Exception reason.
+ */
+@property(nonatomic, copy) NSString *message;
+
+/**
+ * Raw stack trace. Sent when the frames property is either missing or unreliable.
+ */
+@property(nonatomic, copy) NSString *stackTrace;
+
+/**
+ * Stack frames [optional].
+ */
+@property(nonatomic, strong) NSArray<MSACStackFrame *> *frames;
+
+/**
+ * Checks if the object's values are valid.
+ *
+ * @return YES, if the object is valid.
+ */
+- (BOOL)isValid;
+
+@end
+
+#endif
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#if __has_include(<AppCenter/MSACSerializableObject.h>)
+#import <AppCenter/MSACSerializableObject.h>
+#else
+#import "MSACSerializableObject.h"
+#endif
+
+@interface MSACStackFrame : NSObject <MSACSerializableObject>
+
+/*
+ * Frame address [optional].
+ */
+@property(nonatomic, copy) NSString *address;
+
+/*
+ * Symbolized code line [optional].
+ */
+@property(nonatomic, copy) NSString *code;
+
+/*
+ * The fully qualified name of the Class containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSString *className;
+
+/*
+ * The name of the method containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSString *methodName;
+
+/*
+ * The line number of the source line containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSNumber *lineNumber;
+
+/*
+ * The name of the file containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSString *fileName;
+
+@end
@@ -13,7 +13,6 @@ NS_ASSUME_NONNULL_BEGIN

@class MSACErrorReport;
@class MSACErrorAttachmentLog;
-@class MSACException;

 /**
 * This general class allows wrappers to supplement the Crashes SDK with their own behavior.
@@ -25,7 +24,7 @@ NS_SWIFT_NAME(WrapperCrashesHelper)
 * The crash handler setup delegate.
 *
 */
-@property(class, nonatomic) _Nullable id<MSACCrashHandlerSetupDelegate> crashHandlerSetupDelegate;
+@property(class, nonatomic, weak) _Nullable id<MSACCrashHandlerSetupDelegate> crashHandlerSetupDelegate;

 /**
 * Gets the crash handler setup delegate.
@@ -65,20 +64,6 @@ NS_SWIFT_NAME(WrapperCrashesHelper)
 */
 + (void)sendErrorAttachments:(NSArray<MSACErrorAttachmentLog *> *)errorAttachments withIncidentIdentifier:(NSString *)incidentIdentifier;

-/**
- * Track handled exception directly as model form.
- * This API is used by wrapper SDKs.
- *
- * @param exception model form exception.
- * @param properties dictionary of properties.
- * @param attachments a list of attachments.
- *
- * @return handled error ID.
- */
-+ (nullable NSString *)trackModelException:(MSACException *)exception
-                            withProperties:(nullable NSDictionary<NSString *, NSString *> *)properties
-                           withAttachments:(nullable NSArray<MSACErrorAttachmentLog *> *)attachments;
-
 /**
 * Get a generic error report representation for an handled exception.
 * This API is used by wrapper SDKs.
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#ifndef MSAC_WRAPPER_EXCEPTION_MODEL_H
+#define MSAC_WRAPPER_EXCEPTION_MODEL_H
+
+#if __has_include(<AppCenterCrashes/MSACExceptionModel.h>)
+#import <AppCenterCrashes/MSACExceptionModel.h>
+#import <AppCenterCrashes/MSACWrapperExceptionModel.h>
+#else
+#import "MSACExceptionModel.h"
+#import "MSACWrapperExceptionModel.h"
+#endif
+
+#if __has_include(<AppCenter/MSACSerializableObject.h>)
+#import <AppCenter/MSACSerializableObject.h>
+#else
+#import "MSACSerializableObject.h"
+#endif
+
+@interface MSACWrapperExceptionModel : MSACExceptionModel
+
+/*
+ * Inner exceptions of this exception [optional].
+ */
+@property(nonatomic, strong) NSArray<MSACWrapperExceptionModel *> *innerExceptions;
+
+/*
+ * Name of the wrapper SDK that emitted this exception.
+ * Consists of the name of the SDK and the wrapper platform, e.g. "appcenter.xamarin", "appcenter.react-native" [optional].
+ */
+@property(nonatomic, copy) NSString *wrapperSdkName;
+
+@end
+
+#endif
@@ -9,12 +9,18 @@
 #import <AppCenterCrashes/MSACCrashesDelegate.h>
 #import <AppCenterCrashes/MSACErrorAttachmentLog+Utility.h>
 #import <AppCenterCrashes/MSACErrorAttachmentLog.h>
+#import <AppCenterCrashes/MSACExceptionModel.h>
+#import <AppCenterCrashes/MSACStackFrame.h>
 #import <AppCenterCrashes/MSACWrapperCrashesHelper.h>
+#import <AppCenterCrashes/MSACWrapperExceptionModel.h>
 #else
 #import "MSACCrashHandlerSetupDelegate.h"
 #import "MSACCrashes.h"
 #import "MSACCrashesDelegate.h"
 #import "MSACErrorAttachmentLog+Utility.h"
 #import "MSACErrorAttachmentLog.h"
+#import "MSACExceptionModel.h"
+#import "MSACStackFrame.h"
 #import "MSACWrapperCrashesHelper.h"
+#import "MSACWrapperExceptionModel.h"
 #endif
@@ -14,6 +14,8 @@
 #endif

@class MSACCrashesDelegate;
+@class MSACExceptionModel;
+@class MSACErrorAttachmentLog;

 /**
 * Custom block that handles the alert that prompts the user whether crash reports need to be processed or not.
@@ -69,6 +71,32 @@ typedef NS_ENUM(NSUInteger, MSACUserConfirmation) {
 NS_SWIFT_NAME(Crashes)
@interface MSACCrashes : MSACServiceAbstract

+/**
+ * Track handled error.
+ *
+ * @param error error.
+ * @param properties dictionary of properties.
+ * @param attachments a list of attachments.
+ *
+ * @return handled error ID.
+ */
+ (NSString *_Nonnull)trackError:(NSError *_Nonnull)error
+                  withProperties:(nullable NSDictionary<NSString *, NSString *> *)properties
+                     attachments:(nullable NSArray<MSACErrorAttachmentLog *> *)attachments NS_SWIFT_NAME(trackError(_:properties:attachments:));
+
+/**
+ * Track handled exception from custom exception model.
+ *
+ * @param exception custom model exception.
+ * @param properties dictionary of properties.
+ * @param attachments a list of attachments.
+ *
+ * @return handled error ID.
+ */
+ (NSString *_Nonnull)trackException:(MSACExceptionModel *_Nonnull)exception
+                      withProperties:(nullable NSDictionary<NSString *, NSString *> *)properties
+                         attachments:(nullable NSArray<MSACErrorAttachmentLog *> *)attachments NS_SWIFT_NAME(trackException(_:properties:attachments:));
+
 ///-----------------------------------------------------------------------------
 /// @name Testing Crashes Feature
 ///-----------------------------------------------------------------------------
@@ -51,7 +51,7 @@ NS_SWIFT_NAME(CrashesDelegate)
 * @param errorReport The errorReport that App Center tried to send.
 * @param error The error that occurred.
 */
- (void)crashes:(MSACCrashes *)crashes didFailSendingErrorReport:(MSACErrorReport *)errorReport withError:(NSError *)error;
+- (void)crashes:(MSACCrashes *)crashes didFailSendingErrorReport:(MSACErrorReport *)errorReport withError:(nullable NSError *)error;

 /**
 * Method to get the attachments associated to an error report.
@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#ifndef MSAC_EXCEPTION_MODEL_H
+#define MSAC_EXCEPTION_MODEL_H
+
+#if __has_include(<AppCenter/MSACSerializableObject.h>)
+#import <AppCenter/MSACSerializableObject.h>
+#else
+#import "MSACSerializableObject.h"
+#endif
+
+@class MSACStackFrame;
+
+NS_SWIFT_NAME(ExceptionModel)
+@interface MSACExceptionModel : NSObject <MSACSerializableObject>
+
+/**
+ * Creates an instance of exception model.
+ *
+ * @param error error.
+ *
+ * @return A new instance of exception.
+ */
+- (instancetype)initWithError:(NSError *)error NS_SWIFT_NAME(init(withError:));
+
+/**
+ * Creates an instance of exception model.
+ *
+ * @param exceptionType exception type.
+ * @param exceptionMessage exception message.
+ * @param stackTrace stack trace.
+ *
+ * @return A new instance of exception.
+ */
+- (instancetype)initWithType:(NSString *)exceptionType
+            exceptionMessage:(NSString *)exceptionMessage
+                  stackTrace:(NSArray<NSString *> *)stackTrace
+               NS_SWIFT_NAME(init(withType:exceptionMessage:stackTrace:));
+
+/**
+ * Creates an instance of exception model.
+ *
+ * @exception exception.
+ *
+ * @return A new instance of exception.
+ */
+- (instancetype)initWithException:(NSException *)exception NS_SWIFT_NAME(init(withException:));
+
+/**
+ * Exception type.
+ */
+@property(nonatomic, copy) NSString *type;
+
+/**
+ * Exception reason.
+ */
+@property(nonatomic, copy) NSString *message;
+
+/**
+ * Raw stack trace. Sent when the frames property is either missing or unreliable.
+ */
+@property(nonatomic, copy) NSString *stackTrace;
+
+/**
+ * Stack frames [optional].
+ */
+@property(nonatomic, strong) NSArray<MSACStackFrame *> *frames;
+
+/**
+ * Checks if the object's values are valid.
+ *
+ * @return YES, if the object is valid.
+ */
+- (BOOL)isValid;
+
+@end
+
+#endif
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#if __has_include(<AppCenter/MSACSerializableObject.h>)
+#import <AppCenter/MSACSerializableObject.h>
+#else
+#import "MSACSerializableObject.h"
+#endif
+
+@interface MSACStackFrame : NSObject <MSACSerializableObject>
+
+/*
+ * Frame address [optional].
+ */
+@property(nonatomic, copy) NSString *address;
+
+/*
+ * Symbolized code line [optional].
+ */
+@property(nonatomic, copy) NSString *code;
+
+/*
+ * The fully qualified name of the Class containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSString *className;
+
+/*
+ * The name of the method containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSString *methodName;
+
+/*
+ * The line number of the source line containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSNumber *lineNumber;
+
+/*
+ * The name of the file containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSString *fileName;
+
+@end
@@ -13,7 +13,6 @@ NS_ASSUME_NONNULL_BEGIN

@class MSACErrorReport;
@class MSACErrorAttachmentLog;
-@class MSACException;

 /**
 * This general class allows wrappers to supplement the Crashes SDK with their own behavior.
@@ -25,7 +24,7 @@ NS_SWIFT_NAME(WrapperCrashesHelper)
 * The crash handler setup delegate.
 *
 */
-@property(class, nonatomic) _Nullable id<MSACCrashHandlerSetupDelegate> crashHandlerSetupDelegate;
+@property(class, nonatomic, weak) _Nullable id<MSACCrashHandlerSetupDelegate> crashHandlerSetupDelegate;

 /**
 * Gets the crash handler setup delegate.
@@ -65,20 +64,6 @@ NS_SWIFT_NAME(WrapperCrashesHelper)
 */
 + (void)sendErrorAttachments:(NSArray<MSACErrorAttachmentLog *> *)errorAttachments withIncidentIdentifier:(NSString *)incidentIdentifier;

-/**
- * Track handled exception directly as model form.
- * This API is used by wrapper SDKs.
- *
- * @param exception model form exception.
- * @param properties dictionary of properties.
- * @param attachments a list of attachments.
- *
- * @return handled error ID.
- */
-+ (nullable NSString *)trackModelException:(MSACException *)exception
-                            withProperties:(nullable NSDictionary<NSString *, NSString *> *)properties
-                           withAttachments:(nullable NSArray<MSACErrorAttachmentLog *> *)attachments;
-
 /**
 * Get a generic error report representation for an handled exception.
 * This API is used by wrapper SDKs.
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#ifndef MSAC_WRAPPER_EXCEPTION_MODEL_H
+#define MSAC_WRAPPER_EXCEPTION_MODEL_H
+
+#if __has_include(<AppCenterCrashes/MSACExceptionModel.h>)
+#import <AppCenterCrashes/MSACExceptionModel.h>
+#import <AppCenterCrashes/MSACWrapperExceptionModel.h>
+#else
+#import "MSACExceptionModel.h"
+#import "MSACWrapperExceptionModel.h"
+#endif
+
+#if __has_include(<AppCenter/MSACSerializableObject.h>)
+#import <AppCenter/MSACSerializableObject.h>
+#else
+#import "MSACSerializableObject.h"
+#endif
+
+@interface MSACWrapperExceptionModel : MSACExceptionModel
+
+/*
+ * Inner exceptions of this exception [optional].
+ */
+@property(nonatomic, strong) NSArray<MSACWrapperExceptionModel *> *innerExceptions;
+
+/*
+ * Name of the wrapper SDK that emitted this exception.
+ * Consists of the name of the SDK and the wrapper platform, e.g. "appcenter.xamarin", "appcenter.react-native" [optional].
+ */
+@property(nonatomic, copy) NSString *wrapperSdkName;
+
+@end
+
+#endif
@@ -6,7 +6,7 @@
 	<dict>
 		<key>Headers/AppCenterCrashes.h</key>
 		<data>
-		eS1L4vZ9uOJZWtS26mqGyfAfCvE=
+		SUQZOPrzwqVaEYuELhr7Z/cRTh0=
 		</data>
 		<key>Headers/MSACCrashHandlerSetupDelegate.h</key>
 		<data>
@@ -14,11 +14,11 @@
 		</data>
 		<key>Headers/MSACCrashes.h</key>
 		<data>
-		eHC+/SrZ0R08kZxHQSoVyQf+vCo=
+		r8P9kK348cdQnlFX6FacTW6y3+c=
 		</data>
 		<key>Headers/MSACCrashesDelegate.h</key>
 		<data>
-		czYUE2OOoD3lc+2UHRPFMakb0jQ=
+		qnhKqY+vAsatzNxGZyoxFMmwIxI=
 		</data>
 		<key>Headers/MSACErrorAttachmentLog+Utility.h</key>
 		<data>
@@ -32,13 +32,25 @@
 		<data>
 		OZkejnc70UL+wPdiV8fw2UAcBR0=
 		</data>
+		<key>Headers/MSACExceptionModel.h</key>
+		<data>
+		FGcXjyUYzvd/LDjl0hc2Ah+1D1Q=
+		</data>
+		<key>Headers/MSACStackFrame.h</key>
+		<data>
+		j8bbwC65keur+uW6rxfIERJNFWI=
+		</data>
 		<key>Headers/MSACWrapperCrashesHelper.h</key>
 		<data>
-		PRoMqamOgoTAX8mweVFBYStiziQ=
+		XjDlLOnOWP3EG0z+nuYQDxLEVcY=
+		</data>
+		<key>Headers/MSACWrapperExceptionModel.h</key>
+		<data>
+		fTPRyH4z/TDoTMVaRXo1TWACDzI=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		aMhE7UvcWzAgWCrN2k2rUGdH2U0=
+		JMjfyLGFjbABfCXy4P+PQwS+lCg=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -51,11 +63,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			eS1L4vZ9uOJZWtS26mqGyfAfCvE=
+			SUQZOPrzwqVaEYuELhr7Z/cRTh0=
 			</data>
 			<key>hash2</key>
 			<data>
-			NFGxm6YjpGCjJNEfjv5SM7MyktNj/PHvSXflRV/5FPQ=
+			WBWD92kWeWBZQryXJRro9Jvi9658TsDl/cjdQNAbDnE=
 			</data>
 		</dict>
 		<key>Headers/MSACCrashHandlerSetupDelegate.h</key>
@@ -73,22 +85,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			eHC+/SrZ0R08kZxHQSoVyQf+vCo=
+			r8P9kK348cdQnlFX6FacTW6y3+c=
 			</data>
 			<key>hash2</key>
 			<data>
-			y7g3W+WahfsOp6fIuAPSEK9JbhjeFSzuTLIVlH5ij2o=
+			ArA6Fp1CT6yjdmOgK79Q9jnEO6aqIZyUIjHFq1c5QRk=
 			</data>
 		</dict>
 		<key>Headers/MSACCrashesDelegate.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			czYUE2OOoD3lc+2UHRPFMakb0jQ=
+			qnhKqY+vAsatzNxGZyoxFMmwIxI=
 			</data>
 			<key>hash2</key>
 			<data>
-			XWIFycuL8uPuweg15Kuzu0MAYjRG7O7p0VyVRzG0Ay0=
+			wBmXt8Cq5mUI+93edo6jk8yfyfYDxY35H+c4Lx6qjGE=
 			</data>
 		</dict>
 		<key>Headers/MSACErrorAttachmentLog+Utility.h</key>
@@ -124,15 +136,48 @@
 			Ph0QprvD6QWBekvlfshUpVdljO98TuiI8PRbZO/MB0Y=
 			</data>
 		</dict>
+		<key>Headers/MSACExceptionModel.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			FGcXjyUYzvd/LDjl0hc2Ah+1D1Q=
+			</data>
+			<key>hash2</key>
+			<data>
+			T3IzEs/a04qDb742vNe8EJwFOZgOGMa8zyKFSCXT/Rc=
+			</data>
+		</dict>
+		<key>Headers/MSACStackFrame.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			j8bbwC65keur+uW6rxfIERJNFWI=
+			</data>
+			<key>hash2</key>
+			<data>
+			mgx3oo8nZYPGWqp82VYFVJ5rj0oeEIiqnc+TOcled+I=
+			</data>
+		</dict>
 		<key>Headers/MSACWrapperCrashesHelper.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			PRoMqamOgoTAX8mweVFBYStiziQ=
+			XjDlLOnOWP3EG0z+nuYQDxLEVcY=
 			</data>
 			<key>hash2</key>
 			<data>
-			co5bCCKJlZU9L5fVlCUmO7enl7tPeRzM3TjHJkNwn58=
+			fq9x4VE7FvWa3M3oH8XTAeaDiZdZYxv8CTdkt24maBE=
+			</data>
+		</dict>
+		<key>Headers/MSACWrapperExceptionModel.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			fTPRyH4z/TDoTMVaRXo1TWACDzI=
+			</data>
+			<key>hash2</key>
+			<data>
+			blUKL+sJciIHT1DLWNSuktzjorY6OWNpl8ncsGosGd8=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>
@@ -9,12 +9,18 @@
 #import <AppCenterCrashes/MSACCrashesDelegate.h>
 #import <AppCenterCrashes/MSACErrorAttachmentLog+Utility.h>
 #import <AppCenterCrashes/MSACErrorAttachmentLog.h>
+#import <AppCenterCrashes/MSACExceptionModel.h>
+#import <AppCenterCrashes/MSACStackFrame.h>
 #import <AppCenterCrashes/MSACWrapperCrashesHelper.h>
+#import <AppCenterCrashes/MSACWrapperExceptionModel.h>
 #else
 #import "MSACCrashHandlerSetupDelegate.h"
 #import "MSACCrashes.h"
 #import "MSACCrashesDelegate.h"
 #import "MSACErrorAttachmentLog+Utility.h"
 #import "MSACErrorAttachmentLog.h"
+#import "MSACExceptionModel.h"
+#import "MSACStackFrame.h"
 #import "MSACWrapperCrashesHelper.h"
+#import "MSACWrapperExceptionModel.h"
 #endif
@@ -14,6 +14,8 @@
 #endif

@class MSACCrashesDelegate;
+@class MSACExceptionModel;
+@class MSACErrorAttachmentLog;

 /**
 * Custom block that handles the alert that prompts the user whether crash reports need to be processed or not.
@@ -69,6 +71,32 @@ typedef NS_ENUM(NSUInteger, MSACUserConfirmation) {
 NS_SWIFT_NAME(Crashes)
@interface MSACCrashes : MSACServiceAbstract

+/**
+ * Track handled error.
+ *
+ * @param error error.
+ * @param properties dictionary of properties.
+ * @param attachments a list of attachments.
+ *
+ * @return handled error ID.
+ */
+ (NSString *_Nonnull)trackError:(NSError *_Nonnull)error
+                  withProperties:(nullable NSDictionary<NSString *, NSString *> *)properties
+                     attachments:(nullable NSArray<MSACErrorAttachmentLog *> *)attachments NS_SWIFT_NAME(trackError(_:properties:attachments:));
+
+/**
+ * Track handled exception from custom exception model.
+ *
+ * @param exception custom model exception.
+ * @param properties dictionary of properties.
+ * @param attachments a list of attachments.
+ *
+ * @return handled error ID.
+ */
+ (NSString *_Nonnull)trackException:(MSACExceptionModel *_Nonnull)exception
+                      withProperties:(nullable NSDictionary<NSString *, NSString *> *)properties
+                         attachments:(nullable NSArray<MSACErrorAttachmentLog *> *)attachments NS_SWIFT_NAME(trackException(_:properties:attachments:));
+
 ///-----------------------------------------------------------------------------
 /// @name Testing Crashes Feature
 ///-----------------------------------------------------------------------------
@@ -51,7 +51,7 @@ NS_SWIFT_NAME(CrashesDelegate)
 * @param errorReport The errorReport that App Center tried to send.
 * @param error The error that occurred.
 */
- (void)crashes:(MSACCrashes *)crashes didFailSendingErrorReport:(MSACErrorReport *)errorReport withError:(NSError *)error;
+- (void)crashes:(MSACCrashes *)crashes didFailSendingErrorReport:(MSACErrorReport *)errorReport withError:(nullable NSError *)error;

 /**
 * Method to get the attachments associated to an error report.
@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#ifndef MSAC_EXCEPTION_MODEL_H
+#define MSAC_EXCEPTION_MODEL_H
+
+#if __has_include(<AppCenter/MSACSerializableObject.h>)
+#import <AppCenter/MSACSerializableObject.h>
+#else
+#import "MSACSerializableObject.h"
+#endif
+
+@class MSACStackFrame;
+
+NS_SWIFT_NAME(ExceptionModel)
+@interface MSACExceptionModel : NSObject <MSACSerializableObject>
+
+/**
+ * Creates an instance of exception model.
+ *
+ * @param error error.
+ *
+ * @return A new instance of exception.
+ */
+- (instancetype)initWithError:(NSError *)error NS_SWIFT_NAME(init(withError:));
+
+/**
+ * Creates an instance of exception model.
+ *
+ * @param exceptionType exception type.
+ * @param exceptionMessage exception message.
+ * @param stackTrace stack trace.
+ *
+ * @return A new instance of exception.
+ */
+- (instancetype)initWithType:(NSString *)exceptionType
+            exceptionMessage:(NSString *)exceptionMessage
+                  stackTrace:(NSArray<NSString *> *)stackTrace
+               NS_SWIFT_NAME(init(withType:exceptionMessage:stackTrace:));
+
+/**
+ * Creates an instance of exception model.
+ *
+ * @exception exception.
+ *
+ * @return A new instance of exception.
+ */
+- (instancetype)initWithException:(NSException *)exception NS_SWIFT_NAME(init(withException:));
+
+/**
+ * Exception type.
+ */
+@property(nonatomic, copy) NSString *type;
+
+/**
+ * Exception reason.
+ */
+@property(nonatomic, copy) NSString *message;
+
+/**
+ * Raw stack trace. Sent when the frames property is either missing or unreliable.
+ */
+@property(nonatomic, copy) NSString *stackTrace;
+
+/**
+ * Stack frames [optional].
+ */
+@property(nonatomic, strong) NSArray<MSACStackFrame *> *frames;
+
+/**
+ * Checks if the object's values are valid.
+ *
+ * @return YES, if the object is valid.
+ */
+- (BOOL)isValid;
+
+@end
+
+#endif
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#if __has_include(<AppCenter/MSACSerializableObject.h>)
+#import <AppCenter/MSACSerializableObject.h>
+#else
+#import "MSACSerializableObject.h"
+#endif
+
+@interface MSACStackFrame : NSObject <MSACSerializableObject>
+
+/*
+ * Frame address [optional].
+ */
+@property(nonatomic, copy) NSString *address;
+
+/*
+ * Symbolized code line [optional].
+ */
+@property(nonatomic, copy) NSString *code;
+
+/*
+ * The fully qualified name of the Class containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSString *className;
+
+/*
+ * The name of the method containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSString *methodName;
+
+/*
+ * The line number of the source line containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSNumber *lineNumber;
+
+/*
+ * The name of the file containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSString *fileName;
+
+@end
@@ -13,7 +13,6 @@ NS_ASSUME_NONNULL_BEGIN

@class MSACErrorReport;
@class MSACErrorAttachmentLog;
-@class MSACException;

 /**
 * This general class allows wrappers to supplement the Crashes SDK with their own behavior.
@@ -25,7 +24,7 @@ NS_SWIFT_NAME(WrapperCrashesHelper)
 * The crash handler setup delegate.
 *
 */
-@property(class, nonatomic) _Nullable id<MSACCrashHandlerSetupDelegate> crashHandlerSetupDelegate;
+@property(class, nonatomic, weak) _Nullable id<MSACCrashHandlerSetupDelegate> crashHandlerSetupDelegate;

 /**
 * Gets the crash handler setup delegate.
@@ -65,20 +64,6 @@ NS_SWIFT_NAME(WrapperCrashesHelper)
 */
 + (void)sendErrorAttachments:(NSArray<MSACErrorAttachmentLog *> *)errorAttachments withIncidentIdentifier:(NSString *)incidentIdentifier;

-/**
- * Track handled exception directly as model form.
- * This API is used by wrapper SDKs.
- *
- * @param exception model form exception.
- * @param properties dictionary of properties.
- * @param attachments a list of attachments.
- *
- * @return handled error ID.
- */
-+ (nullable NSString *)trackModelException:(MSACException *)exception
-                            withProperties:(nullable NSDictionary<NSString *, NSString *> *)properties
-                           withAttachments:(nullable NSArray<MSACErrorAttachmentLog *> *)attachments;
-
 /**
 * Get a generic error report representation for an handled exception.
 * This API is used by wrapper SDKs.
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#ifndef MSAC_WRAPPER_EXCEPTION_MODEL_H
+#define MSAC_WRAPPER_EXCEPTION_MODEL_H
+
+#if __has_include(<AppCenterCrashes/MSACExceptionModel.h>)
+#import <AppCenterCrashes/MSACExceptionModel.h>
+#import <AppCenterCrashes/MSACWrapperExceptionModel.h>
+#else
+#import "MSACExceptionModel.h"
+#import "MSACWrapperExceptionModel.h"
+#endif
+
+#if __has_include(<AppCenter/MSACSerializableObject.h>)
+#import <AppCenter/MSACSerializableObject.h>
+#else
+#import "MSACSerializableObject.h"
+#endif
+
+@interface MSACWrapperExceptionModel : MSACExceptionModel
+
+/*
+ * Inner exceptions of this exception [optional].
+ */
+@property(nonatomic, strong) NSArray<MSACWrapperExceptionModel *> *innerExceptions;
+
+/*
+ * Name of the wrapper SDK that emitted this exception.
+ * Consists of the name of the SDK and the wrapper platform, e.g. "appcenter.xamarin", "appcenter.react-native" [optional].
+ */
+@property(nonatomic, copy) NSString *wrapperSdkName;
+
+@end
+
+#endif
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>19H15</string>
+	<string>19H1323</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -9,12 +9,18 @@
 #import <AppCenterCrashes/MSACCrashesDelegate.h>
 #import <AppCenterCrashes/MSACErrorAttachmentLog+Utility.h>
 #import <AppCenterCrashes/MSACErrorAttachmentLog.h>
+#import <AppCenterCrashes/MSACExceptionModel.h>
+#import <AppCenterCrashes/MSACStackFrame.h>
 #import <AppCenterCrashes/MSACWrapperCrashesHelper.h>
+#import <AppCenterCrashes/MSACWrapperExceptionModel.h>
 #else
 #import "MSACCrashHandlerSetupDelegate.h"
 #import "MSACCrashes.h"
 #import "MSACCrashesDelegate.h"
 #import "MSACErrorAttachmentLog+Utility.h"
 #import "MSACErrorAttachmentLog.h"
+#import "MSACExceptionModel.h"
+#import "MSACStackFrame.h"
 #import "MSACWrapperCrashesHelper.h"
+#import "MSACWrapperExceptionModel.h"
 #endif
@@ -14,6 +14,8 @@
 #endif

@class MSACCrashesDelegate;
+@class MSACExceptionModel;
+@class MSACErrorAttachmentLog;

 /**
 * Custom block that handles the alert that prompts the user whether crash reports need to be processed or not.
@@ -69,6 +71,32 @@ typedef NS_ENUM(NSUInteger, MSACUserConfirmation) {
 NS_SWIFT_NAME(Crashes)
@interface MSACCrashes : MSACServiceAbstract

+/**
+ * Track handled error.
+ *
+ * @param error error.
+ * @param properties dictionary of properties.
+ * @param attachments a list of attachments.
+ *
+ * @return handled error ID.
+ */
+ (NSString *_Nonnull)trackError:(NSError *_Nonnull)error
+                  withProperties:(nullable NSDictionary<NSString *, NSString *> *)properties
+                     attachments:(nullable NSArray<MSACErrorAttachmentLog *> *)attachments NS_SWIFT_NAME(trackError(_:properties:attachments:));
+
+/**
+ * Track handled exception from custom exception model.
+ *
+ * @param exception custom model exception.
+ * @param properties dictionary of properties.
+ * @param attachments a list of attachments.
+ *
+ * @return handled error ID.
+ */
+ (NSString *_Nonnull)trackException:(MSACExceptionModel *_Nonnull)exception
+                      withProperties:(nullable NSDictionary<NSString *, NSString *> *)properties
+                         attachments:(nullable NSArray<MSACErrorAttachmentLog *> *)attachments NS_SWIFT_NAME(trackException(_:properties:attachments:));
+
 ///-----------------------------------------------------------------------------
 /// @name Testing Crashes Feature
 ///-----------------------------------------------------------------------------
@@ -51,7 +51,7 @@ NS_SWIFT_NAME(CrashesDelegate)
 * @param errorReport The errorReport that App Center tried to send.
 * @param error The error that occurred.
 */
- (void)crashes:(MSACCrashes *)crashes didFailSendingErrorReport:(MSACErrorReport *)errorReport withError:(NSError *)error;
+- (void)crashes:(MSACCrashes *)crashes didFailSendingErrorReport:(MSACErrorReport *)errorReport withError:(nullable NSError *)error;

 /**
 * Method to get the attachments associated to an error report.
@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#ifndef MSAC_EXCEPTION_MODEL_H
+#define MSAC_EXCEPTION_MODEL_H
+
+#if __has_include(<AppCenter/MSACSerializableObject.h>)
+#import <AppCenter/MSACSerializableObject.h>
+#else
+#import "MSACSerializableObject.h"
+#endif
+
+@class MSACStackFrame;
+
+NS_SWIFT_NAME(ExceptionModel)
+@interface MSACExceptionModel : NSObject <MSACSerializableObject>
+
+/**
+ * Creates an instance of exception model.
+ *
+ * @param error error.
+ *
+ * @return A new instance of exception.
+ */
+- (instancetype)initWithError:(NSError *)error NS_SWIFT_NAME(init(withError:));
+
+/**
+ * Creates an instance of exception model.
+ *
+ * @param exceptionType exception type.
+ * @param exceptionMessage exception message.
+ * @param stackTrace stack trace.
+ *
+ * @return A new instance of exception.
+ */
+- (instancetype)initWithType:(NSString *)exceptionType
+            exceptionMessage:(NSString *)exceptionMessage
+                  stackTrace:(NSArray<NSString *> *)stackTrace
+               NS_SWIFT_NAME(init(withType:exceptionMessage:stackTrace:));
+
+/**
+ * Creates an instance of exception model.
+ *
+ * @exception exception.
+ *
+ * @return A new instance of exception.
+ */
+- (instancetype)initWithException:(NSException *)exception NS_SWIFT_NAME(init(withException:));
+
+/**
+ * Exception type.
+ */
+@property(nonatomic, copy) NSString *type;
+
+/**
+ * Exception reason.
+ */
+@property(nonatomic, copy) NSString *message;
+
+/**
+ * Raw stack trace. Sent when the frames property is either missing or unreliable.
+ */
+@property(nonatomic, copy) NSString *stackTrace;
+
+/**
+ * Stack frames [optional].
+ */
+@property(nonatomic, strong) NSArray<MSACStackFrame *> *frames;
+
+/**
+ * Checks if the object's values are valid.
+ *
+ * @return YES, if the object is valid.
+ */
+- (BOOL)isValid;
+
+@end
+
+#endif
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#if __has_include(<AppCenter/MSACSerializableObject.h>)
+#import <AppCenter/MSACSerializableObject.h>
+#else
+#import "MSACSerializableObject.h"
+#endif
+
+@interface MSACStackFrame : NSObject <MSACSerializableObject>
+
+/*
+ * Frame address [optional].
+ */
+@property(nonatomic, copy) NSString *address;
+
+/*
+ * Symbolized code line [optional].
+ */
+@property(nonatomic, copy) NSString *code;
+
+/*
+ * The fully qualified name of the Class containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSString *className;
+
+/*
+ * The name of the method containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSString *methodName;
+
+/*
+ * The line number of the source line containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSNumber *lineNumber;
+
+/*
+ * The name of the file containing the execution point represented by this stack trace element [optional].
+ */
+@property(nonatomic, copy) NSString *fileName;
+
+@end
@@ -13,7 +13,6 @@ NS_ASSUME_NONNULL_BEGIN

@class MSACErrorReport;
@class MSACErrorAttachmentLog;
-@class MSACException;

 /**
 * This general class allows wrappers to supplement the Crashes SDK with their own behavior.
@@ -25,7 +24,7 @@ NS_SWIFT_NAME(WrapperCrashesHelper)
 * The crash handler setup delegate.
 *
 */
-@property(class, nonatomic) _Nullable id<MSACCrashHandlerSetupDelegate> crashHandlerSetupDelegate;
+@property(class, nonatomic, weak) _Nullable id<MSACCrashHandlerSetupDelegate> crashHandlerSetupDelegate;

 /**
 * Gets the crash handler setup delegate.
@@ -65,20 +64,6 @@ NS_SWIFT_NAME(WrapperCrashesHelper)
 */
 + (void)sendErrorAttachments:(NSArray<MSACErrorAttachmentLog *> *)errorAttachments withIncidentIdentifier:(NSString *)incidentIdentifier;

-/**
- * Track handled exception directly as model form.
- * This API is used by wrapper SDKs.
- *
- * @param exception model form exception.
- * @param properties dictionary of properties.
- * @param attachments a list of attachments.
- *
- * @return handled error ID.
- */
-+ (nullable NSString *)trackModelException:(MSACException *)exception
-                            withProperties:(nullable NSDictionary<NSString *, NSString *> *)properties
-                           withAttachments:(nullable NSArray<MSACErrorAttachmentLog *> *)attachments;
-
 /**
 * Get a generic error report representation for an handled exception.
 * This API is used by wrapper SDKs.
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#import <Foundation/Foundation.h>
+
+#ifndef MSAC_WRAPPER_EXCEPTION_MODEL_H
+#define MSAC_WRAPPER_EXCEPTION_MODEL_H
+
+#if __has_include(<AppCenterCrashes/MSACExceptionModel.h>)
+#import <AppCenterCrashes/MSACExceptionModel.h>
+#import <AppCenterCrashes/MSACWrapperExceptionModel.h>
+#else
+#import "MSACExceptionModel.h"
+#import "MSACWrapperExceptionModel.h"
+#endif
+
+#if __has_include(<AppCenter/MSACSerializableObject.h>)
+#import <AppCenter/MSACSerializableObject.h>
+#else
+#import "MSACSerializableObject.h"
+#endif
+
+@interface MSACWrapperExceptionModel : MSACExceptionModel
+
+/*
+ * Inner exceptions of this exception [optional].
+ */
+@property(nonatomic, strong) NSArray<MSACWrapperExceptionModel *> *innerExceptions;
+
+/*
+ * Name of the wrapper SDK that emitted this exception.
+ * Consists of the name of the SDK and the wrapper platform, e.g. "appcenter.xamarin", "appcenter.react-native" [optional].
+ */
+@property(nonatomic, copy) NSString *wrapperSdkName;
+
+@end
+
+#endif