diff --git a/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-debug.aar b/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-debug.aar index 59e8d5dc..c757fa38 100644 Binary files a/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-debug.aar and b/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-debug.aar differ diff --git a/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-release.aar b/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-release.aar index 619a20d0..d98fc5cc 100644 Binary files a/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-release.aar and b/src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-release.aar differ diff --git a/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/OneDriveStorage.java b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/OneDriveStorage.java index b586dac0..3b5bb317 100644 --- a/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/OneDriveStorage.java +++ b/src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/OneDriveStorage.java @@ -285,13 +285,19 @@ public class OneDriveStorage extends JavaFileStorageBase @NonNull private FileEntry getFileEntry(String path, Item i) { FileEntry e = new FileEntry(); - e.sizeInBytes = i.size; + if (i.size != null) + e.sizeInBytes = i.size; + else if ((i.remoteItem != null) && (i.remoteItem.size != null)) + e.sizeInBytes = i.remoteItem.size; + e.displayName = i.name; e.canRead = e.canWrite = true; e.path = getProtocolId() +"://"+path; if (i.lastModifiedDateTime != null) e.lastModifiedTime = i.lastModifiedDateTime.getTimeInMillis(); - e.isDirectory = i.folder != null; + else if ((i.remoteItem != null)&&(i.remoteItem.lastModifiedDateTime != null)) + e.lastModifiedTime = i.remoteItem.lastModifiedDateTime.getTimeInMillis(); + e.isDirectory = (i.folder != null) || ((i.remoteItem != null) && (i.remoteItem.folder != null)); return e; } diff --git a/src/keepass2android/ChangeLog.cs b/src/keepass2android/ChangeLog.cs index 1018fbf7..f0a7aa50 100644 --- a/src/keepass2android/ChangeLog.cs +++ b/src/keepass2android/ChangeLog.cs @@ -26,7 +26,7 @@ namespace keepass2android AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(ctx, Android.Resource.Style.ThemeHoloLightDialog)); builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title)); List changeLog = new List{ - ctx.GetString(Resource.String.ChangeLog_1_01c), + ctx.GetString(Resource.String.ChangeLog_1_01d), ctx.GetString(Resource.String.ChangeLog_1_01), ctx.GetString(Resource.String.ChangeLog_1_0_0e), ctx.GetString(Resource.String.ChangeLog_1_0_0), diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml index c1ffab7a..9f145ebd 100644 --- a/src/keepass2android/Properties/AndroidManifest_net.xml +++ b/src/keepass2android/Properties/AndroidManifest_net.xml @@ -1,7 +1,7 @@  diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml index 984de1c0..e2538907 100644 --- a/src/keepass2android/Resources/values/strings.xml +++ b/src/keepass2android/Resources/values/strings.xml @@ -680,8 +680,8 @@ Use AutoFill service Please enable the Keepass2Android service. Show soft keyboard for password input when fingerprint scan is active. - - Version 1.01-c\n + + Version 1.01-d\n * Fix for OneDrive file listing\n * Allow to ignore certificate errors also when host name verification fails (not recommended for production use)\n * Fix for QuickUnlock sometimes failing despite correct unlock code\n