qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix potentially incorrect display of storage type in EntryEditActivity

Browse Source
This commit is contained in:
Philipp Crocoll
2018-11-18 13:33:19 +01:00
parent df5162ce56
commit 58c6114840
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/keepass2android/EntryEditActivity.cs
View File

@@ -963,18 +963,18 @@ namespace keepass2android
ees.FindViewById(Resource.Id.filestorage_display).Visibility = (string.IsNullOrEmpty(newValue) && fileStorage != null) ? ViewStates.Gone : ViewStates.Visible;
if (fileStorage != null)
{
string displayPath = fileStorage.GetDisplayName(ioc);
int protocolSeparatorPos = displayPath.IndexOf("://", StringComparison.Ordinal);
int protocolSeparatorPos = ioc.Path.IndexOf("://", StringComparison.Ordinal);
string protocolId = protocolSeparatorPos < 0 ?
"file" : displayPath.Substring(0, protocolSeparatorPos);
"file" : ioc.Path.Substring(0, protocolSeparatorPos);
Drawable drawable = App.Kp2a.GetResourceDrawable("ic_storage_" + protocolId);
ees.FindViewById<ImageView>(Resource.Id.filestorage_logo).SetImageDrawable(drawable);
String fs_title = App.Kp2a.GetResourceString("filestoragename_" + protocolId);
ees.FindViewById<TextView>(Resource.Id.filestorage_label).Text = fs_title;
ees.FindViewById<TextView>(Resource.Id.label_filename).Text = protocolSeparatorPos < 0 ?
string displayPath = fileStorage.GetDisplayName(ioc);
protocolSeparatorPos = displayPath.IndexOf("://", StringComparison.Ordinal);
ees.FindViewById<TextView>(Resource.Id.label_filename).Text = protocolSeparatorPos < 0 ?
displayPath :
displayPath.Substring(protocolSeparatorPos + 3);