Fix minor formattings, other improvements

app/build.gradle

@@ -84,5 +84,5 @@ dependencies {
     implementation "com.mikepenz:fastadapter:$fastadapter"
     implementation "com.mikepenz:fastadapter-commons:$fastadapter"
     implementation "com.mikepenz:fastadapter-extensions:$fastadapter"
-    implementation "org.conscrypt:conscrypt-android:2.2.1"
+    //implementation "org.conscrypt:conscrypt-android:2.2.1"
 }

app/src/main/AndroidManifest.xml

@@ -74,7 +74,7 @@
         <activity android:name=".activities.OpenRepoInBrowserActivity" />
         <activity android:name=".activities.FileDiffActivity" />
         <activity android:name=".activities.CommitsActivity" />
-        <activity android:name=".helpers.MemorizingActivity" android:theme="@android:style/Theme.Material.NoActionBar.TranslucentDecor" />
+        <activity android:name=".helpers.ssl.MemorizingActivity" android:theme="@android:style/Theme.Material.Dialog" />
     </application>
 
 </manifest>

app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java

@@ -50,7 +50,6 @@ import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
-import com.squareup.picasso.Picasso;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
 import org.mian.gitnex.adapters.IssueCommentsAdapter;

app/src/main/java/org/mian/gitnex/activities/MainActivity.java

@@ -22,7 +22,6 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.squareup.picasso.NetworkPolicy;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;

app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java

@@ -11,7 +11,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;

app/src/main/java/org/mian/gitnex/adapters/ClosedIssuesAdapter.java

@@ -13,7 +13,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
 import org.mian.gitnex.clients.PicassoService;

app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java

@@ -8,7 +8,6 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.models.Collaborators;

app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java

@@ -14,7 +14,6 @@ import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;

app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java

@@ -12,7 +12,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.ReplyToIssueActivity;

app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java

@@ -13,7 +13,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
 import org.mian.gitnex.clients.PicassoService;

app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java

@@ -10,7 +10,6 @@ import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;

app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java

@@ -13,7 +13,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;

app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java

@@ -12,7 +12,6 @@ import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OrganizationDetailActivity;
 import org.mian.gitnex.clients.PicassoService;

app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java

@@ -6,7 +6,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;

app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java

@@ -6,7 +6,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;

app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java

@@ -14,7 +14,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.IssueDetailActivity;
 import org.mian.gitnex.clients.PicassoService;

app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java

@@ -9,7 +9,6 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;

app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java

@@ -9,7 +9,6 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;

app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java

@@ -16,7 +16,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;

app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java

@@ -13,7 +13,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;

app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java

@@ -13,7 +13,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.OpenRepoInBrowserActivity;
 import org.mian.gitnex.activities.RepoDetailActivity;

app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java

@@ -9,7 +9,6 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.helpers.RoundedTransformation;

app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java

@@ -9,7 +9,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.actions.CollaboratorActions;
 import org.mian.gitnex.clients.PicassoService;

app/src/main/java/org/mian/gitnex/clients/IssuesService.java

@@ -3,7 +3,7 @@ package org.mian.gitnex.clients;
 import android.content.Context;
 import android.util.Log;
 import androidx.annotation.NonNull;
-import org.mian.gitnex.helpers.MemorizingTrustManager;
+import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
 import org.mian.gitnex.util.AppUtil;
 import java.io.File;
 import java.io.IOException;
@@ -36,7 +36,8 @@ public class IssuesService {
 		HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
 		logging.setLevel(HttpLoggingInterceptor.Level.BODY);
 
-		try { // try-catch can be problematic here
+		try {
+
 			SSLContext sslContext = SSLContext.getInstance("TLS");
 
 			MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(ctx);
@@ -44,6 +45,7 @@ public class IssuesService {
 
 			OkHttpClient okHttpClient = new OkHttpClient.Builder()
 					.cache(cache)
+					//.addInterceptor(logging)
 					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
 					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()))
 					.addInterceptor(new Interceptor() {
@@ -63,10 +65,14 @@ public class IssuesService {
 				}
 			}).build();
 
-			Retrofit.Builder builder = new Retrofit.Builder().baseUrl(instanceURL).client(okHttpClient).addConverterFactory(GsonConverterFactory.create());
+			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());

app/src/main/java/org/mian/gitnex/clients/PicassoService.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.util.Log;
 import com.squareup.picasso.OkHttp3Downloader;
 import com.squareup.picasso.Picasso;
-import org.mian.gitnex.helpers.MemorizingTrustManager;
+import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
 import java.security.SecureRandom;
 import java.util.Objects;
 import javax.net.ssl.HttpsURLConnection;
@@ -41,14 +41,17 @@ public class PicassoService {
 
 				Log.e("PicassoService", Objects.requireNonNull(uri.toString())); // important!!
 				Log.e("PicassoService", exception.toString());
+
 			});
 
 			picasso = builder.build();
+
 		}
 		catch(Exception e) {
 
-			e.printStackTrace();
+			Log.e("PicassoService", e.toString());
 		}
+
 	}
 
 	public Picasso get() {

app/src/main/java/org/mian/gitnex/clients/PullRequestsService.java

@@ -3,7 +3,7 @@ package org.mian.gitnex.clients;
 import android.content.Context;
 import android.util.Log;
 import androidx.annotation.NonNull;
-import org.mian.gitnex.helpers.MemorizingTrustManager;
+import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
 import org.mian.gitnex.util.AppUtil;
 import java.io.File;
 import java.io.IOException;
@@ -36,7 +36,8 @@ public class PullRequestsService {
 		HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
 		logging.setLevel(HttpLoggingInterceptor.Level.BODY);
 
-		try { // try-catch can be problematic here
+		try {
+
 			SSLContext sslContext = SSLContext.getInstance("TLS");
 
 			MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(ctx);
@@ -44,6 +45,7 @@ public class PullRequestsService {
 
 			OkHttpClient okHttpClient = new OkHttpClient.Builder()
 					.cache(cache)
+					//.addInterceptor(logging)
 					.sslSocketFactory(sslContext.getSocketFactory(), memorizingTrustManager)
 					.hostnameVerifier(memorizingTrustManager.wrapHostnameVerifier(HttpsURLConnection.getDefaultHostnameVerifier()))
 					.addInterceptor(new Interceptor() {
@@ -63,7 +65,10 @@ public class PullRequestsService {
 				}
 			}).build();
 
-			Retrofit.Builder builder = new Retrofit.Builder().baseUrl(instanceURL).client(okHttpClient).addConverterFactory(GsonConverterFactory.create());
+			Retrofit.Builder builder = new Retrofit.Builder()
+					.baseUrl(instanceURL)
+					.client(okHttpClient)
+					.addConverterFactory(GsonConverterFactory.create());
 
 			Retrofit retrofit = builder.build();
 			return retrofit.create(serviceClass);

app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java

@@ -3,7 +3,7 @@ package org.mian.gitnex.clients;
 import android.content.Context;
 import android.util.Log;
 import org.mian.gitnex.interfaces.ApiInterface;
-import org.mian.gitnex.helpers.MemorizingTrustManager;
+import org.mian.gitnex.helpers.ssl.MemorizingTrustManager;
 import org.mian.gitnex.util.AppUtil;
 import java.io.File;
 import java.security.SecureRandom;
@@ -36,7 +36,8 @@ public class RetrofitClient {
 		HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
 		logging.setLevel(HttpLoggingInterceptor.Level.BODY);
 
-		try { // try-catch can be problematic here
+		try {
+
 			SSLContext sslContext = SSLContext.getInstance("TLS");
 
 			MemorizingTrustManager memorizingTrustManager = new MemorizingTrustManager(ctx);
@@ -59,7 +60,11 @@ public class RetrofitClient {
 						return chain.proceed(request);
 					});
 
-			Retrofit.Builder builder = new Retrofit.Builder().baseUrl(instanceUrl).client(okHttpClient.build()).addConverterFactory(ScalarsConverterFactory.create()).addConverterFactory(GsonConverterFactory.create());
+			Retrofit.Builder builder = new Retrofit.Builder()
+					.baseUrl(instanceUrl)
+					.client(okHttpClient.build())
+					.addConverterFactory(ScalarsConverterFactory.create())
+					.addConverterFactory(GsonConverterFactory.create());
 
 			retrofit = builder.build();
 
@@ -67,15 +72,14 @@ public class RetrofitClient {
 		catch(Exception e) {
 			Log.e("onFailure", e.toString());
 		}
+
 	}
 
 	public static synchronized RetrofitClient getInstance(String instanceUrl, Context ctx) {
-
 		return new RetrofitClient(instanceUrl, ctx);
 	}
 
 	public ApiInterface getApiInterface() {
-
 		return retrofit.create(ApiInterface.class);
 	}
 

app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java

@@ -14,7 +14,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.PicassoService;
 import org.mian.gitnex.clients.RetrofitClient;

app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java

@@ -18,7 +18,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.google.android.material.tabs.TabLayout;
-import com.squareup.picasso.Picasso;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.MainActivity;
 import org.mian.gitnex.clients.PicassoService;

app/src/main/java/org/mian/gitnex/helpers/ssl/MTMDecision.java

@@ -1,14 +1,16 @@
-package org.mian.gitnex.helpers;
+package org.mian.gitnex.helpers.ssl;
 
 /**
  * Author Georg Lukas, modified by anonTree1417
  */
 
 class MTMDecision {
+
 	final static int DECISION_INVALID	= 0;
 	final static int DECISION_ABORT		= 1;
 	final static int DECISION_ONCE		= 2;
 	final static int DECISION_ALWAYS 	= 3;
 
 	int state = DECISION_INVALID;
+
 }

app/src/main/java/org/mian/gitnex/helpers/ssl/MemorizingActivity.java

@@ -1,4 +1,4 @@
-package org.mian.gitnex.helpers;
+package org.mian.gitnex.helpers.ssl;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -32,12 +32,14 @@ public class MemorizingActivity extends Activity {
 		builder.setOnCancelListener(dialog -> onSendResult(decisionId, MTMDecision.DECISION_ABORT));
 
 		builder.create().show();
+
 	}
 
 	private void onSendResult(int decisionId, int decision) {
 
 		MemorizingTrustManager.interactResult(decisionId, decision);
 		finish();
+
 	}
 
 }

app/src/main/java/org/mian/gitnex/helpers/ssl/MemorizingTrustManager.java

@@ -1,19 +1,14 @@
-package org.mian.gitnex.helpers;
+package org.mian.gitnex.helpers.ssl;
 
-import android.annotation.TargetApi;
-import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.net.Uri;
+import android.os.Handler;
 import android.util.Base64;
 import android.util.SparseArray;
-import android.os.Build;
-import android.os.Handler;
-
 import androidx.core.app.NotificationCompat;
 import org.mian.gitnex.R;
 import java.io.ByteArrayInputStream;
@@ -21,20 +16,22 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.security.cert.*;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
+import java.security.cert.CertPathValidatorException;
-import java.util.logging.Level;
+import java.security.cert.Certificate;
-import java.util.logging.Logger;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateParsingException;
+import java.security.cert.X509Certificate;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
-
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;

app/src/main/res/values-de/strings.xml

@@ -63,7 +63,6 @@
     <string name="logo">In Gitea anmelden</string>
     <string name="urlInfoTooltip">1- Wähle das richtige Protokoll (https oder http) \ N2- Gebe die Gitea-URL ein, z.B. try.gitea.io \n3- Falls du 2FA aktiviert hast, gib den Code in das OTP-Code Feld ein. \n4- Für HTTP basic auth nutze BENUTZERNAME@DOMAIN.COM im URL Feld</string>
     <string name="loginFailed">Falscher Benutzername/Passwort </string>
-    <string name="malformedUrl">Verbindung zum Host fehlgeschlagen. Bitte prüfen Sie Ihre URL und den Port auf etwaige Fehler.</string>
     <string name="protocolError">Es wird nicht empfohlen, das HTTP-Protokoll zu verwenden, es sei denn, du testest in einem lokalen Netzwerk.</string>
     <string name="malformedJson">Fehlerhaftes JSON erhalten. Serveranfrage war nicht erfolgreich.</string>
     <string name="emptyFieldURL">Instanzen-URL ist erforderlich</string>

app/src/main/res/values/strings.xml

@@ -92,7 +92,7 @@
     <string name="urlInfoTooltip">1- Choose the correct protocol(https or http). \n2- Enter Gitea url e.g: try.gitea.io. \n3- If you have enabled 2FA for your account, enter the code in the OTP Code field. \n4- For HTTP basic auth use USERNAME@DOMAIN.COM in the URL field.</string>
     <string name="loginFailed">Wrong username/password</string>
     <string name="protocolDelimiter" translatable="false">://</string>
-    <string name="malformedUrl">Could\'nt connect to host. Please check your URL or port for any errors.</string>
+    <string name="malformedUrl">Couldn\'t connect to host. Please check your URL or port for any errors.</string>
     <string name="protocolError">It is not recommended to use HTTP protocol unless you are testing on local network.</string>
     <string name="malformedJson">Malformed JSON was received. Server response was not successful.</string>
     <string name="emptyFieldURL">Instance URL is required</string>
@@ -580,7 +580,7 @@
     <string name="mtm_hostname_mismatch">Server could not authenticate as \&quot;%s\&quot;. The certificate is only valid for:</string>
     <string name="mtm_connect_anyway">Do you want to connect anyway?</string>
     <string name="mtm_cert_details">Certificate details:</string>
-    <string name="mtm_decision_always">Always</string>
+    <string name="mtm_decision_always">Trust</string>
     <string name="mtm_decision_once">Once</string>
     <string name="mtm_decision_abort">Abort</string>