fix possible app crashesv.0.9.9.20

3 files changed, 16 insertions, 4 deletions

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
index 06283781..8c1f2132 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
@@ -392,8 +392,9 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
                 NewsDetailFragment newsDetailFragment = getNewsDetailFragmentAtPosition(currentPosition);
                 String link = newsDetailFragment.mWebView.getUrl();
 
-                if(link.equals("about:blank"))
-				    link = rssItem.getLink();
+                if("about:blank".equals(link)) {
+                    link = rssItem.getLink();
+                }
 
 				if(link.length() > 0)
 				{
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderDetailFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderDetailFragment.java
index 0b66ed4b..696bbb79 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderDetailFragment.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderDetailFragment.java
@@ -360,6 +360,8 @@ public class NewsReaderDetailFragment extends Fragment {
         ItemTouchHelper itemTouchHelper = new ItemTouchHelper(new NewsReaderItemTouchHelperCallback());
         itemTouchHelper.attachToRecyclerView(recyclerView);
         //recyclerView.addItemDecoration(new DividerItemDecoration(getActivity())); // Enable divider line
+
+        /*
         recyclerView.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
@@ -367,6 +369,7 @@ public class NewsReaderDetailFragment extends Fragment {
                 return false;
             }
         });
+        */
 
         swipeRefresh.setColorSchemeColors(accentColor);
         swipeRefresh.setOnRefreshListener((SwipeRefreshLayout.OnRefreshListener) getActivity());
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
index b6a85b5e..ae2e3489 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
@@ -712,7 +712,6 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-
 		// Inflate the menu; this adds items to the action bar if it is present.
 		getMenuInflater().inflate(R.menu.news_reader, menu);
 
@@ -736,9 +735,18 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
 				return true;
 			}
 		});
-		this.searchView = (SearchView) menu.findItem(R.id.menu_search).getActionView();
+
+		searchView = (SearchView) menu.findItem(R.id.menu_search).getActionView();
 		searchView.setIconifiedByDefault(false);
 		searchView.setOnQueryTextListener(this);
+		searchView.setOnQueryTextFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if(!hasFocus) {
+                    clearSearchViewFocus();
+                }
+            }
+        });
 
 		NewsReaderDetailFragment ndf = getNewsReaderDetailFragment();
 		if(ndf != null)