From bca77af852e47bfb42f50a8e419a9f9e20d8df62 Mon Sep 17 00:00:00 2001
From: Shinokuni <shinokuni@openserver.fr>
Date: Sat, 9 Feb 2019 19:13:46 +0000
Subject: [PATCH] Adding back navigation to item activity and fixing bug when
 either description or content are null

---
 .idea/assetWizardSettings.xml                      | 14 ++++++++++++++
 app/src/main/AndroidManifest.xml                   |  3 ++-
 .../com/readrops/app/utils/ReadropsWebView.java    | 12 ++++++++----
 app/src/main/res/layout/activity_item.xml          |  9 +++++----
 4 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 .idea/assetWizardSettings.xml

diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
new file mode 100644
index 00000000..6b96cf0c
--- /dev/null
+++ b/.idea/assetWizardSettings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="WizardSettings">
+    <option name="children">
+      <map>
+        <entry key="vectorWizard">
+          <value>
+            <PersistentState />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0bd7b5b9..ae009921 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,7 +25,8 @@
             </intent-filter>
         </activity>
         <activity android:name=".ItemActivity"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:parentActivityName=".MainActivity">
 
         </activity>
     </application>
diff --git a/app/src/main/java/com/readrops/app/utils/ReadropsWebView.java b/app/src/main/java/com/readrops/app/utils/ReadropsWebView.java
index 7eebc9f1..55dc4266 100644
--- a/app/src/main/java/com/readrops/app/utils/ReadropsWebView.java
+++ b/app/src/main/java/com/readrops/app/utils/ReadropsWebView.java
@@ -41,12 +41,16 @@ public class ReadropsWebView extends WebView {
     }
 
     private String getText() {
-        Document document = Jsoup.parse(itemWithFeed.getItem().getText());
+        if (itemWithFeed.getItem().getText() != null) {
+            Document document = Jsoup.parse(itemWithFeed.getItem().getText());
 
-        document.head().append("<meta name=\"viewport\" content=\"width=" + width +", initial-scale=1\">");
-        document.head().append("<style>img{display: inline;height: auto;max-width: 100%;}</style>");
+            document.head().append("<meta name=\"viewport\" content=\"width=" + width +", initial-scale=1\">");
+            document.head().append("<style>img{display: inline;height: auto;max-width: 100%;}</style>");
+
+            return document.toString();
+        } else
+            return null;
 
-        return document.toString();
     }
 
 
diff --git a/app/src/main/res/layout/activity_item.xml b/app/src/main/res/layout/activity_item.xml
index e48efcd1..41fd7eb6 100644
--- a/app/src/main/res/layout/activity_item.xml
+++ b/app/src/main/res/layout/activity_item.xml
@@ -52,13 +52,13 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:padding="6dp">
 
             <RelativeLayout
                 android:id="@+id/activity_item_details_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="6dp">
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:id="@+id/activity_item_title"
@@ -117,7 +117,8 @@
                 android:id="@+id/item_webview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/activity_item_details_layout" />
+                android:layout_below="@id/activity_item_details_layout"
+                android:layout_marginTop="6dp"/>
 
         </RelativeLayout>