From 9b24fff1608270e35742bd89762b5355a31b741c Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Fri, 4 Oct 2019 15:11:53 +0800
Subject: Handle no browser when trying to opening links. Fixed app crashes in
 various cases.

---
 .../Activity/LinkResolverActivity.java             |  6 ++++-
 .../Activity/ViewPostDetailActivity.java           |  2 +-
 .../Adapter/CommentAndPostRecyclerViewAdapter.java | 30 +++++++++++-----------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LinkResolverActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LinkResolverActivity.java
index 00d3bbd5..a95c4f96 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LinkResolverActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LinkResolverActivity.java
@@ -207,7 +207,11 @@ public class LinkResolverActivity extends AppCompatActivity {
 
         if (!packageNames.isEmpty()) {
             intent.setPackage(packageNames.get(0));
-            startActivity(intent);
+            try {
+                startActivity(intent);
+            } catch (ActivityNotFoundException e) {
+                Toast.makeText(this, R.string.no_browser_found, Toast.LENGTH_SHORT).show();
+            }
         } else {
             Toast.makeText(this, R.string.no_browser_found, Toast.LENGTH_SHORT).show();
         }
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java
index b2afe3d2..bb835b49 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewPostDetailActivity.java
@@ -640,7 +640,7 @@ public class ViewPostDetailActivity extends BaseActivity implements FlairBottomS
     }
 
     private void refresh(boolean fetchPost, boolean fetchComments) {
-        if (!isRefreshing) {
+        if (mAdapter != null && !isRefreshing) {
             isRefreshing = true;
             mChildrenStartingIndex = 0;
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
index 11b68da8..f7e16eb1 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
@@ -979,14 +979,12 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
     }
 
     private int getParentPosition(int position) {
-        if (position >= mVisibleComments.size()) {
-            return -1;
-        }
-
-        int childDepth = mVisibleComments.get(position).getDepth();
-        for (int i = position; i >= 0; i--) {
-            if (mVisibleComments.get(i).getDepth() < childDepth) {
-                return i;
+        if (position < mVisibleComments.size()) {
+            int childDepth = mVisibleComments.get(position).getDepth();
+            for (int i = position; i >= 0; i--) {
+                if (mVisibleComments.get(i).getDepth() < childDepth) {
+                    return i;
+                }
             }
         }
         return -1;
@@ -1557,13 +1555,15 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
             expandButton.setOnClickListener(view -> {
                 if (expandButton.getVisibility() == View.VISIBLE) {
                     int commentPosition = mIsSingleCommentThreadMode ? getAdapterPosition() - 2 : getAdapterPosition() - 1;
-                    if (mVisibleComments.get(commentPosition).isExpanded()) {
-                        collapseChildren(commentPosition);
-                        expandButton.setImageResource(R.drawable.ic_expand_more_black_20dp);
-                    } else {
-                        expandChildren(commentPosition);
-                        mVisibleComments.get(commentPosition).setExpanded(true);
-                        expandButton.setImageResource(R.drawable.ic_expand_less_black_20dp);
+                    if(commentPosition < mVisibleComments.size()) {
+                        if (mVisibleComments.get(commentPosition).isExpanded()) {
+                            collapseChildren(commentPosition);
+                            expandButton.setImageResource(R.drawable.ic_expand_more_black_20dp);
+                        } else {
+                            expandChildren(commentPosition);
+                            mVisibleComments.get(commentPosition).setExpanded(true);
+                            expandButton.setImageResource(R.drawable.ic_expand_less_black_20dp);
+                        }
                     }
                 }
             });
-- 
cgit v1.2.3