Cleanup

CatotheCat11 · Dec 23, 2024 · e36b9a0 · e36b9a0
1 parent 46fafc2
commit e36b9a0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,6 @@
         android:icon="@drawable/app_icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        tools:targetApi="31"
         android:hardwareAccelerated="true">
         <activity
             android:name=".FeedMenu"

diff --git a/app/src/main/java/com/cato/glasssky/HttpsUtils.java b/app/src/main/java/com/cato/glasssky/HttpsUtils.java
@@ -38,25 +38,6 @@ public static void makePostRequest(String url, JSONObject jsonBody, String auth,
             @Override
             protected String doInBackground(Void... voids) {
                 try {
-                    /*
-                    // Create a custom SSL context that enables multiple TLS protocols
-                    TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
-                            TrustManagerFactory.getDefaultAlgorithm());
-                    trustManagerFactory.init((KeyStore) null);
-                    TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
-
-                    // Try to enable TLS protocols manually
-                    SSLContext sslContext = SSLContext.getInstance("TLS", "Conscrypt");
-                    sslContext.init(null, trustManagers, new SecureRandom());
-
-                    OkHttpClient.Builder builder = new OkHttpClient.Builder()
-                            .sslSocketFactory(sslContext.getSocketFactory(), (X509TrustManager) trustManagers[0])
-                            .hostnameVerifier(OkHostnameVerifier.INSTANCE)
-                            .followRedirects(true)
-                            .followSslRedirects(true)
-                            .retryOnConnectionFailure(true);
-
-                    OkHttpClient client = builder.build(); */ //TODO: Test static client!
                     getClient();
 
 

diff --git a/app/src/main/java/com/github/barcodeeye/scan/result/ResultProcessor.java b/app/src/main/java/com/github/barcodeeye/scan/result/ResultProcessor.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -46,8 +47,9 @@ public Uri getPhotoUri() {
 
     public abstract List<CardPresenter> getCardResults();
 
+    @SuppressLint("UnspecifiedImmutableFlag")
     public static PendingIntent createPendingIntent(Context context,
-            Intent intent) {
+                                                    Intent intent) {
         return PendingIntent.getActivity(context, 0, intent, 0);
     }
 }