From 2b2745649821d1340906ebd31a9cc4305c049f13 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Fri, 31 Jan 2020 17:08:38 +0900
Subject: [PATCH] fix #128

---
 app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt  | 2 +-
 .../main/java/jp/juggler/subwaytooter/api/entity/TootStatus.kt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt b/app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt
index 8dc82dc1..bed9004e 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/ActAccountSetting.kt
@@ -261,7 +261,7 @@ class ActAccountSetting
 		
 		Styler.fixHorizontalPadding(root)
 		
-		ActAppSetting.setSwitchColor(this, pref, root)
+		App1.setSwitchColor(this, pref, root)
 		
 		tvInstance = findViewById(R.id.tvInstance)
 		tvUser = findViewById(R.id.tvUser)
diff --git a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatus.kt b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatus.kt
index 06a0418d..12c1594c 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatus.kt
+++ b/app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatus.kt
@@ -1071,7 +1071,7 @@ class TootStatus(parser : TootParser, src : JsonObject) : TimelineItem() {
 			}
 			
 			// 年の部分が現在と同じなら省略する
-			val dateNow = format.format(Date(t))
+			val dateNow = format.format(Date())
 			val delm = dateNow.indexOf('-')
 			if(delm!=-1 && dateNow.substring(0,delm+1) == dateTarget.substring(0,delm+1)){
 				dateTarget = dateTarget.substring(delm+1)