karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

check if searchmneu is null before using it

Browse Source
This commit is contained in:
Jimmy Shih
2013-03-05 16:50:31 -08:00
parent 5107dbcb5e
commit e561a25542
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
+1 -1
View File
@@ -297,7 +297,7 @@ public class MarkerListActivity extends AbstractMyTracksActivity implements Dele
@Override @Override
public boolean onKeyUp(int keyCode, KeyEvent event) { public boolean onKeyUp(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_SEARCH) { if (keyCode == KeyEvent.KEYCODE_SEARCH && searchMenuItem != null) {
if (ApiAdapterFactory.getApiAdapter().handleSearchKey(searchMenuItem)) { if (ApiAdapterFactory.getApiAdapter().handleSearchKey(searchMenuItem)) {
return true; return true;
} }
MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
+1 -1
View File
@@ -307,7 +307,7 @@ public class SearchListActivity extends AbstractSendToGoogleActivity
@Override @Override
public boolean onKeyUp(int keyCode, KeyEvent event) { public boolean onKeyUp(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_SEARCH) { if (keyCode == KeyEvent.KEYCODE_SEARCH && searchMenuItem != null) {
if (ApiAdapterFactory.getApiAdapter().handleSearchKey(searchMenuItem)) { if (ApiAdapterFactory.getApiAdapter().handleSearchKey(searchMenuItem)) {
return true; return true;
} }