From 272fc78df95c57dc5214b129a7034419c8a0ada7 Mon Sep 17 00:00:00 2001 From: M M Arif Date: Tue, 17 Nov 2020 19:56:16 +0100 Subject: [PATCH] [Frontport] Fix add new account (#779) Fix add new account Co-authored-by: M M Arif Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/779 Reviewed-by: 6543 <6543@noreply.codeberg.org> --- .../org/mian/gitnex/activities/AddNewAccountActivity.java | 2 +- .../main/java/org/mian/gitnex/clients/RetrofitClient.java | 5 +++++ app/src/main/res/layout/list_issue_comments.xml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java index a3e027af..d0b76ccb 100644 --- a/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java @@ -197,7 +197,7 @@ public class AddNewAccountActivity extends BaseActivity { private void setupNewAccountWithToken(String instanceUrl, final String loginToken) { - Call call = RetrofitClient.getApiInterface(ctx).getUserInfo("token " + loginToken); + Call call = RetrofitClient.getApiInterface(ctx, instanceUrl).getUserInfo("token " + loginToken); call.enqueue(new Callback() { diff --git a/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java b/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java index a07cb4c8..9fabe73e 100644 --- a/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java +++ b/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java @@ -17,6 +17,7 @@ import javax.net.ssl.X509TrustManager; import okhttp3.Cache; import okhttp3.OkHttpClient; import okhttp3.Request; +import okhttp3.logging.HttpLoggingInterceptor; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; import retrofit2.converter.scalars.ScalarsConverterFactory; @@ -37,6 +38,9 @@ public class RetrofitClient { int cacheSize = FilesData.returnOnlyNumber(tinyDB.getString("cacheSizeStr")) * 1024 * 1024; Cache cache = new Cache(new File(context.getCacheDir(), "responses"), cacheSize); + HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); + logging.setLevel(HttpLoggingInterceptor.Level.BODY); + try { SSLContext sslContext = SSLContext.getInstance("TLS"); @@ -45,6 +49,7 @@ public class RetrofitClient { sslContext.init(null, new X509TrustManager[]{ memorizingTrustManager }, new SecureRandom()); OkHttpClient.Builder okHttpClient = new OkHttpClient.Builder().cache(cache) + //.addInterceptor(logging) .sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager) .hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier())) .addInterceptor(chain -> { diff --git a/app/src/main/res/layout/list_issue_comments.xml b/app/src/main/res/layout/list_issue_comments.xml index 39525079..aef721ce 100644 --- a/app/src/main/res/layout/list_issue_comments.xml +++ b/app/src/main/res/layout/list_issue_comments.xml @@ -71,7 +71,7 @@ android:textIsSelectable="true" android:autoLink="web" android:textColorLink="@color/lightBlue" - android:textSize="14sp" /> + android:textSize="16sp" />