mirror of
https://github.com/moparisthebest/keepass2android
synced 2024-11-04 16:45:11 -05:00
fix Intent filter issue on Android 6 (https://keepass2android.codeplex.com/workitem/518)
This commit is contained in:
parent
d0350e8d9d
commit
b43b6b27a3
@ -1127,33 +1127,39 @@ namespace keepass2android
|
||||
//started from "view" intent (e.g. from file browser)
|
||||
_ioConnection.Path = i.DataString;
|
||||
|
||||
if (! _ioConnection.Path.Substring(0, 7).Equals("file://"))
|
||||
if (_ioConnection.Path.StartsWith("file://"))
|
||||
{
|
||||
//TODO: this might no longer be required as we can handle http(s) and ftp as well (but we need server credentials therefore)
|
||||
Toast.MakeText(this, Resource.String.error_can_not_handle_uri, ToastLength.Long).Show();
|
||||
Finish();
|
||||
return false;
|
||||
}
|
||||
|
||||
_ioConnection.Path = URLDecoder.Decode(_ioConnection.Path.Substring(7));
|
||||
|
||||
if (_ioConnection.Path.Length == 0)
|
||||
{
|
||||
// No file name
|
||||
Toast.MakeText(this, Resource.String.FileNotFound, ToastLength.Long).Show();
|
||||
Finish();
|
||||
return false;
|
||||
}
|
||||
|
||||
File dbFile = new File(_ioConnection.Path);
|
||||
if (! dbFile.Exists())
|
||||
{
|
||||
// File does not exist
|
||||
Toast.MakeText(this, Resource.String.FileNotFound, ToastLength.Long).Show();
|
||||
Finish();
|
||||
return false;
|
||||
_ioConnection.Path = URLDecoder.Decode(_ioConnection.Path.Substring(7));
|
||||
|
||||
if (_ioConnection.Path.Length == 0)
|
||||
{
|
||||
// No file name
|
||||
Toast.MakeText(this, Resource.String.FileNotFound, ToastLength.Long).Show();
|
||||
Finish();
|
||||
return false;
|
||||
}
|
||||
|
||||
File dbFile = new File(_ioConnection.Path);
|
||||
if (!dbFile.Exists())
|
||||
{
|
||||
// File does not exist
|
||||
Toast.MakeText(this, Resource.String.FileNotFound, ToastLength.Long).Show();
|
||||
Finish();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!_ioConnection.Path.StartsWith("content://"))
|
||||
{
|
||||
|
||||
Toast.MakeText(this, Resource.String.error_can_not_handle_uri, ToastLength.Long).Show();
|
||||
Finish();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
_keyFileOrProvider = GetKeyFile(_ioConnection.Path);
|
||||
return true;
|
||||
}
|
||||
|
@ -77,6 +77,15 @@
|
||||
</service>
|
||||
|
||||
<activity android:configChanges="orientation" android:label="@string/app_name" android:theme="@style/MyTheme_Blue" android:name="keepass2android.PasswordActivity" android:windowSoftInputMode="adjustResize">
|
||||
<intent-filter android:label="@string/app_name">
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
<data android:scheme="content" />
|
||||
<data android:mimeType="*/*" />
|
||||
<data android:host="*" />
|
||||
</intent-filter>
|
||||
|
||||
<intent-filter android:label="@string/app_name">
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
|
@ -69,7 +69,16 @@
|
||||
</activity>
|
||||
|
||||
<activity android:configChanges="orientation" android:label="@string/app_name" android:theme="@style/MyTheme_Blue" android:name="keepass2android.PasswordActivity" android:windowSoftInputMode="adjustResize">
|
||||
<intent-filter android:label="@string/app_name">
|
||||
<intent-filter android:label="@string/app_name">
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
<data android:scheme="content" />
|
||||
<data android:mimeType="*/*" />
|
||||
<data android:host="*" />
|
||||
</intent-filter>
|
||||
|
||||
<intent-filter android:label="@string/app_name">
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
|
@ -47,7 +47,16 @@
|
||||
</activity>
|
||||
|
||||
<activity android:configChanges="orientation" android:label="@string/app_name" android:theme="@style/MyTheme_Blue" android:name="keepass2android.PasswordActivity" android:windowSoftInputMode="adjustResize">
|
||||
<intent-filter android:label="@string/app_name">
|
||||
<intent-filter android:label="@string/app_name">
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
<data android:scheme="content" />
|
||||
<data android:mimeType="*/*" />
|
||||
<data android:host="*" />
|
||||
</intent-filter>
|
||||
|
||||
<intent-filter android:label="@string/app_name">
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
|
Loading…
Reference in New Issue
Block a user