diff --git a/app/src/main/java/com/networking/ApiTestActivity.java b/app/src/main/java/com/networking/ApiTestActivity.java index 16c5e3b7..04787c19 100644 --- a/app/src/main/java/com/networking/ApiTestActivity.java +++ b/app/src/main/java/com/networking/ApiTestActivity.java @@ -747,7 +747,7 @@ public void disableGzipForCustomRequest(View view) { .addBodyParameter("firstname", "Amit") .addBodyParameter("lastname", "Shekhar") .setTag(this) - .setOkHttpClient(new OkHttpClient()) + .setOkHttpClient(MyApplication.getInstance().getOkHttpClient()) .setPriority(Priority.LOW) .build() .setAnalyticsListener(new AnalyticsListener() { @@ -789,7 +789,7 @@ public void checkCacheForCustomClient(View view) { AndroidNetworking.download(url, Utils.getRootDirPath(getApplicationContext()), "file1.zip") .setPriority(Priority.HIGH) .setTag(this) - .setOkHttpClient(new OkHttpClient()) + .setOkHttpClient(MyApplication.getInstance().getOkHttpClient()) .build() .setAnalyticsListener(new AnalyticsListener() { @Override diff --git a/app/src/main/java/com/networking/MyApplication.java b/app/src/main/java/com/networking/MyApplication.java index d4c34a7b..784e80c0 100644 --- a/app/src/main/java/com/networking/MyApplication.java +++ b/app/src/main/java/com/networking/MyApplication.java @@ -25,6 +25,10 @@ import com.androidnetworking.common.ConnectionQuality; import com.androidnetworking.interfaces.ConnectionQualityChangeListener; +import java.util.concurrent.TimeUnit; + +import okhttp3.OkHttpClient; + /** * Created by amitshekhar on 22/03/16. */ @@ -32,16 +36,27 @@ public class MyApplication extends Application { private static final String TAG = MyApplication.class.getSimpleName(); private static MyApplication appInstance = null; + private OkHttpClient okHttpClient; public static MyApplication getInstance() { return appInstance; } + public OkHttpClient getOkHttpClient() { + return okHttpClient; + } + @Override public void onCreate() { super.onCreate(); appInstance = this; - AndroidNetworking.initialize(getApplicationContext()); + okHttpClient = new OkHttpClient.Builder() + .connectTimeout(120, TimeUnit.SECONDS) + .readTimeout(120, TimeUnit.SECONDS) + .writeTimeout(120, TimeUnit.SECONDS) + .retryOnConnectionFailure(true) + .build(); + AndroidNetworking.initialize(getApplicationContext(), okHttpClient); BitmapFactory.Options options = new BitmapFactory.Options(); options.inPurgeable = true; AndroidNetworking.setBitmapDecodeOptions(options); diff --git a/app/src/main/java/com/networking/OkHttpResponseTestActivity.java b/app/src/main/java/com/networking/OkHttpResponseTestActivity.java index fc82c946..a895f9f0 100644 --- a/app/src/main/java/com/networking/OkHttpResponseTestActivity.java +++ b/app/src/main/java/com/networking/OkHttpResponseTestActivity.java @@ -695,7 +695,7 @@ public void disableGzipForCustomRequest(View view) { .addBodyParameter("firstname", "Amit") .addBodyParameter("lastname", "Shekhar") .setTag(this) - .setOkHttpClient(new OkHttpClient()) + .setOkHttpClient(MyApplication.getInstance().getOkHttpClient()) .setPriority(Priority.LOW) .build() .setAnalyticsListener(new AnalyticsListener() { @@ -731,7 +731,7 @@ public void checkCacheForCustomClient(View view) { AndroidNetworking.download(url, Utils.getRootDirPath(getApplicationContext()), "file1.zip") .setPriority(Priority.HIGH) .setTag(this) - .setOkHttpClient(new OkHttpClient()) + .setOkHttpClient(MyApplication.getInstance().getOkHttpClient()) .build() .setAnalyticsListener(new AnalyticsListener() { @Override diff --git a/rx2sampleapp/src/main/java/com/rx2sampleapp/Rx2MyApplication.java b/rx2sampleapp/src/main/java/com/rx2sampleapp/Rx2MyApplication.java index e5569bcb..8f504e4e 100644 --- a/rx2sampleapp/src/main/java/com/rx2sampleapp/Rx2MyApplication.java +++ b/rx2sampleapp/src/main/java/com/rx2sampleapp/Rx2MyApplication.java @@ -23,10 +23,15 @@ import com.androidnetworking.common.ConnectionQuality; import com.androidnetworking.interfaces.ConnectionQualityChangeListener; +import java.util.concurrent.TimeUnit; + +import okhttp3.OkHttpClient; + public class Rx2MyApplication extends Application { private static final String TAG = Rx2MyApplication.class.getSimpleName(); private static Rx2MyApplication appInstance = null; + private OkHttpClient okHttpClient; public static Rx2MyApplication getInstance() { return appInstance; @@ -36,7 +41,13 @@ public static Rx2MyApplication getInstance() { public void onCreate() { super.onCreate(); appInstance = this; - AndroidNetworking.initialize(getApplicationContext()); + okHttpClient = new OkHttpClient.Builder() + .connectTimeout(120, TimeUnit.SECONDS) + .readTimeout(120, TimeUnit.SECONDS) + .writeTimeout(120, TimeUnit.SECONDS) + .retryOnConnectionFailure(true) + .build(); + AndroidNetworking.initialize(getApplicationContext(), okHttpClient); AndroidNetworking.enableLogging(); AndroidNetworking.setConnectionQualityChangeListener(new ConnectionQualityChangeListener() { @Override @@ -46,4 +57,4 @@ public void onChange(ConnectionQuality currentConnectionQuality, int currentBand }); } -} \ No newline at end of file +} diff --git a/rxsampleapp/src/main/java/com/rxsampleapp/RxMyApplication.java b/rxsampleapp/src/main/java/com/rxsampleapp/RxMyApplication.java index 1a0d20ce..10c1c45f 100644 --- a/rxsampleapp/src/main/java/com/rxsampleapp/RxMyApplication.java +++ b/rxsampleapp/src/main/java/com/rxsampleapp/RxMyApplication.java @@ -23,10 +23,15 @@ import com.androidnetworking.common.ConnectionQuality; import com.androidnetworking.interfaces.ConnectionQualityChangeListener; +import java.util.concurrent.TimeUnit; + +import okhttp3.OkHttpClient; + public class RxMyApplication extends Application { private static final String TAG = RxMyApplication.class.getSimpleName(); private static RxMyApplication appInstance = null; + private OkHttpClient okHttpClient; public static RxMyApplication getInstance() { return appInstance; @@ -36,7 +41,13 @@ public static RxMyApplication getInstance() { public void onCreate() { super.onCreate(); appInstance = this; - AndroidNetworking.initialize(getApplicationContext()); + okHttpClient = new OkHttpClient.Builder() + .connectTimeout(120, TimeUnit.SECONDS) + .readTimeout(120, TimeUnit.SECONDS) + .writeTimeout(120, TimeUnit.SECONDS) + .retryOnConnectionFailure(true) + .build(); + AndroidNetworking.initialize(getApplicationContext(), okHttpClient); AndroidNetworking.enableLogging(); AndroidNetworking.setConnectionQualityChangeListener(new ConnectionQualityChangeListener() { @Override @@ -46,4 +57,4 @@ public void onChange(ConnectionQuality currentConnectionQuality, int currentBand }); } -} \ No newline at end of file +}