do not crash if inflating feeds/cats headerview failed (android!!1)

2 files changed, 30 insertions, 18 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
index b596e269..a7018be7 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
@@ -15,6 +15,7 @@ import android.support.v4.widget.SwipeRefreshLayout;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.InflateException;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -222,17 +223,22 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
 
         // TODO: better check
         if (m_activity.findViewById(R.id.headlines_drawer) != null) {
-            View layout = inflater.inflate(R.layout.drawer_header, m_list, false);
-            m_list.addHeaderView(layout, null, false);
+            try {
+                View layout = inflater.inflate(R.layout.drawer_header, m_list, false);
+                m_list.addHeaderView(layout, null, false);
 
-            TextView login = (TextView) view.findViewById(R.id.drawer_header_login);
-            TextView server = (TextView) view.findViewById(R.id.drawer_header_server);
+                TextView login = (TextView) view.findViewById(R.id.drawer_header_login);
+                TextView server = (TextView) view.findViewById(R.id.drawer_header_server);
 
-            login.setText(m_prefs.getString("login", ""));
-            try {
-                server.setText(new URL(m_prefs.getString("ttrss_url", "")).getHost());
-            } catch (MalformedURLException e) {
-                server.setText("");
+                login.setText(m_prefs.getString("login", ""));
+                try {
+                    server.setText(new URL(m_prefs.getString("ttrss_url", "")).getHost());
+                } catch (MalformedURLException e) {
+                    server.setText("");
+                }
+            } catch (InflateException e) {
+                // welp couldn't inflate header i guess
+                e.printStackTrace();
             }
         }
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
index d6ddf7c9..0ed6d6be 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
@@ -16,6 +16,7 @@ import android.support.v4.widget.SwipeRefreshLayout;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.InflateException;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -300,17 +301,22 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
         } else {
             // TODO: better check
             if (m_activity.findViewById(R.id.headlines_drawer) != null) {
-                View layout = inflater.inflate(R.layout.drawer_header, m_list, false);
-                m_list.addHeaderView(layout, null, false);
+                try {
+                    View layout = inflater.inflate(R.layout.drawer_header, m_list, false);
+                    m_list.addHeaderView(layout, null, false);
 
-                TextView login = (TextView) view.findViewById(R.id.drawer_header_login);
-                TextView server = (TextView) view.findViewById(R.id.drawer_header_server);
+                    TextView login = (TextView) view.findViewById(R.id.drawer_header_login);
+                    TextView server = (TextView) view.findViewById(R.id.drawer_header_server);
 
-                login.setText(m_prefs.getString("login", ""));
-                try {
-                    server.setText(new URL(m_prefs.getString("ttrss_url", "")).getHost());
-                } catch (MalformedURLException e) {
-                    server.setText("");
+                    login.setText(m_prefs.getString("login", ""));
+                    try {
+                        server.setText(new URL(m_prefs.getString("ttrss_url", "")).getHost());
+                    } catch (MalformedURLException e) {
+                        server.setText("");
+                    }
+                } catch (InflateException e) {
+                    // welp couldn't inflate header i guess
+                    e.printStackTrace();
                 }
             }
         }