diff --git a/app/build.gradle b/app/build.gradle index 81b6091..05e7f5e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ android { applicationId "in.sminnovations.hpostesting.server" minSdk 21 targetSdk 34 - versionCode 128 - versionName "2.1.128" + versionCode 130 + versionName "2.1.130" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/google-services.json b/app/google-services.json index d90e8e5..42bf71f 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -5,204 +5,6 @@ "storage_bucket": "hpos-af3cc.appspot.com" }, "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:650071678820:android:f1435a1c07f710036c6471", - "android_client_info": { - "package_name": "com.example.hposconsentform" - } - }, - "oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:650071678820:android:7865bef608cdee6f6c6471", - "android_client_info": { - "package_name": "com.smi.counselling" - } - }, - "oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:650071678820:android:2925e9ce3417d2386c6471", - "android_client_info": { - "package_name": "in.sminnovations.hemocube" - } - }, - "oauth_client": [ - { - "client_id": "650071678820-srhm9spm9hjn4frcd3r6o02gdhdbtd15.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "in.sminnovations.hemocube", - "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a" - } - }, - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:650071678820:android:7569c1cad4fc99916c6471", - "android_client_info": { - "package_name": "in.sminnovations.hposregistration" - } - }, - "oauth_client": [ - { - "client_id": "650071678820-70kp5jvjda4r5diqch2kn4lc40p4f42g.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "in.sminnovations.hposregistration", - "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a" - } - }, - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:650071678820:android:f96be19e5d43102b6c6471", - "android_client_info": { - "package_name": "in.sminnovations.hpostesting" - } - }, - "oauth_client": [ - { - "client_id": "650071678820-l87dnr0bdj95get0khgnvfv2an1k6ogq.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "in.sminnovations.hpostesting", - "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a" - } - }, - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:650071678820:android:a53292637abb7c0d6c6471", - "android_client_info": { - "package_name": "in.sminnovations.hpostesting.dev" - } - }, - "oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - }, { "client_info": { "mobilesdk_app_id": "1:650071678820:android:f6fd45e2f6a63aef6c6471", diff --git a/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt b/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt index 74af2d8..a8ae59f 100644 --- a/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt +++ b/app/src/main/java/com/example/hpostesting/data/repository/DatabaseRepository.kt @@ -70,19 +70,19 @@ class DatabaseRepository @Inject constructor( - // Example function to add data to Firestore - @RequiresApi(Build.VERSION_CODES.O) - fun addtodb(data: String) { - val date = LocalTime.now() - localdb.collection("BasicData") - .add(mapOf("data $date" to data)) - .addOnSuccessListener { - Log.d("UPLOAD", "Data uploaded successfully ${localdb.app.name}") - } - .addOnFailureListener { exception -> - Log.d("UPLOAD", "Failed to upload data: ${exception.message} ${localdb.app.name}") - } - } +// // Example function to add data to Firestore , like the basic data as test data +// @RequiresApi(Build.VERSION_CODES.O) +// fun addtodb(data: String) { +// val date = LocalTime.now() +// localdb.collection("BasicData") +// .add(mapOf("data $date" to data)) +// .addOnSuccessListener { +// Log.d("UPLOAD", "Data uploaded successfully ${localdb.app.name}") +// } +// .addOnFailureListener { exception -> +// Log.d("UPLOAD", "Failed to upload data: ${exception.message} ${localdb.app.name}") +// } +// } private suspend fun safeApiCall(apiCall: suspend () -> T): Result { return try { val response = apiCall.invoke() diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt index 406f0a4..0ed1103 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt @@ -86,6 +86,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector { super.attachBaseContext(newBase) } + override fun onMessageReceived(topic: String, message: String) { // Handle incoming messages from NATS @@ -102,12 +103,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector { setSupportActionBar(binding.appBarDashboard.toolbar) nats = NatsManager(this) - - // Load the last selected server or default to Server 1 - val lastSelectedServer = firebaseManager.getLastSelectedServer() - - // Switch to the last selected server - + val currentServer = firebaseManager.getLastSelectedServer().serverName if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { nats.connect() @@ -117,7 +113,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector { Log.d("DashboardActivity", "Saved Kit Serial: $savedKitSerial") // Toast.makeText(this, "Saved Kit Serial: $savedKitSerial", Toast.LENGTH_SHORT).show() - val versionName = getAppVersion(this@DashboardActivity) + " [ " + getAppEnvironment(this@DashboardActivity) + " ]" + val versionName = getAppVersion(this@DashboardActivity) + " [ " + getAppEnvironment(this@DashboardActivity) +"->"+currentServer+"]" binding.appBarDashboard.versionName.text = versionName @@ -259,10 +255,10 @@ class DashboardActivity : AppCompatActivity(), IDataCollector { - fun sendData(data:String){ - databaseRepository.addtodb(data) - Toast.makeText(this, "data uploaded", Toast.LENGTH_SHORT).show() - } +// fun sendData(data:String){ this was used to send the basic data for server validation +// databaseRepository.addtodb(data) +// Toast.makeText(this, "data uploaded", Toast.LENGTH_SHORT).show() +// } override fun onCreateOptionsMenu(menu: Menu): Boolean { @@ -390,6 +386,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector { return try { val pInfo = context.packageManager.getPackageInfo(context.packageName, 0) pInfo.versionName + } catch (e: PackageManager.NameNotFoundException) { "N/A" } diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt index 01c9cd7..6c5eebe 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/SlideshowFragment.kt @@ -182,9 +182,9 @@ class PrefsFragment : PreferenceFragmentCompat(){ icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_cloud_done_24) setOnPreferenceClickListener { - (activity as? DashboardActivity)?.sendData("hello test data") - Toast.makeText(context, "data sent", Toast.LENGTH_SHORT).show() - true +// (activity as? DashboardActivity)?.sendData("hello test data") +// Toast.makeText(context, "data sent", Toast.LENGTH_SHORT).show() this was used to send the basic data as test data + true } } preferenceScreen.addPreference(currentServerPreference)