From ae2102077a1139e90b3039347be2a3c20fbe9b5c Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Sat, 25 Aug 2018 10:05:27 +0900
Subject: [PATCH] =?UTF-8?q?v2.7.5=E3=80=82=E3=83=90=E3=82=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                    |  4 ++--
 app/src/main/java/jp/juggler/subwaytooter/Column.kt | 13 +++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2a7d5e8b..37fac435 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 27
 
-        versionCode 274
-        versionName "2.7.4"
+        versionCode 275
+        versionName "2.7.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         // https://stackoverflow.com/questions/47791227/java-lang-illegalstateexception-dex-archives-setting-dex-extension-only-for
diff --git a/app/src/main/java/jp/juggler/subwaytooter/Column.kt b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
index 6ce43dee..bd3d73e4 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/Column.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/Column.kt
@@ -4698,14 +4698,7 @@ class Column(
 	////////////////////////////////////////////////////////////////////////
 	// Streaming
 	
-	private fun getId(o : Any) : EntityId? {
-		return when(o) {
-			is TootNotification -> o.id
-			is TootStatus -> o.id
-			is TootAccount -> o.id
-			else -> null
-		}
-	}
+
 	
 	internal fun onStart(callback : Callback) {
 		this.callback_ref = WeakReference(callback)
@@ -5025,7 +5018,7 @@ class Column(
 			var new_id_min : EntityId? = null
 			for(o in list_new) {
 				try {
-					val id = getId(o) ?: continue
+					val id = o.getOrderId()
 					if( id.toString().isEmpty() ) continue
 					if(new_id_max == null || id > new_id_max) new_id_max = id
 					if(new_id_min == null || id < new_id_min) new_id_min = id
@@ -5066,7 +5059,7 @@ class Column(
 				bPutGap = false
 				try {
 					if(list_data.size > 0 && new_id_min != null) {
-						val since = getId(list_data[0])
+						val since = list_data[0].getOrderId()
 						if(since != null && new_id_min > since) {
 							val gap = TootGap(new_id_min, since)
 							list_new.add(gap)