From 8faf8b2392116f71c78b24c11f4f0c29c65aa897 Mon Sep 17 00:00:00 2001 From: PhilippC Date: Thu, 21 Mar 2013 01:01:02 +0100 Subject: [PATCH] View-Intent handled correctly for Online version --- src/keepass2android/KeePass.cs | 8 -------- src/keepass2android/PasswordActivity.cs | 3 ++- src/keepass2android/Properties/AndroidManifest_net.xml | 6 +----- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/keepass2android/KeePass.cs b/src/keepass2android/KeePass.cs index cb6aef08..fa2238e4 100644 --- a/src/keepass2android/KeePass.cs +++ b/src/keepass2android/KeePass.cs @@ -28,14 +28,6 @@ using keepass2android.view; namespace keepass2android { [Activity (Label = AppNames.AppName, MainLauncher = true, Theme="@style/Base")] - [IntentFilter (new[]{Intent.ActionView}, - Label=AppNames.AppLauncherTitle, - DataScheme="file", - DataMimeType="*/*", - DataHost="*", - DataPathPattern=".*kdbx", //TODO http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i - //http://stackoverflow.com/questions/1733195/android-intent-filter-for-a-particular-file-extension - Categories=new[]{Intent.CategoryDefault, Intent.CategoryBrowsable})] public class KeePass : LifecycleDebugActivity { public const Android.App.Result EXIT_NORMAL = Android.App.Result.FirstUser; diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs index 526d5f29..ba222c57 100644 --- a/src/keepass2android/PasswordActivity.cs +++ b/src/keepass2android/PasswordActivity.cs @@ -298,6 +298,7 @@ namespace keepass2android mIoConnection = new IOConnectionInfo(); + if (action != null && action.Equals(VIEW_INTENT)) { mIoConnection.Path = i.DataString; @@ -310,7 +311,7 @@ namespace keepass2android return; } - mIoConnection.Path = URLDecoder.Decode(mIoConnection.Path.Substring(7, mIoConnection.Path.Length)); + mIoConnection.Path = URLDecoder.Decode(mIoConnection.Path.Substring(7)); if (mIoConnection.Path.Length == 0) { diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml index 2049c111..c3bd7317 100644 --- a/src/keepass2android/Properties/AndroidManifest_net.xml +++ b/src/keepass2android/Properties/AndroidManifest_net.xml @@ -5,11 +5,7 @@ package="keepass2android.keepass2android" android:installLocation="preferExternal"> - - - - - +