release 1.1.0.10

zscaler · Dec 18, 2024 · 9290c03 · 9290c03
1 parent 4aff43a
commit 9290c03
Show file tree

Hide file tree

Showing 38 changed files with 598 additions and 407 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Zscaler Development Kit (Zscaler SDK), part of the Zscaler Zero Trust Exchange
 
 
 ## Integration
-1. Make sure gpr.user and gpr.key are set to your github username and access token in local.properties.
+1. Make sure gpr.user and gpr.key are set to your github username and access token in global gradle.properties file at ~/.gradle/gradle.properties
 2. Add the Github repository to the dependencyResolutionManagement repositories in settings.gradle.
 ```
 dependencyResolutionManagement {
@@ -15,8 +15,8 @@ dependencyResolutionManagement {
             name = "ZscalerSDKAndroid"
             url = uri("https://maven.pkg.github.com/zscaler/zscaler-sdk-android")
             credentials {
-                username = settings.extra.get("gpr.user") as String? ?: System.getenv("GITHUB_USERNAME")
-                password = settings.extra.get("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
+                username = settings.extra.get("gpr.user") as String ?: System.getenv("GITHUB_USERNAME")
+                password = settings.extra.get("gpr.key") as String ?: System.getenv("GITHUB_TOKEN")
             }
         }
     }
@@ -29,4 +29,6 @@ dependencies {
     implementation("com.zscaler.sdk:zscalersdk-android:latest.release")
 }
 ```
+## Git Hub Access Token
 
+Check the below link for generating the access token [[here](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry#authenticating-to-github-packages)]
diff --git a/sample-app/app/build.gradle.kts b/sample-app/app/build.gradle.kts
@@ -8,9 +8,9 @@ plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("maven-publish")
-    id("com.github.triplet.play") version "3.9.1"
-    id("com.google.gms.google-services")
-    id("com.google.firebase.crashlytics")
+    id("com.google.gms.google-services") version "4.4.2"
+    id("com.google.firebase.crashlytics") version "3.0.2"
+    id("com.github.triplet.play") version "3.9.1" // for publishing test app bundle to play
 }
 
 var versionNameVal = "x.x-dev"
@@ -31,19 +31,23 @@ if (project.hasProperty("buildVersionName")) {
 
 android {
     namespace = "com.zscaler.sdk.demoapp"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.zscaler.sdk.android.testapp"
-        minSdk = 26
-        targetSdk = 34
+        minSdk = 28
+        targetSdk = 35
         versionCode = versionCodeVal
         versionName = versionNameVal
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary = true
         }
+        ndk {
+            //noinspection ChromeOsAbiSupport
+            abiFilters += mutableSetOf<String>("armeabi-v7a" , "arm64-v8a") // Exclude x86 and x86_64
+        }
     }
 
     signingConfigs {
@@ -89,11 +93,6 @@ android {
         viewBinding = true
         buildConfig = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.1"
-    }
-    ndkVersion = "25.2.9519653"
-    buildToolsVersion = "34.0.0"
 
     publishing {
         singleVariant("release") {
@@ -111,6 +110,9 @@ android {
             resolutionStrategy.set(ResolutionStrategy.AUTO)
         }
     }
+
+    ndkVersion = "27.2.12479018"
+    buildToolsVersion = "35.0.0"
 }
 
 afterEvaluate {
@@ -137,45 +139,36 @@ publishing {
 }
 
 dependencies {
-    implementation("androidx.appcompat:appcompat:1.3.1")
-    implementation("com.google.android.material:material:1.3.0")
-    implementation("androidx.activity:activity:1.2.4")
-    implementation("androidx.constraintlayout:constraintlayout:2.0.4")
-    implementation("androidx.core:core-ktx:1.6.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.3.1")
-    implementation("androidx.lifecycle:lifecycle-process:2.3.1")
-    implementation("com.google.code.gson:gson:2.8.2")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
-    implementation ("androidx.compose.runtime:runtime-livedata:1.1.1")
-
-    // ViewModel
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1")
-    implementation("androidx.compose.runtime:runtime-livedata:1.0.0")
-    // ViewModel utilities for Compose
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0")
-    implementation("androidx.webkit:webkit:1.4.0")
-
-    //retrofit
+    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation("com.google.android.material:material:1.12.0")
+    implementation("androidx.core:core-ktx:1.13.1")
+    implementation ("androidx.compose.runtime:runtime-livedata:1.7.1")
+
+    // Androidx Lifecycle
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.5")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.5")
+    implementation("androidx.lifecycle:lifecycle-process:2.8.5")
+
+    // WebView
+    implementation("androidx.webkit:webkit:1.9.0")
+
+    // retrofit
     implementation ("com.squareup.retrofit2:retrofit:2.11.0")
     implementation("com.squareup.retrofit2:converter-gson:2.11.0")
-    implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
 
     // zdk dependency
     implementation("com.zscaler.sdk:zscalersdk-android:latest.release")
 
-    implementation("androidx.security:security-crypto:1.1.0-alpha06")
-
-    implementation(platform("com.google.firebase:firebase-bom:31.1.0"))
-    implementation("com.google.firebase:firebase-analytics")
+    // Firebase crashlytics
+    implementation(platform("com.google.firebase:firebase-bom:33.3.0"))
     implementation("com.google.firebase:firebase-crashlytics")
     implementation("com.google.firebase:firebase-crashlytics-ktx")
+//    implementation("com.google.firebase:firebase-analytics") // enable it for analytics reporting if required
     implementation("com.google.firebase:firebase-crashlytics-ndk")
 
     // test dependencies
     testImplementation("junit:junit:4.13.2")
-    testImplementation("org.mockito:mockito-core:5.1.0")
-    testImplementation("org.mockito.kotlin:mockito-kotlin:5.1.0")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-
+    androidTestImplementation("androidx.test.ext:junit:1.2.1")
+    androidTestImplementation("androidx.test:runner:1.6.2")
+    androidTestImplementation("com.google.code.gson:gson:2.10.1")
 }
diff --git a/sample-app/app/google-services.json b/sample-app/app/google-services.json
@@ -1,21 +1,21 @@
 {
   "project_info": {
-    "project_number": "",
-    "project_id": "",
-    "storage_bucket": ""
+    "project_number": "126618292848",
+    "project_id": "zscaler-sdk-sample",
+    "storage_bucket": "zscaler-sdk-sample.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "",
+        "mobilesdk_app_id": "1:126618292848:android:9cdd2d6355da2f03339ab5",
         "android_client_info": {
-          "package_name": ""
+          "package_name": "com.zscaler.sdk.android.testapp"
         }
       },
       "oauth_client": [],
       "api_key": [
         {
-          "current_key": ""
+          "current_key": "AIzaSyC2XZ5E5oIwelfQOeNFSfh636tKvETqxXY"
         }
       ],
       "services": {
@@ -25,5 +25,5 @@
       }
     }
   ],
-  "configuration_version": ""
-}
+  "configuration_version": "1"
+}
diff --git a/sample-app/app/src/main/AndroidManifest.xml b/sample-app/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         tools:ignore="ScopedStorage" />
 
     <application
-        android:name=".MainApplication"
+        android:name=".lifecycle.MainApplication"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
@@ -20,18 +20,23 @@
         android:theme="@style/Theme.MyApplication"
         tools:targetApi="31">
         <activity
-            android:name=".SettingActivity"
-            android:theme="@style/Theme.AppCompat.Light"
+            android:name=".configuration.ConfigActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:exported="false" />
+
+        <activity
+            android:name=".view.EventLogViewActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
             android:exported="false" />
 
         <service
-            android:name=".NotificationCancellationService"
+            android:name=".service.NotificationCancellationService"
             android:enabled="true"
             android:exported="false"
             android:foregroundServiceType="specialUse"/>
 
         <activity
-            android:name=".MainActivity"
+            android:name=".view.MainActivity"
             android:exported="true"
             android:launchMode="singleInstance"
             android:theme="@style/Theme.AppCompat.Light"

diff --git a/sample-app/app/src/main/assets/config_dev2.json b/sample-app/app/src/main/assets/config_dev2.json
@@ -0,0 +1,13 @@
+{
+    "urls": {
+        "zpn": "https://rain-zscaler.automation.dev.zpath.net",
+        "direct": "https://app2.us.zsdk.automation.dev.zpath.net/",
+        "blockedApp_1": "https://google.com",
+        "subDomainApp": "https://mail.google.com",
+        "domainWithUrlParams": "https://rain-zscaler.automation.dev.zpath.net?q=chatbot&page=2&sort=price_asc&limit=10",
+        "incorrectUrl": "tps://gle.com",
+        "mediumFileDownload": "",
+        "zpnLargeFileDownload": "https://rain-zscaler.automation.dev.zpath.net/download-1GB.bin",
+        "configuredHttpApp": "http://rain-zscaler.automation.dev.zpath.net"
+    }
+}
diff --git a/sample-app/app/src/main/assets/config_prod.json b/sample-app/app/src/main/assets/config_prod.json
@@ -0,0 +1,14 @@
+{
+    "urls": {
+        "zpn": "",
+        "direct": "",
+        "blockedApp_1": "",
+        "subDomainApp": "",
+        "domainWithUrlParams": "",
+        "incorrectUrl": "",
+        "mediumFileDownload": "",
+        "zpnLargeFileDownload": "",
+        "configuredHttpApp": ""
+    }
+}
+
diff --git a/sample-app/app/src/main/assets/config_qa2.json b/sample-app/app/src/main/assets/config_qa2.json
@@ -0,0 +1,13 @@
+{
+    "urls": {
+        "zpn": "https://app1.us.zsdk.automation.dev.zpath.net/",
+        "direct": "https://app2.us.zsdk.automation.dev.zpath.net/",
+        "blockedApp_1": "https://google.com",
+        "subDomainApp": "https://mail.google.com",
+        "domainWithUrlParams": "https://app1.us.zsdk.automation.dev.zpath.net?q=chatbot&page=2&sort=price_asc&limit=10",
+        "incorrectUrl": "tps://gle.com",
+        "mediumFileDownload": "https://app3.us.zsdk.automation.dev.zpath.net/100MB",
+        "zpnLargeFileDownload": "https://app3.us.zsdk.automation.dev.zpath.net/100MB",
+        "configuredHttpApp": "http://app1.us.zsdk.automation.dev.zpath.net"
+    }
+}
diff --git a/sample-app/app/src/main/assets/empty_secrets.json b/sample-app/app/src/main/assets/empty_secrets.json
@@ -0,0 +1,20 @@
+{
+    "appKeys": {
+        "empty": "",
+        "valid": "",
+        "notJson": "",
+        "badGid": "",
+        "badHmacSecret": "",
+        "invalidTenant": "",
+        "dnsFailAppKey": ""
+    },
+    "accessTokens": {
+        "empty": "",
+        "valid": "",
+        "badJson": "",
+        "badSignature": "",
+        "expired": "",
+        "csrFailToken": ""
+    }
+}
+
diff --git a/sample-app/app/src/main/java/com/zscaler/sdk/demoapp/RetrofitApiClient.kt b/sample-app/app/src/main/java/com/zscaler/sdk/demoapp/RetrofitApiClient.kt