This commit is contained in:
Kyle Spearrin 2017-07-25 08:51:55 -04:00
parent 73425c0052
commit 1ba0729e34
5 changed files with 18 additions and 27 deletions

View file

@ -153,6 +153,8 @@ namespace Bit.Android.Services
return Task.FromResult(0); return Task.FromResult(0);
} }
var additionalIntents = new List<IParcelable>();
var docIntent = new Intent(Intent.ActionOpenDocument); var docIntent = new Intent(Intent.ActionOpenDocument);
docIntent.AddCategory(Intent.CategoryOpenable); docIntent.AddCategory(Intent.CategoryOpenable);
docIntent.SetType("*/*"); docIntent.SetType("*/*");
@ -165,11 +167,15 @@ namespace Bit.Android.Services
var file = new Java.IO.File(root, "temp_camera_photo.jpg"); var file = new Java.IO.File(root, "temp_camera_photo.jpg");
if(!file.Exists()) if(!file.Exists())
{ {
var a = file.ParentFile.Mkdirs(); file.ParentFile.Mkdirs();
var b = file.CreateNewFile(); file.CreateNewFile();
} }
var outputFileUri = global::Android.Net.Uri.FromFile(file); var outputFileUri = global::Android.Net.Uri.FromFile(file);
var additionalIntents = GetCameraIntents(outputFileUri); additionalIntents.AddRange(GetCameraIntents(outputFileUri));
}
if(additionalIntents.Count > 0)
{
chooserIntent.PutExtra(Intent.ExtraInitialIntents, additionalIntents.ToArray()); chooserIntent.PutExtra(Intent.ExtraInitialIntents, additionalIntents.ToArray());
} }

View file

@ -73,10 +73,16 @@ namespace Bit.App.Pages
ShowDisclousure = true ShowDisclousure = true
}; };
LockCell = new ExtendedTextCell
{
Text = AppResources.Lock
};
var securitySecion = new TableSection(AppResources.Security) var securitySecion = new TableSection(AppResources.Security)
{ {
LockOptionsCell, LockOptionsCell,
PinCell, PinCell,
LockCell,
TwoStepCell TwoStepCell
}; };
@ -117,11 +123,6 @@ namespace Bit.App.Pages
ShowDisclousure = true ShowDisclousure = true
}; };
LockCell = new ExtendedTextCell
{
Text = AppResources.Lock
};
LogOutCell = new ExtendedTextCell LogOutCell = new ExtendedTextCell
{ {
Text = AppResources.LogOut Text = AppResources.LogOut
@ -177,18 +178,14 @@ namespace Bit.App.Pages
new TableSection(AppResources.Account) new TableSection(AppResources.Account)
{ {
ChangeMasterPasswordCell, ChangeMasterPasswordCell,
ChangeEmailCell ChangeEmailCell,
LogOutCell
}, },
new TableSection(AppResources.Manage) new TableSection(AppResources.Manage)
{ {
FoldersCell, FoldersCell,
SyncCell SyncCell
}, },
new TableSection(AppResources.CurrentSession)
{
LockCell,
LogOutCell
},
otherSection otherSection
} }
}; };

View file

@ -316,7 +316,7 @@ namespace Bit.App.Pages
AppResources.LearnMore, AppResources.Cancel); AppResources.LearnMore, AppResources.Cancel);
if(confirmed) if(confirmed)
{ {
Device.OpenUri(new Uri("https://help.bitwarden.com")); Device.OpenUri(new Uri("https://help.bitwarden.com/article/update-encryption-key/"));
} }
} }
} }

View file

@ -682,15 +682,6 @@ namespace Bit.App.Resources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Current Session.
/// </summary>
public static string CurrentSession {
get {
return ResourceManager.GetString("CurrentSession", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Delete. /// Looks up a localized string similar to Delete.
/// </summary> /// </summary>

View file

@ -467,9 +467,6 @@
<value>Creating account...</value> <value>Creating account...</value>
<comment>Message shown when interacting with the server</comment> <comment>Message shown when interacting with the server</comment>
</data> </data>
<data name="CurrentSession" xml:space="preserve">
<value>Current Session</value>
</data>
<data name="EditLogin" xml:space="preserve"> <data name="EditLogin" xml:space="preserve">
<value>Edit Login</value> <value>Edit Login</value>
</data> </data>