Compare commits
1 Commits
1949--enab
...
1327--repl
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9f08e0039b |
BIN
src/PCloudBindings/Jars/pcloud-sdk-android-1.8.1.aar
Normal file
BIN
src/PCloudBindings/Jars/pcloud-sdk-android-1.8.1.aar
Normal file
Binary file not shown.
Binary file not shown.
BIN
src/PCloudBindings/Jars/pcloud-sdk-java-core-1.8.1.jar
Normal file
BIN
src/PCloudBindings/Jars/pcloud-sdk-java-core-1.8.1.jar
Normal file
Binary file not shown.
Binary file not shown.
@@ -56,7 +56,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Jars\AboutJars.txt" />
|
<None Include="Jars\AboutJars.txt" />
|
||||||
<None Include="Additions\AboutAdditions.txt" />
|
<None Include="Additions\AboutAdditions.txt" />
|
||||||
<LibraryProjectZip Include="Jars\pcloud-sdk-android-1.9.1.aar" />
|
<LibraryProjectZip Include="Jars\pcloud-sdk-android-1.8.1.aar" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<TransformFile Include="Transforms\Metadata.xml" />
|
<TransformFile Include="Transforms\Metadata.xml" />
|
||||||
@@ -72,6 +72,6 @@
|
|||||||
</Target>
|
</Target>
|
||||||
-->
|
-->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<EmbeddedReferenceJar Include="Jars\pcloud-sdk-java-core-1.9.1.jar" />
|
<EmbeddedReferenceJar Include="Jars\pcloud-sdk-java-core-1.8.1.jar" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -47,8 +47,8 @@ dependencies {
|
|||||||
implementation('com.onedrive.sdk:onedrive-sdk-android:1.2.0') {
|
implementation('com.onedrive.sdk:onedrive-sdk-android:1.2.0') {
|
||||||
transitive = false
|
transitive = false
|
||||||
}
|
}
|
||||||
implementation 'com.pcloud.sdk:java-core:1.9.1'
|
implementation 'com.pcloud.sdk:java-core:1.8.1'
|
||||||
implementation 'com.pcloud.sdk:android:1.9.1'
|
implementation 'com.pcloud.sdk:android:1.8.1'
|
||||||
implementation 'com.google.code.gson:gson:2.8.6'
|
implementation 'com.google.code.gson:gson:2.8.6'
|
||||||
implementation 'com.microsoft.services.msa:msa-auth:0.8.6'
|
implementation 'com.microsoft.services.msa:msa-auth:0.8.6'
|
||||||
implementation 'com.microsoft.aad:adal:1.14.0'
|
implementation 'com.microsoft.aad:adal:1.14.0'
|
||||||
|
|||||||
@@ -1,3 +1,13 @@
|
|||||||
package com.crocoapps.javafilestoragetest2;
|
package com.crocoapps.javafilestoragetest2;
|
||||||
|
|
||||||
import android.app.Application;
|
import android.app.Application;
|
||||||
|
import android.test.ApplicationTestCase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
|
||||||
|
*/
|
||||||
|
public class ApplicationTest extends ApplicationTestCase<Application> {
|
||||||
|
public ApplicationTest() {
|
||||||
|
super(Application.class);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -937,10 +937,9 @@ namespace keepass2android
|
|||||||
iv.SetImageDrawable(Resources.GetDrawable(Resource.Drawable.ic00));
|
iv.SetImageDrawable(Resources.GetDrawable(Resource.Drawable.ic00));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
SupportActionBar.Title = Entry.Strings.ReadSafe(PwDefs.TitleField);
|
SupportActionBar.Title = Entry.Strings.ReadSafe(PwDefs.TitleField);
|
||||||
SupportActionBar.SetDisplayHomeAsUpEnabled(true);
|
SupportActionBar.Title = SprEngine.Compile(SupportActionBar.Title, new SprContext(Entry, App.Kp2a.CurrentDb.KpDatabase, SprCompileFlags.All));
|
||||||
|
SupportActionBar.SetDisplayHomeAsUpEnabled(true);
|
||||||
SupportActionBar.SetHomeButtonEnabled(true);
|
SupportActionBar.SetHomeButtonEnabled(true);
|
||||||
|
|
||||||
PopulateGroupText (Resource.Id.entry_group_name, Resource.Id.entryfield_group_container, KeyGroupFullPath);
|
PopulateGroupText (Resource.Id.entry_group_name, Resource.Id.entryfield_group_container, KeyGroupFullPath);
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ using KeePassLib;
|
|||||||
using KeePassLib.Utility;
|
using KeePassLib.Utility;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using KeePass.Util.Spr;
|
||||||
|
|
||||||
namespace keepass2android.search
|
namespace keepass2android.search
|
||||||
{
|
{
|
||||||
@@ -294,7 +295,10 @@ namespace keepass2android.search
|
|||||||
return Position.ToString(CultureInfo.InvariantCulture);
|
return Position.ToString(CultureInfo.InvariantCulture);
|
||||||
case 1: // SuggestColumnText1
|
case 1: // SuggestColumnText1
|
||||||
string username = CurrentEntry.Strings.ReadSafe(PwDefs.UserNameField);
|
string username = CurrentEntry.Strings.ReadSafe(PwDefs.UserNameField);
|
||||||
return CurrentEntry.Strings.ReadSafe(PwDefs.TitleField) + (string.IsNullOrWhiteSpace(username) ? "" : " ("+username+")");
|
username = SprEngine.Compile(username, new SprContext(CurrentEntry, App.Kp2a.CurrentDb.KpDatabase, SprCompileFlags.All));
|
||||||
|
var title = CurrentEntry.Strings.ReadSafe(PwDefs.TitleField);
|
||||||
|
title = SprEngine.Compile(title, new SprContext(CurrentEntry, App.Kp2a.CurrentDb.KpDatabase, SprCompileFlags.All));
|
||||||
|
return title + (string.IsNullOrWhiteSpace(username) ? "" : " ("+username+")");
|
||||||
case 2: // SuggestColumnText2
|
case 2: // SuggestColumnText2
|
||||||
return Internationalise(_entriesWithContexts[Position].resultContext);
|
return Internationalise(_entriesWithContexts[Position].resultContext);
|
||||||
case 3: // SuggestColumnIcon1
|
case 3: // SuggestColumnIcon1
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ using Android.OS;
|
|||||||
using Android.Runtime;
|
using Android.Runtime;
|
||||||
using Android.Views;
|
using Android.Views;
|
||||||
using Android.Widget;
|
using Android.Widget;
|
||||||
|
using KeePass.Util.Spr;
|
||||||
using keepass2android.services.AutofillBase;
|
using keepass2android.services.AutofillBase;
|
||||||
using keepass2android.services.AutofillBase.model;
|
using keepass2android.services.AutofillBase.model;
|
||||||
using Keepass2android.Pluginsdk;
|
using Keepass2android.Pluginsdk;
|
||||||
@@ -108,6 +109,7 @@ namespace keepass2android.services.Kp2aAutofill
|
|||||||
|
|
||||||
|
|
||||||
fieldCollection.DatasetName = pwEntry.Strings.ReadSafe(PwDefs.TitleField);
|
fieldCollection.DatasetName = pwEntry.Strings.ReadSafe(PwDefs.TitleField);
|
||||||
|
fieldCollection.DatasetName = SprEngine.Compile(fieldCollection.DatasetName, new SprContext(pwEntry, App.Kp2a.CurrentDb.KpDatabase, SprCompileFlags.All));
|
||||||
|
|
||||||
return fieldCollection;
|
return fieldCollection;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -125,7 +125,8 @@ namespace keepass2android.view
|
|||||||
}
|
}
|
||||||
|
|
||||||
String title = pw.Strings.ReadSafe(PwDefs.TitleField);
|
String title = pw.Strings.ReadSafe(PwDefs.TitleField);
|
||||||
var str = new SpannableString(title);
|
title = SprEngine.Compile(title, new SprContext(_entry, db.KpDatabase, SprCompileFlags.All));
|
||||||
|
var str = new SpannableString(title);
|
||||||
|
|
||||||
if (isExpired)
|
if (isExpired)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user