support no-ssl mode for car's multimedia systems

ShlomoCode · ShlomoCode · commit a4044b0a1b38 · 2024-01-16T01:47:45.000+02:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -37,7 +37,10 @@ on:
                 description: 'Icon URL'
             startup_url:
                 description: 'Start URL'
-
+            no_ssl:
+                description: 'No SSL - Not recommended!!'
+                type: boolean
+                default: false
 jobs:
     id:
       # https://stackoverflow.com/a/73837663
@@ -131,6 +134,7 @@ jobs:
                   ALLOWED_DOMAINS: ${{ env.ALLOWED_DOMAINS }}
                   BLOCK_MEDIA: ${{ inputs.block_media }}
                   BLOCK_ADS: ${{ inputs.block_ads }}
+                  NO_SSL: ${{ inputs.no_ssl }}
             - name: Rename APK
               run: mv app/build/outputs/apk/release/app-release.apk app/build/outputs/apk/release/webview-${{ env.PRIMARY_DOMAIN }}.apk
             - name: Create Release
@@ -148,6 +152,7 @@ jobs:
                       Restricted WebView App.
                       Domain: [${{ env.PRIMARY_DOMAIN }}](//${{ env.PRIMARY_DOMAIN }})
                       Second Domain: [${{ env.SECOND_DOMAIN }}](//${{ env.SECOND_DOMAIN }})
+                      No Secured: ${{ inputs.no_ssl }}
                       App Name: ${{ inputs.app_name }}
                       View Mode: ${{ inputs.view_mode }}
                       Block Media: ${{ inputs.block_media }}
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,6 +21,7 @@ android {
         buildConfigField "String", "VIEW_MODE", "\"${System.getenv('VIEW_MODE') ?: 'AUTO'}\""
         buildConfigField "boolean", "BLOCK_MEDIA", "${System.getenv('BLOCK_MEDIA') ?: 'false'}"
         buildConfigField "boolean", "BLOCK_ADS", "${System.getenv('BLOCK_ADS') ?: 'true'}"
+        buildConfigField "boolean", "NO_SSL", "${System.getenv('NO_SSL') ?: 'false'}"
         resValue "string", "app_name", System.getenv('APP_NAME') ?: "My Application"
         applicationId System.getenv('APPLICATION_ID') ?: "com.webview.myapplication"
         
diff --git a/app/src/main/java/com/webview/myapplication/MainActivity.java b/app/src/main/java/com/webview/myapplication/MainActivity.java
@@ -108,9 +108,10 @@ public class MainActivity extends Activity {
     private final int STORAGE_PERMISSION_CODE = 1;
     private static final String[] ALLOWED_DOMAINS = BuildConfig.ALLOWED_DOMAINS.split(",");
     private static final String STARTUP_URL = BuildConfig.STARTUP_URL;
+    private static final String VIEW_MODE = BuildConfig.VIEW_MODE;
     private static final boolean BLOCK_MEDIA = BuildConfig.BLOCK_MEDIA;
     private static final boolean BLOCK_ADS = BuildConfig.BLOCK_ADS;
-    private static final String VIEW_MODE = BuildConfig.VIEW_MODE;
+    private static final boolean NO_SSL = BuildConfig.NO_SSL;
     private WebView mWebView;
     private View mCustomView;
     private CustomViewCallback mCustomViewCallback;
@@ -332,12 +333,17 @@ public void onPageFinished(WebView view, String url) {
 
         @Override
         public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
-            handler.cancel();
-            view.loadData("<html><body><h1 style='color: grey'>SSL Error</h1></body></html>", "text/html; charset=utf-8", "UTF-8");
-            if (Objects.equals(error.getCertificate().getIssuedBy().getOName(), "NetFree")) {
-                Toast.makeText(view.getContext(), "טיפ: נראה שלא מותקנת תעודת אבטחה של נטפרי", Toast.LENGTH_LONG).show();
-            } else if (Objects.equals(error.getCertificate().getIssuedBy().getOName(), "Netspark")) {
-                Toast.makeText(view.getContext(), "טיפ: נראה שלא מותקנת תעודת אבטחה של אתרוג/רימון", Toast.LENGTH_LONG).show();
+            String issuerName = error.getCertificate().getIssuedBy().getOName();
+            if (NO_SSL && (Objects.equals(issuerName, "NetFree") || Objects.equals(issuerName, "Netspark"))) {
+                handler.proceed();
+            } else {
+                handler.cancel();
+                view.loadData("<html><body><h1 style='color: grey'>SSL Error</h1></body></html>", "text/html; charset=utf-8", "UTF-8");
+                if (Objects.equals(issuerName, "NetFree")) {
+                    Toast.makeText(view.getContext(), "טיפ: נראה שלא מותקנת תעודת אבטחה של נטפרי", Toast.LENGTH_LONG).show();
+                } else if (Objects.equals(issuerName, "Netspark")) {
+                    Toast.makeText(view.getContext(), "טיפ: נראה שלא מותקנת תעודת אבטחה של אתרוג/רימון", Toast.LENGTH_LONG).show();
+                }
             }
         }
     }
