From d800e9a43e4174215183dcf9d79b51538ebe414f Mon Sep 17 00:00:00 2001 From: Federico Maccaroni Date: Tue, 11 Oct 2022 17:47:52 -0300 Subject: [PATCH] EC-602 Constants namespace fix (#2127) --- src/Android/Accessibility/AccessibilityHelpers.cs | 2 +- src/Android/Autofill/AutofillService.cs | 2 +- src/Android/Autofill/Parser.cs | 2 +- src/Android/MainActivity.cs | 12 ++++++------ src/Android/MainApplication.cs | 4 ++-- .../Services/AndroidPushNotificationService.cs | 4 ++-- src/Android/Services/DeviceActionService.cs | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Android/Accessibility/AccessibilityHelpers.cs b/src/Android/Accessibility/AccessibilityHelpers.cs index 81d7fa65f..cfc1bc77f 100644 --- a/src/Android/Accessibility/AccessibilityHelpers.cs +++ b/src/Android/Accessibility/AccessibilityHelpers.cs @@ -367,7 +367,7 @@ namespace Bit.Droid.Accessibility public static string GetUri(AccessibilityNodeInfo root) { - var uri = string.Concat(Constants.AndroidAppProtocol, root.PackageName); + var uri = string.Concat(Core.Constants.AndroidAppProtocol, root.PackageName); if (SupportedBrowsers.ContainsKey(root.PackageName)) { var browser = SupportedBrowsers[root.PackageName]; diff --git a/src/Android/Autofill/AutofillService.cs b/src/Android/Autofill/AutofillService.cs index 97bc07ae4..3becfe4ac 100644 --- a/src/Android/Autofill/AutofillService.cs +++ b/src/Android/Autofill/AutofillService.cs @@ -134,7 +134,7 @@ namespace Bit.Droid.Autofill { case CipherType.Login: intent.PutExtra("autofillFrameworkName", parser.Uri - .Replace(Constants.AndroidAppProtocol, string.Empty) + .Replace(Core.Constants.AndroidAppProtocol, string.Empty) .Replace("https://", string.Empty) .Replace("http://", string.Empty)); intent.PutExtra("autofillFrameworkUri", parser.Uri); diff --git a/src/Android/Autofill/Parser.cs b/src/Android/Autofill/Parser.cs index 45a2fdb0b..4bc2ebca5 100644 --- a/src/Android/Autofill/Parser.cs +++ b/src/Android/Autofill/Parser.cs @@ -48,7 +48,7 @@ namespace Bit.Droid.Autofill } else { - _uri = string.Concat(Constants.AndroidAppProtocol, PackageName); + _uri = string.Concat(Core.Constants.AndroidAppProtocol, PackageName); } return _uri; } diff --git a/src/Android/MainActivity.cs b/src/Android/MainActivity.cs index 9ff6afc42..751cd7f2a 100644 --- a/src/Android/MainActivity.cs +++ b/src/Android/MainActivity.cs @@ -150,9 +150,9 @@ namespace Bit.Droid .GetAwaiter() .GetResult(); - if (Intent?.GetStringExtra(Constants.NotificationData) is string notificationDataJson) + if (Intent?.GetStringExtra(Core.Constants.NotificationData) is string notificationDataJson) { - var notificationType = JToken.Parse(notificationDataJson).SelectToken(Constants.NotificationDataType); + var notificationType = JToken.Parse(notificationDataJson).SelectToken(Core.Constants.NotificationDataType); if (notificationType.ToString() == PasswordlessNotificationData.TYPE) { _pushNotificationListenerService.OnNotificationTapped(JsonConvert.DeserializeObject(notificationDataJson)).FireAndForget(); @@ -211,7 +211,7 @@ namespace Bit.Droid public async override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Permission[] grantResults) { - if (requestCode == Constants.SelectFilePermissionRequestCode) + if (requestCode == Core.Constants.SelectFilePermissionRequestCode) { if (grantResults.Any(r => r != Permission.Granted)) { @@ -230,7 +230,7 @@ namespace Bit.Droid protected override void OnActivityResult(int requestCode, Result resultCode, Intent data) { if (resultCode == Result.Ok && - (requestCode == Constants.SelectFileRequestCode || requestCode == Constants.SaveFileRequestCode)) + (requestCode == Core.Constants.SelectFileRequestCode || requestCode == Core.Constants.SaveFileRequestCode)) { Android.Net.Uri uri = null; string fileName = null; @@ -252,7 +252,7 @@ namespace Bit.Droid return; } - if (requestCode == Constants.SaveFileRequestCode) + if (requestCode == Core.Constants.SaveFileRequestCode) { _messagingService.Send("selectSaveFileResult", new Tuple(uri.ToString(), fileName)); @@ -433,7 +433,7 @@ namespace Bit.Droid return; } - var channel = new NotificationChannel(Constants.AndroidNotificationChannelId, AppResources.AllNotifications, NotificationImportance.Default); + var channel = new NotificationChannel(Core.Constants.AndroidNotificationChannelId, AppResources.AllNotifications, NotificationImportance.Default); if(GetSystemService(NotificationService) is NotificationManager notificationManager) { notificationManager.CreateNotificationChannel(channel); diff --git a/src/Android/MainApplication.cs b/src/Android/MainApplication.cs index 3388b2ea7..ef0b6f303 100644 --- a/src/Android/MainApplication.cs +++ b/src/Android/MainApplication.cs @@ -46,8 +46,8 @@ namespace Bit.Droid { RegisterLocalServices(); var deviceActionService = ServiceContainer.Resolve("deviceActionService"); - ServiceContainer.Init(deviceActionService.DeviceUserAgent, Constants.ClearCiphersCacheKey, - Constants.AndroidAllClearCipherCacheKeys); + ServiceContainer.Init(deviceActionService.DeviceUserAgent, Core.Constants.ClearCiphersCacheKey, + Core.Constants.AndroidAllClearCipherCacheKeys); InitializeAppSetup(); // TODO: Update when https://github.com/bitwarden/mobile/pull/1662 gets merged diff --git a/src/Android/Services/AndroidPushNotificationService.cs b/src/Android/Services/AndroidPushNotificationService.cs index 97e5c2daf..03f8ad672 100644 --- a/src/Android/Services/AndroidPushNotificationService.cs +++ b/src/Android/Services/AndroidPushNotificationService.cs @@ -79,11 +79,11 @@ namespace Bit.Droid.Services var context = Android.App.Application.Context; var intent = new Intent(context, typeof(MainActivity)); - intent.PutExtra(Constants.NotificationData, JsonConvert.SerializeObject(data)); + intent.PutExtra(Core.Constants.NotificationData, JsonConvert.SerializeObject(data)); var pendingIntentFlags = AndroidHelpers.AddPendingIntentMutabilityFlag(PendingIntentFlags.UpdateCurrent, true); var pendingIntent = PendingIntent.GetActivity(context, 20220801, intent, pendingIntentFlags); - var builder = new NotificationCompat.Builder(context, Constants.AndroidNotificationChannelId) + var builder = new NotificationCompat.Builder(context, Core.Constants.AndroidNotificationChannelId) .SetContentIntent(pendingIntent) .SetContentTitle(title) .SetContentText(message) diff --git a/src/Android/Services/DeviceActionService.cs b/src/Android/Services/DeviceActionService.cs index a66a3370c..452fb0b81 100644 --- a/src/Android/Services/DeviceActionService.cs +++ b/src/Android/Services/DeviceActionService.cs @@ -321,7 +321,7 @@ namespace Bit.Droid.Services intent.AddCategory(Intent.CategoryOpenable); intent.PutExtra(Intent.ExtraTitle, fileName); - activity.StartActivityForResult(intent, Constants.SaveFileRequestCode); + activity.StartActivityForResult(intent, Core.Constants.SaveFileRequestCode); return true; } catch (Exception ex) @@ -386,7 +386,7 @@ namespace Bit.Droid.Services { chooserIntent.PutExtra(Intent.ExtraInitialIntents, additionalIntents.ToArray()); } - activity.StartActivityForResult(chooserIntent, Constants.SelectFileRequestCode); + activity.StartActivityForResult(chooserIntent, Core.Constants.SelectFileRequestCode); return Task.FromResult(0); } @@ -882,7 +882,7 @@ namespace Bit.Droid.Services private void AskPermission(string permission) { ActivityCompat.RequestPermissions(CrossCurrentActivity.Current.Activity, new string[] { permission }, - Constants.SelectFilePermissionRequestCode); + Core.Constants.SelectFilePermissionRequestCode); } private List GetCameraIntents(Android.Net.Uri outputUri)