From 03528f653ac0ab9b650696a8c7524ee2b7636f32 Mon Sep 17 00:00:00 2001 From: M M Arif Date: Tue, 28 Apr 2020 11:18:58 +0500 Subject: [PATCH] small refactor and cleanup --- .../mian/gitnex/clients/IssuesService.java | 84 ------------------- .../gitnex/clients/PullRequestsService.java | 83 ------------------ .../mian/gitnex/fragments/IssuesFragment.java | 4 +- .../fragments/PullRequestsFragment.java | 4 +- .../res/layout/fragment_issues_closed.xml | 44 ---------- .../main/res/layout/fragment_issues_main.xml | 48 ----------- 6 files changed, 4 insertions(+), 263 deletions(-) delete mode 100644 app/src/main/java/org/mian/gitnex/clients/IssuesService.java delete mode 100644 app/src/main/java/org/mian/gitnex/clients/PullRequestsService.java delete mode 100644 app/src/main/res/layout/fragment_issues_closed.xml delete mode 100644 app/src/main/res/layout/fragment_issues_main.xml diff --git a/app/src/main/java/org/mian/gitnex/clients/IssuesService.java b/app/src/main/java/org/mian/gitnex/clients/IssuesService.java deleted file mode 100644 index 98ccf57..0000000 --- a/app/src/main/java/org/mian/gitnex/clients/IssuesService.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.mian.gitnex.clients; - -import android.content.Context; -import android.util.Log; -import androidx.annotation.NonNull; -import org.mian.gitnex.helpers.ssl.MemorizingTrustManager; -import org.mian.gitnex.util.AppUtil; -import java.io.File; -import java.io.IOException; -import java.security.SecureRandom; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.X509TrustManager; -import okhttp3.Cache; -import okhttp3.Interceptor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import okhttp3.logging.HttpLoggingInterceptor; -import retrofit2.Retrofit; -import retrofit2.converter.gson.GsonConverterFactory; - -/** - * Author M M Arif - */ - -public class IssuesService { - - public static S createService(Class serviceClass, String instanceURL, Context ctx) { - - final boolean connToInternet = AppUtil.haveNetworkConnection(ctx); - File httpCacheDirectory = new File(ctx.getCacheDir(), "responses"); - int cacheSize = 50 * 1024 * 1024; // 50MB - Cache cache = new Cache(httpCacheDirectory, cacheSize); - - HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); - logging.setLevel(HttpLoggingInterceptor.Level.BODY); - - try { - - SSLContext sslContext = SSLContext.getInstance("TLS"); - - MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(ctx); - sslContext.init(null, new X509TrustManager[]{memorizingTrustManager}, new SecureRandom()); - - OkHttpClient okHttpClient = new OkHttpClient.Builder() - .cache(cache) - //.addInterceptor(logging) - .sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager) - .hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier())) - .addInterceptor(new Interceptor() { - - @NonNull - @Override - public Response intercept(@NonNull Chain chain) throws IOException { - - Request request = chain.request(); - if(connToInternet) { - request = request.newBuilder().header("Cache-Control", "public, max-age=" + 60).build(); - } - else { - request = request.newBuilder().header("Cache-Control", "public, only-if-cached, max-stale=" + 60 * 60 * 24 * 30).build(); - } - return chain.proceed(request); - } - }).build(); - - Retrofit.Builder builder = new Retrofit.Builder() - .baseUrl(instanceURL) - .client(okHttpClient) - .addConverterFactory(GsonConverterFactory.create()); - - Retrofit retrofit = builder.build(); - return retrofit.create(serviceClass); - - } - catch(Exception e) { - Log.e("onFailure", e.toString()); - } - - return null; - } - -} diff --git a/app/src/main/java/org/mian/gitnex/clients/PullRequestsService.java b/app/src/main/java/org/mian/gitnex/clients/PullRequestsService.java deleted file mode 100644 index b6bbd63..0000000 --- a/app/src/main/java/org/mian/gitnex/clients/PullRequestsService.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.mian.gitnex.clients; - -import android.content.Context; -import android.util.Log; -import androidx.annotation.NonNull; -import org.mian.gitnex.helpers.ssl.MemorizingTrustManager; -import org.mian.gitnex.util.AppUtil; -import java.io.File; -import java.io.IOException; -import java.security.SecureRandom; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.X509TrustManager; -import okhttp3.Cache; -import okhttp3.Interceptor; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import okhttp3.logging.HttpLoggingInterceptor; -import retrofit2.Retrofit; -import retrofit2.converter.gson.GsonConverterFactory; - -/** - * Author M M Arif - */ - -public class PullRequestsService { - - public static S createService(Class serviceClass, String instanceURL, Context ctx) { - - final boolean connToInternet = AppUtil.haveNetworkConnection(ctx); - File httpCacheDirectory = new File(ctx.getCacheDir(), "responses"); - int cacheSize = 50 * 1024 * 1024; // 50MB - Cache cache = new Cache(httpCacheDirectory, cacheSize); - - HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); - logging.setLevel(HttpLoggingInterceptor.Level.BODY); - - try { - - SSLContext sslContext = SSLContext.getInstance("TLS"); - - MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(ctx); - sslContext.init(null, new X509TrustManager[]{memorizingTrustManager}, new SecureRandom()); - - OkHttpClient okHttpClient = new OkHttpClient.Builder() - .cache(cache) - //.addInterceptor(logging) - .sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager) - .hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier())) - .addInterceptor(new Interceptor() { - - @NonNull - @Override - public Response intercept(@NonNull Chain chain) throws IOException { - - Request request = chain.request(); - if(connToInternet) { - request = request.newBuilder().header("Cache-Control", "public, max-age=" + 60).build(); - } - else { - request = request.newBuilder().header("Cache-Control", "public, only-if-cached, max-stale=" + 60 * 60 * 24 * 30).build(); - } - return chain.proceed(request); - } - }).build(); - - Retrofit.Builder builder = new Retrofit.Builder() - .baseUrl(instanceURL) - .client(okHttpClient) - .addConverterFactory(GsonConverterFactory.create()); - - Retrofit retrofit = builder.build(); - return retrofit.create(serviceClass); - } - catch(Exception e) { - Log.e("onFailure", e.toString()); - } - - return null; - } - -} diff --git a/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java index 0103cbb..2258617 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java @@ -22,7 +22,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import org.mian.gitnex.R; import org.mian.gitnex.activities.RepoDetailActivity; import org.mian.gitnex.adapters.IssuesAdapter; -import org.mian.gitnex.clients.IssuesService; +import org.mian.gitnex.clients.AppApiService; import org.mian.gitnex.helpers.Authorization; import org.mian.gitnex.helpers.StaticGlobalVariables; import org.mian.gitnex.helpers.Toasty; @@ -143,7 +143,7 @@ public class IssuesFragment extends Fragment { }); - api = IssuesService.createService(ApiInterface.class, instanceUrl, getContext()); + api = AppApiService.createService(ApiInterface.class, instanceUrl, getContext()); loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, resultLimit, requestType, tinyDb.getString("repoIssuesState")); return v; diff --git a/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java index 936a824..1347976 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java @@ -23,7 +23,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import org.mian.gitnex.R; import org.mian.gitnex.activities.RepoDetailActivity; import org.mian.gitnex.adapters.PullRequestsAdapter; -import org.mian.gitnex.clients.PullRequestsService; +import org.mian.gitnex.clients.AppApiService; import org.mian.gitnex.helpers.Authorization; import org.mian.gitnex.helpers.StaticGlobalVariables; import org.mian.gitnex.helpers.Toasty; @@ -145,7 +145,7 @@ public class PullRequestsFragment extends Fragment { }); - apiPR = PullRequestsService.createService(ApiInterface.class, instanceUrl, context); + apiPR = AppApiService.createService(ApiInterface.class, instanceUrl, context); loadInitial(Authorization.returnAuthentication(getContext(), loginUid, instanceToken), repoOwner, repoName, pageSize, tinyDb.getString("repoPrState"), resultLimit); return v; diff --git a/app/src/main/res/layout/fragment_issues_closed.xml b/app/src/main/res/layout/fragment_issues_closed.xml deleted file mode 100644 index b1f8680..0000000 --- a/app/src/main/res/layout/fragment_issues_closed.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_issues_main.xml b/app/src/main/res/layout/fragment_issues_main.xml deleted file mode 100644 index a21263e..0000000 --- a/app/src/main/res/layout/fragment_issues_main.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file -- 2.40.1