Skip to content

Commit dfca85c

Browse files
committed
changelog and manifest for 1.15-pre1
1 parent c47b87d commit dfca85c

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

src/keepass2android-app/ChangeLog.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ public static void ShowChangeLog(Context ctx, Action onDismiss)
3131
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ctx);
3232
builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
3333
List<string> changeLog = new List<string>{
34-
BuildChangelogString(ctx, new List<int>{Resource.Array.ChangeLog_1_15}, "1.15"),
34+
BuildChangelogString(ctx, new List<int>{Resource.Array.ChangeLog_1_15,
35+
#if !NoNet
36+
Resource.Array.ChangeLog_1_15_net
37+
#endif
38+
}, "1.15"),
3539
BuildChangelogString(ctx, new List<int>
3640
{
3741
Resource.Array.ChangeLog_1_14,

src/keepass2android-app/Manifests/AndroidManifest_net.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:versionCode="241"
4-
android:versionName="1.15-pre0"
3+
android:versionCode="242"
4+
android:versionName="1.15-pre1"
55
package="keepass2android.keepass2android"
66
xmlns:tools="http://schemas.android.com/tools"
77
android:installLocation="auto">

src/keepass2android-app/Manifests/AndroidManifest_nonet.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:versionCode="241"
4-
android:versionName="1.15-pre0"
3+
android:versionCode="242"
4+
android:versionName="1.15-pre1"
55
package="keepass2android.keepass2android_nonet"
66
xmlns:tools="http://schemas.android.com/tools"
77
android:installLocation="auto">

src/keepass2android-app/Resources/values/strings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,9 @@
749749
<string name="webdav_chunked_upload_size_summary">Size of chunks when uploading to WebDav servers in bytes.</string>
750750
<string name="cleartextTrafficPermitted_title">Allow clear-text network traffic in WebDav</string>
751751
<string name="cleartextTrafficPermitted_summary">HTTP connections are not secure. Only enable this if you have other security measures in place.</string>
752-
752+
<string-array name="ChangeLog_1_15_net">
753+
<item>Improvements to URL handling for WebDav with non-ASCII characters</item>
754+
</string-array>
753755
<string-array name="ChangeLog_1_15">
754756
<item>Added background synchronization: Keepass2Android now uses the internal cache copy of the database for loading and saving to make these operations faster. After this, synchronization with the remote database is started. </item>
755757
<item>Added user preferences to control behavior of background synchronization. You can enable periodic background synchronization and control if synchronization should be performed always or only in Wi-Fi networks.</item>

0 commit comments

Comments
 (0)