added updated URL

CodingWithTashi · CodingWithTashi · commit 37f9110c3cf6 · 2025-09-28T23:23:36.000-04:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.kharagedition.tibetankeyboard"
         minSdkVersion 23
         targetSdkVersion 36
-        versionCode 35
-        versionName "2.1.5"
+        versionCode 38
+        versionName "2.1.8"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,9 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
 
     <application
         android:name=".TibetanKeyboardApp"
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/MyFirebaseMessagingService.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/MyFirebaseMessagingService.kt
@@ -16,13 +16,53 @@ import com.google.firebase.messaging.RemoteMessage
 
 class MyFirebaseMessagingService : FirebaseMessagingService() {
 
+    companion object {
+        private const val TAG = "FCMService"
+        private const val CHANNEL_ID = "app_update_channel"
+        private const val NOTIFICATION_ID = 1001
+    }
+
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
         super.onMessageReceived(remoteMessage)
 
-        // Check if message contains data payload for update notification
-        remoteMessage.data.isNotEmpty().let {
-            if (remoteMessage.data["type"] == "app_update") {
-                handleUpdateNotification(remoteMessage.data)
+        Log.d(TAG, "Message received from: ${remoteMessage.from}")
+
+        // Handle both notification and data payloads
+        // This ensures the notification works in all app states
+
+        // Check if message contains a notification payload (background/terminated state)
+        remoteMessage.notification?.let {
+            Log.d(TAG, "Notification Title: ${it.title}")
+            Log.d(TAG, "Notification Body: ${it.body}")
+
+            // When app is in background/terminated, system handles notification
+            // but we can still process data payload
+            if (remoteMessage.data.isNotEmpty()) {
+                handleDataPayload(remoteMessage.data)
+            }
+        }
+
+        // Check if message contains a data payload (foreground state)
+        if (remoteMessage.data.isNotEmpty()) {
+            Log.d(TAG, "Data Payload: ${remoteMessage.data}")
+
+            // When app is in foreground, we must manually show notification
+            if (isAppInForeground()) {
+                handleDataPayload(remoteMessage.data)
+            }
+        }
+    }
+
+    private fun handleDataPayload(data: Map<String, String>) {
+        val type = data["type"]
+
+        when (type) {
+            "app_update" -> handleUpdateNotification(data)
+            "general" -> handleGeneralNotification(data)
+            else -> {
+                // Handle unknown notification types
+                Log.w(TAG, "Unknown notification type: $type")
+                handleGeneralNotification(data)
             }
         }
     }
@@ -31,46 +71,57 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
         val title = data["title"] ?: "Update Available"
         val message = data["message"] ?: "A new version of the app is available"
         val version = data["version"] ?: ""
+        val updateUrl = data["update_url"] // Optional custom URL
+
+        showUpdateNotification(title, message, version, updateUrl)
+    }
+
+    private fun handleGeneralNotification(data: Map<String, String>) {
+        val title = data["title"] ?: "Notification"
+        val message = data["message"] ?: ""
 
-        showUpdateNotification(title, message, version)
+        showGeneralNotification(title, message)
     }
 
-    private fun showUpdateNotification(title: String, message: String, version: String) {
+    private fun showUpdateNotification(
+        title: String,
+        message: String,
+        version: String,
+        customUrl: String? = null
+    ) {
         val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        val channelId = "app_update_channel"
 
-        // Create notification channel (for Android O and above)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(
-                channelId,
-                "App Updates",
-                NotificationManager.IMPORTANCE_HIGH
-            ).apply {
-                description = "Notifications for app updates"
-                enableLights(true)
-                lightColor = Color.BLUE
-                enableVibration(true)
-            }
-            notificationManager.createNotificationChannel(channel)
+        createNotificationChannel(notificationManager)
+
+        // Create intent to open Play Store or custom URL
+        val intent = if (customUrl != null) {
+            createCustomUrlIntent(customUrl)
+        } else {
+            createPlayStoreIntent()
         }
 
-        // Create intent to open Play Store
-        val playStoreIntent = createPlayStoreIntent()
         val pendingIntent = PendingIntent.getActivity(
             this,
             0,
-            playStoreIntent,
+            intent,
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
 
-        // Build notification
-        val notification = NotificationCompat.Builder(this, channelId)
-            .setSmallIcon(R.drawable.ic_update) // Add your update icon
+        // Build notification with full details
+        val fullMessage = if (version.isNotEmpty()) {
+            "$message\nVersion: $version"
+        } else {
+            message
+        }
+
+        val notification = NotificationCompat.Builder(this, CHANNEL_ID)
+            .setSmallIcon(R.drawable.ic_update)
             .setContentTitle(title)
             .setContentText(message)
-            .setStyle(NotificationCompat.BigTextStyle().bigText(message))
+            .setStyle(NotificationCompat.BigTextStyle().bigText(fullMessage))
             .setAutoCancel(true)
             .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .setDefaults(NotificationCompat.DEFAULT_ALL)
             .setContentIntent(pendingIntent)
             .addAction(
                 R.drawable.ic_download,
@@ -79,30 +130,118 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
             )
             .build()
 
-        notificationManager.notify(1001, notification)
+        notificationManager.notify(NOTIFICATION_ID, notification)
+    }
+
+    private fun showGeneralNotification(title: String, message: String) {
+        val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+
+        createNotificationChannel(notificationManager)
+
+        // Create intent to open the app
+        val intent = packageManager.getLaunchIntentForPackage(packageName)?.apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+        }
+
+        val pendingIntent = PendingIntent.getActivity(
+            this,
+            0,
+            intent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+
+        val notification = NotificationCompat.Builder(this, CHANNEL_ID)
+            .setSmallIcon(R.drawable.ic_notification)
+            .setContentTitle(title)
+            .setContentText(message)
+            .setStyle(NotificationCompat.BigTextStyle().bigText(message))
+            .setAutoCancel(true)
+            .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .setDefaults(NotificationCompat.DEFAULT_ALL)
+            .setContentIntent(pendingIntent)
+            .build()
+
+        notificationManager.notify(NOTIFICATION_ID + 1, notification)
+    }
+
+    private fun createNotificationChannel(notificationManager: NotificationManager) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel = NotificationChannel(
+                CHANNEL_ID,
+                "App Updates & Notifications",
+                NotificationManager.IMPORTANCE_HIGH
+            ).apply {
+                description = "Notifications for app updates and important messages"
+                enableLights(true)
+                lightColor = Color.BLUE
+                enableVibration(true)
+                setShowBadge(true)
+            }
+            notificationManager.createNotificationChannel(channel)
+        }
     }
 
     private fun createPlayStoreIntent(): Intent {
         val packageName = packageName
 
-        // Try to open Play Store app first
         return try {
-            Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=$packageName"))
+            Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=$packageName")).apply {
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            }
         } catch (e: ActivityNotFoundException) {
-            // Fallback to Play Store website
-            Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=$packageName"))
+            Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=$packageName")).apply {
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            }
+        }
+    }
+
+    private fun createCustomUrlIntent(url: String): Intent {
+        return Intent(Intent.ACTION_VIEW, Uri.parse(url)).apply {
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+    }
+
+    private fun isAppInForeground(): Boolean {
+        val activityManager = getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager
+        val appProcesses = activityManager.runningAppProcesses ?: return false
+
+        return appProcesses.any {
+            it.importance == android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
+                    && it.processName == packageName
         }
     }
 
     override fun onNewToken(token: String) {
         super.onNewToken(token)
+        Log.d(TAG, "New FCM token: $token")
+
         // Send token to your server
         sendTokenToServer(token)
+
+        // Store token locally
+        saveTokenLocally(token)
     }
 
     private fun sendTokenToServer(token: String) {
-        // Implement your server communication here
-        // This is where you'd send the FCM token to your backend
-        Log.d("FCM", "New token: $token")
+        // TODO: Implement your server communication here
+        // Example: Use Retrofit or OkHttp to send token to your backend
+        Log.d(TAG, "Sending token to server: $token")
+
+        // Example implementation:
+        // RetrofitClient.instance.updateFcmToken(token)
+        //     .enqueue(object : Callback<Response> {
+        //         override fun onResponse(call: Call<Response>, response: Response<Response>) {
+        //             Log.d(TAG, "Token sent successfully")
+        //         }
+        //         override fun onFailure(call: Call<Response>, t: Throwable) {
+        //             Log.e(TAG, "Failed to send token", t)
+        //         }
+        //     })
+    }
+
+    private fun saveTokenLocally(token: String) {
+        val sharedPreferences = getSharedPreferences("FCM_PREFS", Context.MODE_PRIVATE)
+        sharedPreferences.edit().putString("FCM_TOKEN", token).apply()
+        Log.d(TAG, "Token saved locally")
     }
 }
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/ChatActivity.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/ChatActivity.kt
@@ -299,7 +299,7 @@ class ChatActivity : AppCompatActivity(), RevenueCatManager.SubscriptionCallback
                 return
             premiumAlertDialog = MaterialAlertDialogBuilder(this)
                 .setTitle("Premium Required")
-                .setMessage("This feature is available only for Premium users.\n\nUpgrade now to unlock all features!\n1.AI Chat\n2.Google Translate\n3.Tibetan Icon\n4.Ad-free Experience\n5.Priority Support")
+                .setMessage("This feature is available only for Premium users.\n\nUpgrade now to unlock all features!\n1.AI Chat\n2.Google Translate\n3.Ad-free Experience\n4.Priority Support")
                 .setIcon(R.drawable.baseline_generating_tokens_24)
                 .setPositiveButton("Upgrade") { dialog, _ ->
 
diff --git a/app/src/main/java/com/kharagedition/tibetankeyboard/ui/HomeActivity.kt b/app/src/main/java/com/kharagedition/tibetankeyboard/ui/HomeActivity.kt
@@ -73,7 +73,7 @@ class HomeActivity : InputMethodActivity() {
     }
 
     private fun subscribeToAllUsersTopic() {
-        FirebaseMessaging.getInstance().subscribeToTopic("all-users")
+        FirebaseMessaging.getInstance().subscribeToTopic("test-users")
             .addOnCompleteListener { task ->
                 var msg = "Subscribed to all-users topic"
                 if (!task.isSuccessful) {
@@ -244,7 +244,7 @@ class HomeActivity : InputMethodActivity() {
             isPremiumUser = isPremium;
             if (authManager.isUserAuthenticated() && isPremium) {
                 homeBinding.nativeAdsLayout.visibility = GONE
-                homeBinding.bottomBtnLayout.visibility = VISIBLE
+                homeBinding.bottomBtnLayout.visibility = GONE // For now
          /*       homeBinding.chatIcon.setColorFilter(getColor(R.color.premium_yellow))
                 homeBinding.shareIcon.setColorFilter(getColor(R.color.premium_yellow))
                 homeBinding.rateIcon.setColorFilter(getColor(R.color.premium_yellow))
diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml
@@ -0,0 +1,13 @@
+<!-- res/drawable/ic_notification.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@android:color/white">
+
+    <!-- Notification bell shape -->
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM18,16v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C7.63,5.36 6,7.92 6,11v5l-1.7,1.7c-0.14,0.14 -0.3,0.3 -0.3,0.6 0,0.5 0.4,0.7 0.8,0.7h14.4c0.4,0 0.8,-0.2 0.8,-0.7 0,-0.3 -0.16,-0.46 -0.3,-0.6L18,16z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
@@ -479,7 +479,8 @@
                                 android:scrollHorizontally="true"
                                 android:text="Manage Subscription"
                                 android:textColor="@color/white"
-                                android:textSize="16sp" />
+                                android:textSize="16sp"
+                                android:visibility="gone"/>
                         </LinearLayout>
 
                     </com.google.android.material.card.MaterialCardView>
