diff --git a/.idea/deviceManager.xml b/.idea/deviceManager.xml
new file mode 100644
index 0000000..91f9558
--- /dev/null
+++ b/.idea/deviceManager.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 9b42e93..64dea87 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,8 +20,8 @@ android {
applicationId "ch.pizzalemon.android"
minSdkVersion 21
targetSdkVersion 35
- versionCode 29// play store'daki version --> canlı: 0 - dahili test: 17
- versionName "2.09" // play store'daki version --> canlı: 0.00 - dahili test: 1.17
+ versionCode 30// play store'daki version --> canlı: 0 - dahili test: 17
+ versionName "2.10" // play store'daki version --> canlı: 0.00 - dahili test: 1.17
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
multiDexEnabled true
}
diff --git a/app/src/main/java/ch/pizzalemon/android/App.java b/app/src/main/java/ch/pizzalemon/android/App.java
index 502cef2..234846e 100644
--- a/app/src/main/java/ch/pizzalemon/android/App.java
+++ b/app/src/main/java/ch/pizzalemon/android/App.java
@@ -8,6 +8,7 @@ import com.squareup.picasso.Picasso;
import java.security.SecureRandom;
import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import ch.pizzalemon.android.api.ApiConstants;
@@ -73,12 +74,11 @@ public class App extends MultiDexApplication {
private void addSSLTrustToOkHttp(OkHttpClient.Builder okHttpClientBuilder) {
try {
- TrustManager[] trustAllCerts = new TrustManager[]{new SSLTrustManager()};
- SSLContext sslContext = SSLContext.getInstance("SSL");
- sslContext.init(null, trustAllCerts, new SecureRandom());
- HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
- logging.setLevel(HttpLoggingInterceptor.Level.BODY);
- okHttpClientBuilder.sslSocketFactory(sslContext.getSocketFactory());
+ SSLTrustManager trustManager = new SSLTrustManager();
+ SSLContext sslContext = SSLContext.getInstance("TLS");
+ sslContext.init(null, new TrustManager[]{ trustManager }, new SecureRandom());
+ SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
+ okHttpClientBuilder.sslSocketFactory(sslSocketFactory, trustManager);
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/app/src/main/java/ch/pizzalemon/android/api/ApiService.java b/app/src/main/java/ch/pizzalemon/android/api/ApiService.java
index 3a88026..e33dfef 100644
--- a/app/src/main/java/ch/pizzalemon/android/api/ApiService.java
+++ b/app/src/main/java/ch/pizzalemon/android/api/ApiService.java
@@ -8,6 +8,7 @@ import java.security.SecureRandom;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
import ch.pizzalemon.android.BuildConfig;
@@ -98,12 +99,11 @@ public class ApiService {
private void addSSLTrustToOkHttp(OkHttpClient.Builder okHttpClientBuilder) {
try {
- TrustManager[] trustAllCerts = new TrustManager[]{new SSLTrustManager()};
- SSLContext sslContext = SSLContext.getInstance("SSL");
- sslContext.init(null, trustAllCerts, new SecureRandom());
- HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
- logging.setLevel(HttpLoggingInterceptor.Level.BODY);
- okHttpClientBuilder.sslSocketFactory(sslContext.getSocketFactory());
+ SSLTrustManager trustManager = new SSLTrustManager();
+ SSLContext sslContext = SSLContext.getInstance("TLS");
+ sslContext.init(null, new TrustManager[]{ trustManager }, new SecureRandom());
+ SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
+ okHttpClientBuilder.sslSocketFactory(sslSocketFactory, trustManager);
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ec7e27a..9f313d3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -118,7 +118,7 @@