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

avoid using method which is API level 23 to prevent crash when opening settings

Browse Source
This commit is contained in:
Philipp Crocoll
2017-06-30 05:34:43 +02:00
parent 17cbb754a6
commit 7c4d303dd3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/KP2ASoftkeyboard_AS/.idea/workspace.xml generated
View File

@@ -116,8 +116,8 @@
<file leaf-file-name="ImeSwitcher.java" pinned="false" current-in-tab="true"> <file leaf-file-name="ImeSwitcher.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/keepass2android/kbbridge/ImeSwitcher.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/keepass2android/kbbridge/ImeSwitcher.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22"> <state relative-caret-position="330">
<caret line="51" column="13" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="13" /> <caret line="65" column="0" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -2306,8 +2306,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/keepass2android/kbbridge/ImeSwitcher.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/keepass2android/kbbridge/ImeSwitcher.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22"> <state relative-caret-position="330">
<caret line="51" column="13" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="13" /> <caret line="65" column="0" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>

6
src/keepass2android/settings/DatabaseSettingsActivity.cs
View File

@@ -267,8 +267,8 @@ namespace keepass2android
this._screen = (PreferenceScreen)_fragment.FindPreference(act.GetString(Resource.String.keyboardswitch_prefs_key)); this._screen = (PreferenceScreen)_fragment.FindPreference(act.GetString(Resource.String.keyboardswitch_prefs_key));
var keyboardSwapPref = _fragment.FindPreference("get_keyboardswap"); var keyboardSwapPref = _fragment.FindPreference("get_keyboardswap");
var pm = fragment.Context.PackageManager; var pm = act.PackageManager;
var intnt = Keepass2android.Kbbridge.ImeSwitcher.GetLaunchIntentForKeyboardSwap(fragment.Context); var intnt = Keepass2android.Kbbridge.ImeSwitcher.GetLaunchIntentForKeyboardSwap(act);
if ((intnt != null) && pm.QueryIntentActivities(intnt, 0).Any()) if ((intnt != null) && pm.QueryIntentActivities(intnt, 0).Any())
{ {
_screen.RemovePreference(keyboardSwapPref); _screen.RemovePreference(keyboardSwapPref);
@@ -277,7 +277,7 @@ namespace keepass2android
{ {
keyboardSwapPref.PreferenceClick += (sender, args) => keyboardSwapPref.PreferenceClick += (sender, args) =>
{ {
Util.GotoUrl(fragment.Context, fragment.Context.GetString(Resource.String.MarketURL) + "keepass2android.plugin.keyboardswap2"); Util.GotoUrl(act, act.GetString(Resource.String.MarketURL) + "keepass2android.plugin.keyboardswap2");
}; };
} }