From 8b7d0d4a7e7ba2d8e8a23d2e682e987b11c75bfe Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 18 Nov 2024 13:06:04 +0300 Subject: [PATCH] KKUH App updates & fixes --- AuthKey_DPNS4PAPTK.p8 | 6 + Certs/AuthKey_DPNS4PAPTK.p8 | 6 + Patient_App_KKUH_KeyStore | Bin 0 -> 2722 bytes android/app/build.gradle | 4 +- android/app/google-services.json | 34 +- android/app/src/debug/AndroidManifest.xml | 2 +- android/app/src/main/AndroidManifest.xml | 4 +- .../cloud/diplomaticquarterapp/Application.kt | 2 +- .../diplomaticquarterapp/MainActivity.kt | 12 +- .../geofence/GeoZoneModel.kt | 116 ++-- .../geofence/HMG_Geofence.kt | 582 +++++++++--------- .../GeofenceBroadcastReceiver.kt | 142 ++--- ...GeofenceBroadcastReceiverWithJobService.kt | 32 +- .../intent_receivers/GeofenceErrorMessages.kt | 86 +-- .../GeofenceTransitionsJobIntentService.kt | 194 +++--- .../GeofencingRebootBroadcastReceiver.kt | 46 +- .../LocationProviderChangeReceiver.kt | 50 +- .../ReregisterGeofenceJobService.kt | 48 +- .../diplomaticquarterapp/hmgwifi/HMG_Guest.kt | 482 +++++++-------- .../hmgwifi/HMG_Internet.kt | 238 +++---- .../cloud/diplomaticquarterapp/hmgwifi/WPA.kt | 210 +++---- .../hmgwifi/WpaEnterprise.kt | 332 +++++----- .../opentok/LocalVideo.kt | 3 +- .../opentok/RemoteVideo.kt | 3 +- .../diplomaticquarterapp/utils/FlutterText.kt | 72 +-- .../diplomaticquarterapp/utils/HMGUtils.kt | 447 +++++++------- .../cloud/diplomaticquarterapp/utils/Logs.kt | 291 ++++----- .../utils/OpenTokPlatformBridge.kt | 90 +-- .../utils/PlatformBridge.kt | 392 ++++++------ android/build.gradle | 4 +- android/google-services.json | 27 +- ios/GoogleService-Info.plist | 20 +- ios/Podfile | 8 +- ios/Runner.xcodeproj/project.pbxproj | 21 +- ios/Runner/GoogleService-Info.plist | 32 +- ios/Runner/Info.plist | 12 +- ios/Runner/Runner.entitlements | 14 - key.properties | 6 +- lib/core/service/client/base_app_client.dart | 16 +- .../radiology/radiology_details_page.dart | 2 +- .../appointment_services/GetDoctorsList.dart | 6 +- .../LabResult/laboratory_result_widget.dart | 2 +- 42 files changed, 2028 insertions(+), 2068 deletions(-) create mode 100644 AuthKey_DPNS4PAPTK.p8 create mode 100644 Certs/AuthKey_DPNS4PAPTK.p8 create mode 100644 Patient_App_KKUH_KeyStore diff --git a/AuthKey_DPNS4PAPTK.p8 b/AuthKey_DPNS4PAPTK.p8 new file mode 100644 index 00000000..53287a1a --- /dev/null +++ b/AuthKey_DPNS4PAPTK.p8 @@ -0,0 +1,6 @@ +-----BEGIN PRIVATE KEY----- +MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQg5RaefOuG8Q/5I7wM +JA/2GKcBp/eV1Tfe6zeWBAk58zOgCgYIKoZIzj0DAQehRANCAAQ8JuxrvWtIvYfy +aIMpvgbvDmzpZVMZ1uRhBSgtkO49AAYX8JFkq7bMMgq90b8GbvWA8nMkLchIATvX +yuSNSQFx +-----END PRIVATE KEY----- \ No newline at end of file diff --git a/Certs/AuthKey_DPNS4PAPTK.p8 b/Certs/AuthKey_DPNS4PAPTK.p8 new file mode 100644 index 00000000..53287a1a --- /dev/null +++ b/Certs/AuthKey_DPNS4PAPTK.p8 @@ -0,0 +1,6 @@ +-----BEGIN PRIVATE KEY----- +MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQg5RaefOuG8Q/5I7wM +JA/2GKcBp/eV1Tfe6zeWBAk58zOgCgYIKoZIzj0DAQehRANCAAQ8JuxrvWtIvYfy +aIMpvgbvDmzpZVMZ1uRhBSgtkO49AAYX8JFkq7bMMgq90b8GbvWA8nMkLchIATvX +yuSNSQFx +-----END PRIVATE KEY----- \ No newline at end of file diff --git a/Patient_App_KKUH_KeyStore b/Patient_App_KKUH_KeyStore new file mode 100644 index 0000000000000000000000000000000000000000..94f63b73e2aadc24280afd5517565dc3081b518f GIT binary patch literal 2722 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 F`5V_@`HBDl literal 0 HcmV?d00001 diff --git a/android/app/build.gradle b/android/app/build.gradle index ffcaaffb..c2d082a2 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -28,7 +28,7 @@ if (keystorePropertiesFile.exists()) { } apply plugin: 'com.android.application' -apply plugin: 'com.huawei.agconnect' +//apply plugin: 'com.huawei.agconnect' apply plugin: 'kotlin-android' apply plugin: 'com.google.gms.google-services' //apply plugin: 'com.google.firebase.crashlytics' @@ -68,7 +68,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.ejada.hmg" + applicationId "sa.edu.kku.kkuMcApp" minSdkVersion 24 targetSdkVersion 34 versionCode flutterVersionCode.toInteger() diff --git a/android/app/google-services.json b/android/app/google-services.json index 5806fa5f..a11b41a2 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -1,44 +1,26 @@ { "project_info": { - "project_number": "815750722565", - "firebase_url": "https://api-project-815750722565.firebaseio.com", - "project_id": "api-project-815750722565", - "storage_bucket": "api-project-815750722565.appspot.com" + "project_number": "218653915217", + "project_id": "kkumc-e0903", + "storage_bucket": "kkumc-e0903.firebasestorage.app" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:815750722565:android:62281cd3e5df4063", + "mobilesdk_app_id": "1:218653915217:android:28ffffcec5fbf67c896070", "android_client_info": { - "package_name": "com.ejada.hmg" + "package_name": "sa.edu.kku.kkuMcApp" } }, - "oauth_client": [ - { - "client_id": "815750722565-3a0gc7neins0eoahdrimrfksk0sqice8.apps.googleusercontent.com", - "client_type": 3 - } - ], + "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyDUfg6AKM1-00WyzpvLImUBC46wFrq9-qw" + "current_key": "AIzaSyCcN2iDIOH8X7yOikH95cZqyMqA9Kgc8P0" } ], "services": { "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "815750722565-3a0gc7neins0eoahdrimrfksk0sqice8.apps.googleusercontent.com", - "client_type": 3 - }, - { - "client_id": "815750722565-0cq9366orvsk5ipivq6lijcj56u03fr7.apps.googleusercontent.com", - "client_type": 2, - "ios_info": { - "bundle_id": "com.void.demo" - } - } - ] + "other_platform_oauth_client": [] } } } diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index 6c937f09..5e4dac39 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="sa.edu.kku.kkuMcApp"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index d38f5811..66a202b8 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="sa.edu.kku.kkuMcApp">