From 685bed5daaf09e9315ac44d3d0fe965f6c71064c Mon Sep 17 00:00:00 2001
From: Ryan Heise <ryan@ryanheise.com>
Date: Mon, 1 Feb 2021 17:03:53 +1100
Subject: [PATCH] Fix method channel casts. Version 0.1.0-nullsafety.3

---
 CHANGELOG.md         |  4 ++++
 example/pubspec.lock |  2 +-
 lib/src/android.dart |  7 +++----
 lib/src/darwin.dart  | 37 ++++++++++++++++---------------------
 pubspec.yaml         |  2 +-
 5 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f94e443..852939c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.0-nullsafety.3
+
+* Fix casts on method channel invocations.
+
 ## 0.1.0-nullsafety.2
 
 * Merge features and bug fixes from 0.0.10 and 0.0.11.
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 4ed1d1d..6177f1d 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -14,7 +14,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.0-nullsafety.2"
+    version: "0.1.0-nullsafety.3"
   boolean_selector:
     dependency: transitive
     description:
diff --git a/lib/src/android.dart b/lib/src/android.dart
index f37f10d..2f0007d 100644
--- a/lib/src/android.dart
+++ b/lib/src/android.dart
@@ -36,13 +36,12 @@ class AndroidAudioManager {
 
   Future<bool> requestAudioFocus(AndroidAudioFocusRequest focusRequest) async {
     _onAudioFocusChanged = focusRequest.onAudioFocusChanged;
-    return await (_channel.invokeMethod<bool>(
-        'requestAudioFocus', [focusRequest.toJson()]) as FutureOr<bool>);
+    return (await (_channel
+        .invokeMethod<bool>('requestAudioFocus', [focusRequest.toJson()])))!;
   }
 
   Future<bool> abandonAudioFocus() async {
-    return await (_channel.invokeMethod<bool>('abandonAudioFocus')
-        as FutureOr<bool>);
+    return (await (_channel.invokeMethod<bool>('abandonAudioFocus')))!;
   }
 
   void close() {
diff --git a/lib/src/darwin.dart b/lib/src/darwin.dart
index 859ad0a..ac86668 100644
--- a/lib/src/darwin.dart
+++ b/lib/src/darwin.dart
@@ -74,8 +74,7 @@ class AVAudioSession {
       _mediaServicesWereResetSubject.stream;
 
   Future<AVAudioSessionCategory> get category async {
-    final index =
-        await (_channel.invokeMethod<int>('getCategory') as FutureOr<int>);
+    final index = (await (_channel.invokeMethod<int>('getCategory')))!;
     return AVAudioSessionCategory.values[index];
   }
 
@@ -95,14 +94,12 @@ class AVAudioSession {
           .toList();
 
   Future<AVAudioSessionCategoryOptions> get categoryOptions async {
-    final value = await (_channel.invokeMethod<int>('getCategoryOptions')
-        as FutureOr<int>);
+    final value = (await (_channel.invokeMethod<int>('getCategoryOptions')))!;
     return AVAudioSessionCategoryOptions(value);
   }
 
   Future<AVAudioSessionMode> get mode async {
-    final index =
-        await (_channel.invokeMethod<int>('getMode') as FutureOr<int>);
+    final index = (await (_channel.invokeMethod<int>('getMode')))!;
     return AVAudioSessionMode.values[index];
   }
 
@@ -125,29 +122,27 @@ class AVAudioSession {
   }
 
   Future<bool> setActive(bool active,
-          {AVAudioSessionSetActiveOptions? avOptions}) =>
-      _channel.invokeMethod<bool>('setActive', [active, avOptions?.value])
-          as Future<bool>;
+          {AVAudioSessionSetActiveOptions? avOptions}) async =>
+      (await _channel
+          .invokeMethod<bool>('setActive', [active, avOptions?.value]))!;
 
   Future<AVAudioSessionRecordPermission> get recordPermission async {
-    final index = await (_channel.invokeMethod<int>('getRecordPermission')
-        as FutureOr<int>);
+    final index = (await (_channel.invokeMethod<int>('getRecordPermission')))!;
     return AVAudioSessionRecordPermission.values[index];
   }
 
-  Future<bool> requestRecordPermission() =>
-      _channel.invokeMethod<bool>('requestRecordPermission') as Future<bool>;
+  Future<bool> requestRecordPermission() async =>
+      (await _channel.invokeMethod<bool>('requestRecordPermission'))!;
 
-  Future<bool> get isOtherAudioPlaying =>
-      _channel.invokeMethod<bool>('isOtherAudioPlaying') as Future<bool>;
+  Future<bool> get isOtherAudioPlaying async =>
+      (await _channel.invokeMethod<bool>('isOtherAudioPlaying'))!;
 
-  Future<bool> get secondaryAudioShouldBeSilencedHint =>
-      _channel.invokeMethod<bool>('getSecondaryAudioShouldBeSilencedHint')
-          as Future<bool>;
+  Future<bool> get secondaryAudioShouldBeSilencedHint async => (await _channel
+      .invokeMethod<bool>('getSecondaryAudioShouldBeSilencedHint'))!;
 
-  Future<bool> get allowHapticsAndSystemSoundsDuringRecording => _channel
-          .invokeMethod<bool>('getAllowHapticsAndSystemSoundsDuringRecording')
-      as Future<bool>;
+  Future<bool> get allowHapticsAndSystemSoundsDuringRecording async =>
+      (await _channel.invokeMethod<bool>(
+          'getAllowHapticsAndSystemSoundsDuringRecording'))!;
 
   Future<void> setAllowHapticsAndSystemSoundsDuringRecording(bool allow) =>
       _channel.invokeMethod(
diff --git a/pubspec.yaml b/pubspec.yaml
index b188835..1f62fc3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: audio_session
 description: Sets the iOS audio session category and Android audio attributes for your app, and manages your app's audio focus, mixing and ducking behaviour.
-version: 0.1.0-nullsafety.2
+version: 0.1.0-nullsafety.3
 homepage: https://github.com/ryanheise/audio_session
 
 environment: