moparisthebest
/
keepass2android
mirror of https://github.com/moparisthebest/keepass2android
1
0
Fork 0
Code Issues Releases Wiki Activity

fix crash in OneDriveStorage when accessing shared folders. Release 1.01-d

This commit is contained in:
Philipp Crocoll 2017-01-31 11:10:28 +01:00
parent 14f7167340
commit 44b0a7b898
6 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-debug.aar
View File

Binary file not shown.

BIN
src/java/JavaFileStorage/app/build/outputs/aar/JavaFileStorage-release.aar
View File

Binary file not shown.

10
src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/OneDriveStorage.java
View File

@ -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;
}

2
src/keepass2android/ChangeLog.cs
View File

@ -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<string> changeLog = new List<string>{
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),

4
src/keepass2android/Properties/AndroidManifest_net.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="89"
android:versionName="1.01-c"
android:versionCode="90"
android:versionName="1.01-d"
package="keepass2android.keepass2android"
android:installLocation="auto">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />

4
src/keepass2android/Resources/values/strings.xml
View File

@ -680,8 +680,8 @@
<string name="ActivateAutoFillService_btnAutoFill">Use AutoFill service</string>
<string name="ActivateAutoFillService_toast">Please enable the Keepass2Android service.</string>
<string name="ShowKeyboardDuringFingerprintAuth">Show soft keyboard for password input when fingerprint scan is active.</string>
<string name="ChangeLog_1_01c">
Version 1.01-c\n
<string name="ChangeLog_1_01d">
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