From 5645395233c39e05ebea4b89fcc9465afd4f9f48 Mon Sep 17 00:00:00 2001
From: Aditya <addiittya2006@gmail.com>
Date: Thu, 25 Aug 2016 15:09:44 +0530
Subject: [PATCH] Back Keycode Fix Button

---
 .../org/owasp/seraphimdroid/EducateFragment.java    | 13 ++++++-------
 1 file changed, 6 insertions(+), 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
index 9124c87..b16f578 100644
--- a/Seraphimdroid/app/src/main/java/org/owasp/seraphimdroid/EducateFragment.java
+++ b/Seraphimdroid/app/src/main/java/org/owasp/seraphimdroid/EducateFragment.java
@@ -178,9 +178,9 @@ 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();
@@ -188,8 +188,8 @@ public boolean onKey(View view, int i, KeyEvent keyEvent) {
                             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();