mirror of
https://github.com/bitwarden/android.git
synced 2024-10-31 15:15:34 +03:00
undo debugging work
This commit is contained in:
parent
8a24a6d192
commit
35ae2b783f
2 changed files with 3 additions and 22 deletions
|
@ -15,7 +15,6 @@ using Xamarin.Forms;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Bit.App.Models.Page;
|
using Bit.App.Models.Page;
|
||||||
using Bit.App;
|
using Bit.App;
|
||||||
using Android.Runtime;
|
|
||||||
|
|
||||||
namespace Bit.Android
|
namespace Bit.Android
|
||||||
{
|
{
|
||||||
|
@ -30,8 +29,6 @@ namespace Bit.Android
|
||||||
|
|
||||||
protected override void OnCreate(Bundle bundle)
|
protected override void OnCreate(Bundle bundle)
|
||||||
{
|
{
|
||||||
AndroidEnvironment.UnhandledExceptionRaiser += AndroidEnvironment_UnhandledExceptionRaiser;
|
|
||||||
|
|
||||||
var uri = Intent.GetStringExtra("uri");
|
var uri = Intent.GetStringExtra("uri");
|
||||||
if(!Resolver.IsSet)
|
if(!Resolver.IsSet)
|
||||||
{
|
{
|
||||||
|
@ -107,12 +104,6 @@ namespace Bit.Android
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AndroidEnvironment_UnhandledExceptionRaiser(object sender, RaiseThrowableEventArgs e)
|
|
||||||
{
|
|
||||||
var message = Utilities.AppendExceptionToMessage("", e.Exception);
|
|
||||||
Utilities.SendCrashEmail(this, e.Exception, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ReturnCredentials(VaultListPageModel.Login login)
|
private void ReturnCredentials(VaultListPageModel.Login login)
|
||||||
{
|
{
|
||||||
Intent data = new Intent();
|
Intent data = new Intent();
|
||||||
|
|
|
@ -24,9 +24,9 @@ using SimpleInjector;
|
||||||
namespace Bit.Android
|
namespace Bit.Android
|
||||||
{
|
{
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
//[Application(Debuggable = true)]
|
[Application(Debuggable = true)]
|
||||||
#else
|
#else
|
||||||
//[Application(Debuggable = false)]
|
[Application(Debuggable = false)]
|
||||||
#endif
|
#endif
|
||||||
public class MainApplication : Application, Application.IActivityLifecycleCallbacks
|
public class MainApplication : Application, Application.IActivityLifecycleCallbacks
|
||||||
{
|
{
|
||||||
|
@ -197,20 +197,10 @@ namespace Bit.Android
|
||||||
container.RegisterSingleton(application.ApplicationContext);
|
container.RegisterSingleton(application.ApplicationContext);
|
||||||
container.RegisterSingleton<Application>(application);
|
container.RegisterSingleton<Application>(application);
|
||||||
|
|
||||||
ISecureStorageService secureStorage;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
secureStorage = new AndroidKeyStoreStorageService(CrossSettings.Current);
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
secureStorage = new KeyStoreStorageService(new char[] { });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Services
|
// Services
|
||||||
container.RegisterSingleton<IDatabaseService, DatabaseService>();
|
container.RegisterSingleton<IDatabaseService, DatabaseService>();
|
||||||
container.RegisterSingleton<ISqlService, SqlService>();
|
container.RegisterSingleton<ISqlService, SqlService>();
|
||||||
container.RegisterSingleton(secureStorage);
|
container.RegisterSingleton<ISecureStorageService, AndroidKeyStoreStorageService>();
|
||||||
container.RegisterSingleton<ICryptoService, CryptoService>();
|
container.RegisterSingleton<ICryptoService, CryptoService>();
|
||||||
container.RegisterSingleton<IKeyDerivationService, BouncyCastleKeyDerivationService>();
|
container.RegisterSingleton<IKeyDerivationService, BouncyCastleKeyDerivationService>();
|
||||||
container.RegisterSingleton<IAuthService, AuthService>();
|
container.RegisterSingleton<IAuthService, AuthService>();
|
||||||
|
|
Loading…
Reference in a new issue