mirror of
https://github.com/moparisthebest/keepass2android
synced 2024-11-11 20:15:04 -05:00
Merge branch 'Branch_1.0.0'
Conflicts: src/java/KP2ASoftkeyboard_AS/.idea/workspace.xml
This commit is contained in:
commit
2dcc53c32f
@ -126,6 +126,10 @@
|
||||
<Compile Include="Utils\Spr\SprEngine.PickChars.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\JavaFileStorageBindings\JavaFileStorageBindings.csproj">
|
||||
<Project>{48574278-4779-4b3a-a9e4-9cf1bc285d0b}</Project>
|
||||
<Name>JavaFileStorageBindings</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\KeePassLib2Android\KeePassLib2Android.csproj">
|
||||
<Project>{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}</Project>
|
||||
<Name>KeePassLib2Android</Name>
|
||||
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -39,6 +39,7 @@ using KeePassLib.Security;
|
||||
using KeePassLib.Utility;
|
||||
using Keepass2android.Pluginsdk;
|
||||
using keepass2android.Io;
|
||||
using KeePass.Util.Spr;
|
||||
using Uri = Android.Net.Uri;
|
||||
|
||||
namespace keepass2android
|
||||
@ -341,7 +342,6 @@ namespace keepass2android
|
||||
_appTask = AppTask.GetTaskInOnCreate(savedInstanceState, Intent);
|
||||
|
||||
Entry = db.Entries[uuid];
|
||||
Android.Util.Log.Debug("KP2A", "Notes: " + Entry.Strings.ReadSafe(PwDefs.NotesField));
|
||||
|
||||
// Refresh Menu contents in case onCreateMenuOptions was called before Entry was set
|
||||
ActivityCompat.InvalidateOptionsMenu(this);
|
||||
@ -836,7 +836,9 @@ namespace keepass2android
|
||||
|
||||
private void PopulateStandardText(int viewId, int containerViewId, String key)
|
||||
{
|
||||
PopulateText(viewId, containerViewId, Entry.Strings.ReadSafe(key));
|
||||
String value = Entry.Strings.ReadSafe(key);
|
||||
value = SprEngine.Compile(value, new SprContext(Entry, App.Kp2a.GetDb().KpDatabase, SprCompileFlags.All));
|
||||
PopulateText(viewId, containerViewId, value);
|
||||
_stringViews.Add(key, new StandardStringView(viewId, containerViewId, this));
|
||||
}
|
||||
|
||||
|
@ -84,6 +84,9 @@ namespace keepass2android
|
||||
public static void CopyToClipboard(Context context, String text) {
|
||||
Android.Text.ClipboardManager clipboard = (Android.Text.ClipboardManager) context.GetSystemService(Context.ClipboardService);
|
||||
clipboard.Text = text;
|
||||
//some devices don't accept empty strings. Replace with *** then.
|
||||
if (clipboard.Text == "")
|
||||
clipboard.Text = "***";
|
||||
}
|
||||
|
||||
public static void GotoUrl(Context context, String url) {
|
||||
|
@ -24,6 +24,7 @@ using KeePassLib;
|
||||
using Android.Text;
|
||||
using Android.Text.Style;
|
||||
using Android.Preferences;
|
||||
using KeePass.Util.Spr;
|
||||
|
||||
|
||||
namespace keepass2android.view
|
||||
@ -134,6 +135,7 @@ namespace keepass2android.view
|
||||
_textView.SetTextColor(new Color((int)_defaultTextColor));
|
||||
|
||||
String detail = pw.Strings.ReadSafe(PwDefs.UserNameField);
|
||||
detail = SprEngine.Compile(detail, new SprContext(_entry, App.Kp2a.GetDb().KpDatabase, SprCompileFlags.All));
|
||||
|
||||
if ((_showDetail == false) || (String.IsNullOrEmpty(detail)))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user