From 00e74ae282a4d6eb152b34e8b93a742a366dea97 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Sat, 6 May 2017 22:26:54 +0900
Subject: [PATCH] =?UTF-8?q?SSL=E8=AA=BF=E6=9F=BB=E3=81=AE=E7=97=95?=
 =?UTF-8?q?=E8=B7=A1=20issues=20#4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jp/juggler/subwaytooter/App1.java    | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/jp/juggler/subwaytooter/App1.java b/app/src/main/java/jp/juggler/subwaytooter/App1.java
index ddb0f427..7d2feaff 100644
--- a/app/src/main/java/jp/juggler/subwaytooter/App1.java
+++ b/app/src/main/java/jp/juggler/subwaytooter/App1.java
@@ -19,6 +19,7 @@ import com.android.volley.toolbox.ImageLoader;
 import com.android.volley.toolbox.Volley;
 
 import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
 
 import jp.juggler.subwaytooter.table.AcctColor;
 import jp.juggler.subwaytooter.table.AcctSet;
@@ -30,6 +31,7 @@ import jp.juggler.subwaytooter.table.MediaShown;
 import jp.juggler.subwaytooter.table.NotificationTracking;
 import jp.juggler.subwaytooter.table.SavedAccount;
 import jp.juggler.subwaytooter.table.UserRelation;
+import jp.juggler.subwaytooter.util.LogCategory;
 import okhttp3.CipherSuite;
 import okhttp3.ConnectionSpec;
 import okhttp3.OkHttpClient;
@@ -38,7 +40,8 @@ import uk.co.chrisjenx.calligraphy.TypefaceUtils;
 
 public class App1 extends Application {
 	
-
+	static final LogCategory log = new LogCategory( "App1" );
+	
 	static final String DB_NAME = "app_db";
 	static final int DB_VERSION = 10;
 	// 2017/4/25 v10 1=>2 SavedAccount に通知設定を追加
@@ -226,7 +229,6 @@ public class App1 extends Application {
 			typeface_emoji = TypefaceUtils.load( getAssets(), "emojione_android.ttf" );
 		}
 		
-		
 		if( db_open_helper == null ){
 			db_open_helper = new DBOpenHelper( getApplicationContext() );
 			
@@ -245,11 +247,8 @@ public class App1 extends Application {
 			);
 		}
 		
-
 		if( ok_http_client == null ){
 			
-			// ok_http_client = new OkHttpClient();
-			
 			ConnectionSpec spec = new ConnectionSpec.Builder( ConnectionSpec.MODERN_TLS )
 				.cipherSuites( APPROVED_CIPHER_SUITES )
 				.build();
@@ -257,14 +256,17 @@ public class App1 extends Application {
 			ArrayList< ConnectionSpec > spec_list = new ArrayList<>();
 			spec_list.add( spec );
 			spec_list.add( ConnectionSpec.CLEARTEXT );
-			
-			ok_http_client = new OkHttpClient.Builder()
+
+			OkHttpClient.Builder builder = new OkHttpClient.Builder()
+				.connectTimeout( 30, TimeUnit.SECONDS )
+				.readTimeout( 30, TimeUnit.SECONDS )
+				.writeTimeout( 30, TimeUnit.SECONDS )
 				.connectionSpecs( spec_list )
-				.build();
+			;
 			
+			ok_http_client = builder.build();
 		}
 		
-		
 	}
 	
 	@Override
@@ -274,7 +276,8 @@ public class App1 extends Application {
 	
 	@SuppressLint("StaticFieldLeak")
 	private static AppState app_state;
-	static AppState getAppState(Context context){
+	
+	static AppState getAppState( Context context ){
 		// これは最後。loadColumnListでDBが必要になる
 		if( app_state == null ){
 			app_state = new AppState( context.getApplicationContext(), pref );