mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-24 01:48:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

add zxing lib

Browse source
This commit is contained in:
Kyle Spearrin 2019-05-22 20:28:31 -04:00
parent b8cbd5e0aa
commit ea3dcd6250
5 changed files with 1205 additions and 1180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Android/MainActivity.cs
View file

@ -87,6 +87,8 @@ namespace Bit.Droid
else
{
Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
ZXing.Net.Mobile.Forms.Android.PermissionsHandler.OnRequestPermissionsResult(
requestCode, permissions, grantResults);
}
base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
}

7
src/Android/MainApplication.cs
View file

@ -42,10 +42,13 @@ namespace Bit.Droid
private void RegisterLocalServices()
{
// CrossFingerprint.SetCurrentActivityResolver(() => CrossCurrentActivity.Current.Activity);
Refractored.FabControl.Droid.FloatingActionButtonViewRenderer.Init();
// Note: This might cause a race condition. Investigate more.
Task.Run(() => FFImageLoading.Forms.Platform.CachedImageRenderer.Init(true));
Task.Run(() =>
{
FFImageLoading.Forms.Platform.CachedImageRenderer.Init(true);
ZXing.Net.Mobile.Forms.Android.Platform.Init();
});
CrossFingerprint.SetCurrentActivityResolver(() => CrossCurrentActivity.Current.Activity);
var preferencesStorage = new PreferencesStorageService(null);

2374
src/Android/Resources/Resource.designer.cs generated
View file

File diff suppressed because it is too large Load diff

1
src/App/App.csproj
View file

@ -17,6 +17,7 @@
<PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
<PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.10.972" />
<PackageReference Include="Xamarin.Forms" Version="3.6.0.344457" />
<PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.1.47" />
</ItemGroup>
<ItemGroup>

1
src/iOS/AppDelegate.cs
View file

@ -28,6 +28,7 @@ namespace Bit.iOS
LoadApplication(new App.App(null));
ZXing.Net.Mobile.Forms.iOS.Platform.Init();
return base.FinishedLaunching(app, options);
}
}