bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-29 06:33:53 +00:00
Code Issues Releases Wiki Activity

convert user dialogs to native XF options

Browse Source
This commit is contained in:
Kyle Spearrin
2017-12-22 22:41:48 -05:00
parent 7a19c50ec0
commit 0270cf6e45
28 changed files with 90 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Android/MainActivity.cs
View File

@@ -7,7 +7,6 @@ using Bit.App.Abstractions;
using XLabs.Ioc;
using Plugin.Settings.Abstractions;
using Plugin.Connectivity.Abstractions;
using Acr.UserDialogs;
using Android.Content;
using System.Reflection;
using Xamarin.Forms.Platform.Android;
@@ -77,12 +76,10 @@ namespace Bit.Android
_appOptions,
Resolver.Resolve<IAuthService>(),
Resolver.Resolve<IConnectivity>(),
Resolver.Resolve<IUserDialogs>(),
Resolver.Resolve<IDatabaseService>(),
Resolver.Resolve<ISyncService>(),
_settings,
Resolver.Resolve<ILockService>(),
Resolver.Resolve<IGoogleAnalyticsService>(),
Resolver.Resolve<ILocalizeService>(),
Resolver.Resolve<IAppInfoService>(),
Resolver.Resolve<IAppSettingsService>(),

10
src/Android/Services/DeviceActionService.cs
View File

@@ -23,7 +23,6 @@ using Android.App.Assist;
using Bit.Android.Autofill;
using System.Linq;
using Plugin.Settings.Abstractions;
using Acr.UserDialogs;
using Android.Views.InputMethods;
namespace Bit.Android.Services
@@ -31,16 +30,13 @@ namespace Bit.Android.Services
public class DeviceActionService : IDeviceActionService
{
private readonly IAppSettingsService _appSettingsService;
private readonly IUserDialogs _userDialogs;
private bool _cameraPermissionsDenied;
private DateTime? _lastAction;
public DeviceActionService(
IAppSettingsService appSettingsService,
IUserDialogs userDialogs)
IAppSettingsService appSettingsService)
{
_appSettingsService = appSettingsService;
_userDialogs = userDialogs;
}
private Context CurrentContext => CrossCurrentActivity.Current.Activity;
@@ -312,7 +308,7 @@ namespace Bit.Android.Services
activity.StartActivity(intent);
}
public void LaunchApp(string appName)
public async Task LaunchAppAsync(string appName, Page page)
{
var activity = (MainActivity)CurrentContext;
if(_lastAction.LastActionWasRecent())
@@ -325,7 +321,7 @@ namespace Bit.Android.Services
var launchIntent = activity.PackageManager.GetLaunchIntentForPackage(appName);
if(launchIntent == null)
{
_userDialogs.Alert(string.Format(AppResources.CannotOpenApp, appName));
await page.DisplayAlert(null, string.Format(AppResources.CannotOpenApp, appName), AppResources.Ok);
}
else
{