minor modifications for 0.9.5b-offline compile

This commit is contained in:
Philipp Crocoll 2014-12-14 07:30:37 +01:00
parent fa8b53793a
commit 3110f5c9be
6 changed files with 16 additions and 8 deletions

View File

@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="49" android:versionName="0.9.5b" package="keepass2android.keepass2android" android:installLocation="auto"> <manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="49"
android:versionName="0.9.5b"
package="keepass2android.keepass2android"
android:installLocation="auto">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" /> <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" />
<permission android:description="@string/permission_desc" android:icon="@drawable/ic_launcher" android:label="KP2A internal file browsing" android:name="keepass2android.keepass2android.permission.KP2aInternalFileBrowsing" android:protectionLevel="signature" /> <permission android:description="@string/permission_desc" android:icon="@drawable/ic_launcher" android:label="KP2A internal file browsing" android:name="keepass2android.keepass2android.permission.KP2aInternalFileBrowsing" android:protectionLevel="signature" />
<application android:label="keepass2android" android:icon="@drawable/ic_launcher"> <application android:label="keepass2android" android:icon="@drawable/ic_launcher">

View File

@ -1,10 +1,10 @@
<?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="47" android:versionCode="49"
android:versionName="0.9.4" android:versionName="0.9.5b"
package="keepass2android.keepass2android_nonet" package="keepass2android.keepass2android_nonet"
android:installLocation="auto"> android:installLocation="auto">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" /> <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" />
<application android:label="keepass2android" android:icon="@drawable/ic_launcher_offline"> <application android:label="keepass2android" android:icon="@drawable/ic_launcher_offline">
<provider android:name="group.pals.android.lib.ui.filechooser.providers.localfile.LocalFileProvider" android:authorities="keepass2android.keepass2android_nonet.android-filechooser.localfile" android:exported="false" /> <provider android:name="group.pals.android.lib.ui.filechooser.providers.localfile.LocalFileProvider" android:authorities="keepass2android.keepass2android_nonet.android-filechooser.localfile" android:exported="false" />
<provider android:name="group.pals.android.lib.ui.filechooser.providers.history.HistoryProvider" android:authorities="keepass2android.keepass2android_nonet.android-filechooser.history" android:exported="false" /> <provider android:name="group.pals.android.lib.ui.filechooser.providers.history.HistoryProvider" android:authorities="keepass2android.keepass2android_nonet.android-filechooser.history" android:exported="false" />

View File

@ -497,9 +497,9 @@
* Fixed issues with file browsing (especially on Android 4.4)\n * Fixed issues with file browsing (especially on Android 4.4)\n
* Fixed issue with loading .kdb files (Keepass 1) on Nexus 5 with Android Lollipop\n * Fixed issue with loading .kdb files (Keepass 1) on Nexus 5 with Android Lollipop\n
* Added option to prevent taking screenshots/displaying app in recent apps list\n * Added option to prevent taking screenshots/displaying app in recent apps list\n
* Fixed issue with Google Drive file storage\n * Fixed issue with Google Drive file storage (regular edition)\n
* Allow key files on deliberate storage types\n * Allow key files on deliberate storage types (regular edition)\n
* Updated Dropbox SDK to include an official security patch\n * Updated Dropbox SDK to include an official security patch (regular edition)\n
* Updated build tools --> apk size increased :-(\n * Updated build tools --> apk size increased :-(\n
I have promised some more changes. They will come with the next release - sorry. I wanted to publish these hot fixes as soon as possible. I have promised some more changes. They will come with the next release - sorry. I wanted to publish these hot fixes as soon as possible.
</string> </string>

View File

@ -225,7 +225,7 @@ namespace keepass2android
public static void ShowSftpDialog(Activity activity, FileSelectedHandler onStartBrowse, Action onCancel) public static void ShowSftpDialog(Activity activity, FileSelectedHandler onStartBrowse, Action onCancel)
{ {
#if !EXCLUDE_JAVAFILESTORAGE #if !EXCLUDE_JAVAFILESTORAGE && !NoNet
AlertDialog.Builder builder = new AlertDialog.Builder(activity); AlertDialog.Builder builder = new AlertDialog.Builder(activity);
View dlgContents = activity.LayoutInflater.Inflate(Resource.Layout.sftpcredentials, null); View dlgContents = activity.LayoutInflater.Inflate(Resource.Layout.sftpcredentials, null);
builder.SetView(dlgContents); builder.SetView(dlgContents);

View File

@ -19,7 +19,9 @@ namespace keepass2android.fileselect
ConfigChanges.KeyboardHidden)] ConfigChanges.KeyboardHidden)]
public class FileStorageSetupActivity : Activity, IFileStorageSetupActivity public class FileStorageSetupActivity : Activity, IFileStorageSetupActivity
#if !EXCLUDE_JAVAFILESTORAGE #if !EXCLUDE_JAVAFILESTORAGE
#if !NoNet
,Keepass2android.Javafilestorage.IJavaFileStorageFileStorageSetupActivity ,Keepass2android.Javafilestorage.IJavaFileStorageFileStorageSetupActivity
#endif
#endif #endif
{ {
private bool _isRecreated = false; private bool _isRecreated = false;

View File

@ -10,7 +10,9 @@ namespace keepass2android
public class FileStorageSetupInitiatorActivity: public class FileStorageSetupInitiatorActivity:
#if !EXCLUDE_JAVAFILESTORAGE #if !EXCLUDE_JAVAFILESTORAGE
Java.Lang.Object Java.Lang.Object
#if !NoNet
,Keepass2android.Javafilestorage.IJavaFileStorageFileStorageSetupInitiatorActivity ,Keepass2android.Javafilestorage.IJavaFileStorageFileStorageSetupInitiatorActivity
#endif
, ,
#endif #endif
IFileStorageSetupInitiatorActivity IFileStorageSetupInitiatorActivity