バグ修正

app/build.gradle

@@ -17,8 +17,8 @@ android {
         targetSdkVersion target_sdk_version
         minSdkVersion min_sdk_version
 
-        versionCode 297
-        versionName "2.9.7"
+        versionCode 299
+        versionName "2.9.9"
         applicationId "jp.juggler.subwaytooter"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

app/src/main/java/jp/juggler/subwaytooter/ActMain.kt

@@ -2747,6 +2747,7 @@ class ActMain : AppCompatActivity()
 			if(nAutoCwLines > 0
 				&& line_count > nAutoCwLines
 				&& status.spoiler_text?.isEmpty() != false
+				&& (status.mentions?.size ?: 0) <= nAutoCwLines
 			) {
 				val sb = SpannableStringBuilder()
 				sb.append(getString(R.string.auto_cw_prefix))

app/src/main/java/jp/juggler/subwaytooter/Column.kt

@@ -4904,14 +4904,14 @@ class Column(
 						sp = holder.scrollPosition
 					}
 					
-					val added = list_new.size
+					
 					
 					if(bBottom) {
 						val changeList = listOf(
 							AdapterChange(
 								AdapterChangeType.RangeInsert,
 								list_data.size,
-								added
+								list_new.size
 							)
 						)
 						list_data.addAll(list_new)
@@ -4941,6 +4941,8 @@ class Column(
 						}
 						
 						replaceConversationSummary(changeList, list_new, list_data)
+
+						val added = list_new.size // may 0
 						
 						// 投稿後のリフレッシュなら当該投稿の位置を探す
 						var status_index = - 1
@@ -5853,11 +5855,12 @@ class Column(
 					val list_new = duplicate_map.filterDuplicate(list_tmp)
 					// 0個でもギャップを消すために以下の処理を続ける
 					
-					val added = list_new.size // may 0
 					val changeList = ArrayList<AdapterChange>()
 					
 					replaceConversationSummary(changeList, list_new, list_data)
 					
+					val added = list_new.size // may 0
+					
 					val position = list_data.indexOf(gap)
 					if(position == - 1) {
 						log.d("gap not found..")
@@ -6470,11 +6473,12 @@ class Column(
 				
 			}
 			
-			val added = list_new.size
 			val changeList = ArrayList<AdapterChange>()
 			
 			replaceConversationSummary(changeList, list_new, list_data)
 			
+			val added = list_new.size  // may 0
+			
 			loop@ for(o in list_new) {
 				when(o) {
 					

app/src/main/java/jp/juggler/subwaytooter/ItemViewHolder.kt

@@ -505,10 +505,10 @@ internal class ItemViewHolder(
 			}
 			
 			fun showIcon(iv : MyNetworkImageView, idx : Int) {
-				if(idx >= size) {
-					iv.visibility = View.GONE
-					return
-				}
+				val bShown = idx < size
+				iv.visibility = if(bShown) View.VISIBLE else View.GONE
+				if(!bShown) return
+
 				val who = accountsOther[idx].get()
 				iv.setImageUrl(
 					activity.pref,