From 764078d44616b8a275b9efecc3492d7b6de94f5f Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Fri, 24 May 2019 15:37:56 +0200
Subject: [PATCH] Fix some crashes

---
 .../android/activities/BaseMainActivity.java  | 36 +++++++++++--------
 .../android/drawers/StatusListAdapter.java    |  6 ++--
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
index ad71214ea..633288e2d 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
@@ -2153,20 +2153,28 @@ public abstract class BaseMainActivity extends BaseActivity
 
 
     public void updateHomeCounter(){
-        if( tabLayout.getTabAt(0) == null )
-            return;
-        //noinspection ConstantConditions
-        View tabHome = tabLayout.getTabAt(0).getCustomView();
-        if( tabHome == null)
-            return;
-        TextView tabCounterHome = tabHome.findViewById(R.id.tab_counter);
-        tabCounterHome.setText(String.valueOf(countNewStatus));
-        if( countNewStatus> 0){
-            //New data are available
-            //The fragment is not displayed, so the counter is displayed
-            tabCounterHome.setVisibility(View.VISIBLE);
-        }else {
-            tabCounterHome.setVisibility(View.GONE);
+        int i = 0;
+        if( timelines != null && timelines.size() > 0){
+            for(ManageTimelines tl: timelines){
+                if( tl.getType() == ManageTimelines.Type.HOME){
+                    if( tabLayout.getTabCount() > i) {
+                        View tabHome = tabLayout.getTabAt(i).getCustomView();
+                        if( tabHome != null){
+                            TextView tabCounterHome = tabHome.findViewById(R.id.tab_counter);
+                            tabCounterHome.setText(String.valueOf(countNewStatus));
+                            if( countNewStatus> 0){
+                                //New data are available
+                                //The fragment is not displayed, so the counter is displayed
+                                tabCounterHome.setVisibility(View.VISIBLE);
+                            }else {
+                                tabCounterHome.setVisibility(View.GONE);
+                            }
+                        }
+                    }
+                }
+                i++;
+            }
+
         }
     }
 
diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index 2c6eab368..7937f8e34 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -1471,13 +1471,13 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
 
             if ((getItemViewType(viewHolder.getAdapterPosition()) != COMPACT_STATUS) &&  getItemViewType(viewHolder.getAdapterPosition()) != CONSOLE_STATUS && (trans_forced || (translator != Helper.TRANS_NONE && currentLocale != null && differentLanguage))) {
                 if (status.getSpoiler_text() != null && status.getSpoiler_text().length() > 0) {
-                    if (status.isSpoilerShown() || getItemViewType(viewHolder.getAdapterPosition()) == FOCUSED_STATUS) {
+                    if (status.isSpoilerShown() || expand_cw  || getItemViewType(viewHolder.getAdapterPosition()) == FOCUSED_STATUS) {
                         holder.status_translate.setVisibility(View.VISIBLE);
                     } else {
                         holder.status_translate.setVisibility(View.GONE);
                     }
                 } else if (status.getReblog() != null && status.getReblog().getSpoiler_text() != null && status.getReblog().getSpoiler_text().length() > 0) {
-                    if (status.isSpoilerShown() || getItemViewType(viewHolder.getAdapterPosition()) == FOCUSED_STATUS) {
+                    if (status.isSpoilerShown() || expand_cw   || getItemViewType(viewHolder.getAdapterPosition()) == FOCUSED_STATUS) {
                         holder.status_translate.setVisibility(View.VISIBLE);
                     } else {
                         holder.status_translate.setVisibility(View.GONE);
@@ -1711,10 +1711,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
 
             if (status.isTranslationShown() && status.getContentSpanTranslated() != null) {
                 holder.status_content_translated.setText(status.getContentSpanTranslated(), TextView.BufferType.SPANNABLE);
-                holder.status_content.setVisibility(View.GONE);
                 holder.status_content_translated_container.setVisibility(View.VISIBLE);
             } else { //Toot is not translated
-                holder.status_content.setVisibility(View.VISIBLE);
                 holder.status_content_translated_container.setVisibility(View.GONE);
             }