cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prevent crashes in EncryptKeyCompletionView (2)

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-10-26 21:57:08 +01:00
parent 67a51cdfe3
commit e89dba8f24
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
View File

@@ -29,6 +29,7 @@ import android.support.v4.app.LoaderManager;
import android.support.v4.app.LoaderManager.LoaderCallbacks; import android.support.v4.app.LoaderManager.LoaderCallbacks;
import android.support.v4.content.CursorLoader; import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader; import android.support.v4.content.Loader;
import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@@ -134,18 +135,19 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView<KeyItem>
+ KeyRings.IS_EXPIRED + " = 0 AND " + KeyRings.IS_EXPIRED + " = 0 AND "
+ Tables.KEYS + "." + KeyRings.IS_REVOKED + " = 0"; + Tables.KEYS + "." + KeyRings.IS_REVOKED + " = 0";
if (args != null && args.containsKey(ARG_QUERY)) { if (args == null || !args.containsKey(ARG_QUERY)) {
String query = args.getString(ARG_QUERY); // mAdapter.setSearchQuery(null);
mAdapter.setSearchQuery(query); // return new CursorLoader(getContext(), baseUri, projection, where, null, null);
return null;
where += " AND " + KeyRings.USER_ID + " LIKE ?";
return new CursorLoader(getContext(), baseUri, projection, where,
new String[]{"%" + query + "%"}, null);
} }
mAdapter.setSearchQuery(null); String query = args.getString(ARG_QUERY);
return new CursorLoader(getContext(), baseUri, projection, where, null, null); mAdapter.setSearchQuery(query);
where += " AND " + KeyRings.USER_ID + " LIKE ?";
return new CursorLoader(getContext(), baseUri, projection, where,
new String[]{"%" + query + "%"}, null);
} }
@@ -167,6 +169,8 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView<KeyItem>
super.showDropDown(); super.showDropDown();
} }
@Override @Override
public void onFocusChanged(boolean hasFocus, int direction, Rect previous) { public void onFocusChanged(boolean hasFocus, int direction, Rect previous) {
super.onFocusChanged(hasFocus, direction, previous); super.onFocusChanged(hasFocus, direction, previous);
@@ -182,8 +186,13 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView<KeyItem>
if (start < mPrefix.length()) { if (start < mPrefix.length()) {
start = mPrefix.length(); start = mPrefix.length();
} }
String query = text.subSequence(start, end).toString();
if (TextUtils.isEmpty(query) || query.length() < 2) {
mLoaderManager.destroyLoader(0);
return;
}
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString(ARG_QUERY, text.subSequence(start, end).toString()); args.putString(ARG_QUERY, query);
mLoaderManager.restartLoader(0, args, this); mLoaderManager.restartLoader(0, args, this);
} }