fixed RuleParser issue

PureDark · Mar 30, 2017 · 0eeec92 · 0eeec92
1 parent 5efed16
commit 0eeec92
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/app/src/main/java/ml/puredark/hviewer/core/RuleParser.java b/app/src/main/java/ml/puredark/hviewer/core/RuleParser.java
@@ -407,10 +407,6 @@ public static Collection getCollectionDetail(Collection collection, Object sourc
                             continue;
                         }
                     }
-                    if(isJson(element.toString()))
-                        element = jsonParser.parse(element.toString());
-                    else
-                        element = Jsoup.parse(element.toString());
                     String pId = parseSingleProperty(element, pictureId, sourceUrl, false);
                     int pid;
                     try {
@@ -458,10 +454,6 @@ public static Collection getCollectionDetail(Collection collection, Object sourc
                         continue;
                     }
                 }
-                if(isJson(element.toString()))
-                    element = jsonParser.parse(element.toString());
-                else
-                    element = Jsoup.parse(element.toString());
                 String vId = parseSingleProperty(element, rule.videoRule.id, sourceUrl, false);
                 int vid;
                 try {

diff --git a/app/src/main/java/ml/puredark/hviewer/ui/activities/MainActivity.java b/app/src/main/java/ml/puredark/hviewer/ui/activities/MainActivity.java
@@ -1066,7 +1066,7 @@ public void search(String keyword, boolean doSearch) {
 
     @Override
     protected void onNewIntent(Intent intent) {
-        if ("search".equals(intent.getAction())) {
+        if ("search".equals(intent.getAction()) && currFragment != null) {
             Tag tag = (Tag) intent.getSerializableExtra("tag");
             Site currSite = currFragment.getCurrSite();
             if (tag.url != null && currSite != null) {