diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6de240b1..d54d9876 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -73,7 +73,7 @@ - + \ No newline at end of file diff --git a/app/src/main/java/org/mian/gitnex/clients/IssuesService.java b/app/src/main/java/org/mian/gitnex/clients/IssuesService.java index e1600578..28d26ac7 100644 --- a/app/src/main/java/org/mian/gitnex/clients/IssuesService.java +++ b/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.ssl.MemorizingTrustManager; +import org.mian.gitnex.helpers.MemorizingTrustManager; import org.mian.gitnex.util.AppUtil; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/org/mian/gitnex/clients/PullRequestsService.java b/app/src/main/java/org/mian/gitnex/clients/PullRequestsService.java index e5e6a29c..50731225 100644 --- a/app/src/main/java/org/mian/gitnex/clients/PullRequestsService.java +++ b/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.ssl.MemorizingTrustManager; +import org.mian.gitnex.helpers.MemorizingTrustManager; import org.mian.gitnex.util.AppUtil; import java.io.File; import java.io.IOException; 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 a9a0102d..a2794ec7 100644 --- a/app/src/main/java/org/mian/gitnex/clients/RetrofitClient.java +++ b/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.ssl.MemorizingTrustManager; +import org.mian.gitnex.helpers.MemorizingTrustManager; import org.mian.gitnex.util.AppUtil; import java.io.File; import java.security.SecureRandom; diff --git a/app/src/main/java/org/mian/gitnex/helpers/MTMDecision.java b/app/src/main/java/org/mian/gitnex/helpers/MTMDecision.java new file mode 100644 index 00000000..86280426 --- /dev/null +++ b/app/src/main/java/org/mian/gitnex/helpers/MTMDecision.java @@ -0,0 +1,14 @@ +package org.mian.gitnex.helpers; + +/** + * 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; +} diff --git a/app/src/main/java/org/mian/gitnex/ssl/MemorizingActivity.java b/app/src/main/java/org/mian/gitnex/helpers/MemorizingActivity.java similarity index 97% rename from app/src/main/java/org/mian/gitnex/ssl/MemorizingActivity.java rename to app/src/main/java/org/mian/gitnex/helpers/MemorizingActivity.java index 68397e84..1de5c9fa 100644 --- a/app/src/main/java/org/mian/gitnex/ssl/MemorizingActivity.java +++ b/app/src/main/java/org/mian/gitnex/helpers/MemorizingActivity.java @@ -1,4 +1,4 @@ -package org.mian.gitnex.ssl; +package org.mian.gitnex.helpers; import android.app.Activity; import android.app.AlertDialog; @@ -9,6 +9,7 @@ import org.mian.gitnex.R; /** * Author Georg Lukas, modified by anonTree1417 */ + public class MemorizingActivity extends Activity { @Override diff --git a/app/src/main/java/org/mian/gitnex/ssl/MemorizingTrustManager.java b/app/src/main/java/org/mian/gitnex/helpers/MemorizingTrustManager.java similarity index 99% rename from app/src/main/java/org/mian/gitnex/ssl/MemorizingTrustManager.java rename to app/src/main/java/org/mian/gitnex/helpers/MemorizingTrustManager.java index fc275ef9..033cd9b7 100644 --- a/app/src/main/java/org/mian/gitnex/ssl/MemorizingTrustManager.java +++ b/app/src/main/java/org/mian/gitnex/helpers/MemorizingTrustManager.java @@ -1,4 +1,4 @@ -package org.mian.gitnex.ssl; +package org.mian.gitnex.helpers; import android.annotation.TargetApi; import android.app.Activity; diff --git a/app/src/main/java/org/mian/gitnex/ssl/MTMDecision.java b/app/src/main/java/org/mian/gitnex/ssl/MTMDecision.java deleted file mode 100644 index cb141175..00000000 --- a/app/src/main/java/org/mian/gitnex/ssl/MTMDecision.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.mian.gitnex.ssl; - -/** - * Author Georg Lukas, modified by anonTree1417 - */ -class MTMDecision { - public final static int DECISION_INVALID = 0; - public final static int DECISION_ABORT = 1; - public final static int DECISION_ONCE = 2; - public final static int DECISION_ALWAYS = 3; - - int state = DECISION_INVALID; -}