From 515048365d74d5df2285e4d17fbec24a137d5e8c Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Thu, 6 Jul 2017 19:38:12 +0900
Subject: [PATCH] =?UTF-8?q?okhttpclient=20=E3=81=AB=20WebSocket=20?=
 =?UTF-8?q?=E3=81=AEping=20Interval=20=E3=82=92=E6=8C=87=E5=AE=9A=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                              | 2 +-
 app/src/main/java/jp/juggler/subwaytooter/App1.java         | 1 +
 app/src/main/java/jp/juggler/subwaytooter/AppState.java     | 4 ++--
 .../main/java/jp/juggler/subwaytooter/ColumnViewHolder.java | 1 -
 app/src/main/java/jp/juggler/subwaytooter/StreamReader.java | 6 ++++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index fbb68289..5d199810 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/jp/juggler/subwaytooter/App1.java b/app/src/main/java/jp/juggler/subwaytooter/App1.java
index 8ab24cc3..f0c38d59 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/App1.java
+++ b/app/src/main/java/jp/juggler/subwaytooter/App1.java
@@ -290,6 +290,7 @@ public class App1 extends Application {
 				.connectTimeout( 30, TimeUnit.SECONDS )
 				.readTimeout( 30, TimeUnit.SECONDS )
 				.writeTimeout( 30, TimeUnit.SECONDS )
+				.pingInterval( 10, TimeUnit.SECONDS )
 				.connectionSpecs( spec_list );
 			
 			ok_http_client = builder.build();
diff --git a/app/src/main/java/jp/juggler/subwaytooter/AppState.java b/app/src/main/java/jp/juggler/subwaytooter/AppState.java
index 024f31d7..56988d4a 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/AppState.java
+++ b/app/src/main/java/jp/juggler/subwaytooter/AppState.java
@@ -47,10 +47,10 @@ class AppState {
 	
 	AppState( Context applicationContext, SharedPreferences pref ){
 		this.context = applicationContext;
+		this.handler = new Handler();
 		this.pref = pref;
 		this.density = context.getResources().getDisplayMetrics().density;
-		this.stream_reader = new StreamReader( applicationContext, pref );
-		this.handler = new Handler();
+		this.stream_reader = new StreamReader( applicationContext, handler, pref );
 		
 		loadColumnList();
 	}
diff --git a/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java b/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java
index 77a02637..577f07d9 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java
+++ b/app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java
@@ -784,7 +784,6 @@ class ColumnViewHolder
 				log.d( "restoreScrollPosition [%d] %s , column has no saved scroll position.", page_idx, column.getColumnName( true ));
 				return;
 			}
-
 			
 			column.scroll_save = null;
 			
diff --git a/app/src/main/java/jp/juggler/subwaytooter/StreamReader.java b/app/src/main/java/jp/juggler/subwaytooter/StreamReader.java
index 64bd1ea9..dfb9d482 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/StreamReader.java
+++ b/app/src/main/java/jp/juggler/subwaytooter/StreamReader.java
@@ -42,6 +42,8 @@ class StreamReader {
 		final String end_point;
 		final LinkedList< Callback > callback_list = new LinkedList<>();
 		
+
+		
 		Reader( SavedAccount access_info, String end_point ){
 			this.access_info = access_info;
 			this.end_point = end_point;
@@ -216,10 +218,10 @@ class StreamReader {
 	final SharedPreferences pref;
 	private final Handler handler;
 	
-	StreamReader( Context context, SharedPreferences pref ){
+	StreamReader( Context context, Handler handler,SharedPreferences pref ){
 		this.context = context;
 		this.pref = pref;
-		this.handler = new Handler();
+		this.handler = handler;
 	}
 	
 	private Reader prepareReader( @NonNull SavedAccount access_info, @NonNull String end_point ){