Cleanup ReceiveSetupActivity

nearby-sharing · Jan 6, 2025 · 5aa8606 · 5aa8606
1 parent 68d2c11
commit 5aa8606
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/ReceiveActivity.cs b/src/ReceiveActivity.cs
@@ -38,7 +38,7 @@ protected override void OnCreate(Bundle? savedInstanceState)
     {
         base.OnCreate(savedInstanceState);
 
-        if (ReceiveSetupActivity.IsSetupRequired(this) || !ReceiveSetupActivity.TryGetBtAddress(this, out btAddress) || btAddress == null)
+        if (ReceiveSetupActivity.IsSetupRequired(this) || !ReceiveSetupActivity.TryGetBtAddress(this, out btAddress))
         {
             StartActivity(new Intent(this, typeof(ReceiveSetupActivity)));
 

diff --git a/src/ReceiveSetupActivity.cs b/src/ReceiveSetupActivity.cs
@@ -4,6 +4,7 @@
 using AndroidX.AppCompat.App;
 using Google.Android.Material.TextField;
 using ShortDev.Microsoft.ConnectedDevices;
+using System.Diagnostics.CodeAnalysis;
 using System.Net.NetworkInformation;
 
 namespace NearShare.Droid;
@@ -89,17 +90,17 @@ protected override void OnCreate(Bundle? savedInstanceState)
         }
     }
 
-    static ISharedPreferences GetPreferences(Activity activity)
-        => activity.GetSharedPreferences("mac_settings", FileCreationMode.MultiProcess)!;
+    static ISharedPreferences GetPreferences(Context context)
+        => context.GetSharedPreferences("mac_settings", FileCreationMode.MultiProcess)!;
 
-    public static bool IsSetupRequired(Activity activity)
-        => string.IsNullOrEmpty(GetPreferences(activity).GetString(Preference_MacAddress, null));
+    public static bool IsSetupRequired(Context context)
+        => string.IsNullOrEmpty(GetPreferences(context).GetString(Preference_MacAddress, null));
 
-    public static bool TryGetBtAddress(Activity activity, out PhysicalAddress? btAddress)
+    public static bool TryGetBtAddress(Context context, [NotNullWhen(true)] out PhysicalAddress? btAddress)
     {
         btAddress = null;
 
-        var addressStr = GetPreferences(activity).GetString(Preference_MacAddress, null);
+        var addressStr = GetPreferences(context).GetString(Preference_MacAddress, null);
         if (string.IsNullOrEmpty(addressStr))
             return false;