Merge pull request #59 from addiittya2006/master

EducateFragment Back button Fix
nikolamilosevic86 · Aug 25, 2016 · c269786 · c269786
2 parents 6f82eea + 5645395
commit c269786
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/Seraphimdroid/app/src/main/java/org/owasp/seraphimdroid/EducateFragment.java b/Seraphimdroid/app/src/main/java/org/owasp/seraphimdroid/EducateFragment.java
@@ -178,18 +178,18 @@ public void run() {
         view.setOnKeyListener(new View.OnKeyListener() {
             @Override
             public boolean onKey(View view, int i, KeyEvent keyEvent) {
-                if(keyEvent.getAction() == KeyEvent.ACTION_UP) {
-                    if (i == KeyEvent.KEYCODE_BACK) {
-                        if (!searchView.isIconified()) {
+                if (!searchView.isIconified()) {
+                    if(keyEvent.getAction() == KeyEvent.ACTION_UP) {
+                        if (i == KeyEvent.KEYCODE_BACK) {
                             searchView.setQuery("", false);
                             searchItem.collapseActionView();
 //                            rebuildIndex();
                             mArrArticle.clear();
                             mArrArticle.addAll(db.getAllArticles());
                             va.notifyDataSetChanged();
                         }
-                        return true;
                     }
+                    return true;
                 }
                 return false;
             }
@@ -315,11 +315,10 @@ public void onResponse(JSONArray response) {
 
                     db.addNewArticles(mArrArticle);
 
-                    rebuildIndex();
-
                     va.notifyDataSetChanged();
 
-                    swipeRefreshLayout.setRefreshing(false);
+                    rebuildIndex();
+//                    swipeRefreshLayout.setRefreshing(false);
 
                 } catch (JSONException e) {
                     e.printStackTrace();