qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'sslfix_0.9.8'

Browse Source 
Conflicts:
	src/KeePass.sln
	src/keepass2android/Properties/AndroidManifest_net.xml
This commit is contained in:
Philipp Crocoll
2015-09-30 08:19:57 +02:00
parent 565438a630 3b3bda2dd5
commit 40915c4ef1
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/keepass2android/ChangeLog.cs
View File

@@ -26,6 +26,7 @@ namespace keepass2android
AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(ctx, Android.Resource.Style.ThemeHoloLightDialog)); AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(ctx, Android.Resource.Style.ThemeHoloLightDialog));
builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title)); builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
List<string> changeLog = new List<string>{ List<string> changeLog = new List<string>{
ctx.GetString(Resource.String.ChangeLog_0_9_8c),
ctx.GetString(Resource.String.ChangeLog_0_9_8b), ctx.GetString(Resource.String.ChangeLog_0_9_8b),
ctx.GetString(Resource.String.ChangeLog_0_9_8), ctx.GetString(Resource.String.ChangeLog_0_9_8),
#if !NoNet #if !NoNet

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

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="57" android:versionCode="60"
android:versionName="0.9.8 preview 2 (alpha)" android:versionName="0.9.8c"
package="keepass2android.keepass2android" package="keepass2android.keepass2android"
android:installLocation="auto"> android:installLocation="auto">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" /> <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />

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

@@ -540,6 +540,13 @@
<string name="Continue">Continue</string> <string name="Continue">Continue</string>
<string name="NoFilenameWarning">The URI you have entered does not look like a filename. Are you sure this is a valid file?</string> <string name="NoFilenameWarning">The URI you have entered does not look like a filename. Are you sure this is a valid file?</string>
<string name="ChangeLog_0_9_8c">
Version 0.9.8c\n
* Fix for SSL vulnerability in Microsoft Live SDK (used when accessing files via OneDrive)\n
* Bug fix: Previous release contained two input methods (one crashing)\n
</string>
<string name="ChangeLog_0_9_8b"> <string name="ChangeLog_0_9_8b">
Version 0.9.8b\n Version 0.9.8b\n
* Bug fixes (Saving failed for some databases, exporting to local device not working, selecting some preference options crashed the app)\n * Bug fixes (Saving failed for some databases, exporting to local device not working, selecting some preference options crashed the app)\n