finished work on note notifications, updated info page and other changes

Author: jjewuz

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "com.jjewuz.justnotes"
         minSdk 30
         targetSdk 35
-        versionCode 184
-        versionName "5.6.3"
+        versionCode 200
+        versionName "5.7.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 183,
-      "versionName": "5.6.2",
+      "versionCode": 184,
+      "versionName": "5.6.3",
       "outputFile": "app-release.apk"
     }
   ],

app/src/main/AndroidManifest.xml

@@ -13,6 +13,8 @@
     <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+
 
     <queries>
         <package android:name="com.jjewuz.justnotes" />
@@ -42,7 +44,13 @@
             android:exported="false" />
 
         <receiver android:name=".Notifications.NotificationReceiver"
-            android:enabled="true"/>
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.jjewuz.NOTIFICATION_DELETED" />
+                <action android:name="com.jjewuz.NOTIFICATION_HIDE" />
+            </intent-filter>
+        </receiver>
 
         <receiver
             android:name=".Notes.NoteWidget"
@@ -85,6 +93,14 @@
                 android:resource="@xml/shortcuts" />
         </activity>
 
+        <service
+            android:name=".Utils.Utils$PersistentService"
+            android:foregroundServiceType="specialUse"
+            android:exported="false"
+            android:enabled="true"
+            android:permission="android.permission.FOREGROUND_SERVICE" />
+
+
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
             android:enabled="false">

app/src/main/java/com/jjewuz/justnotes/Activities/AddEditNoteActivity.kt

@@ -2,6 +2,7 @@ package com.jjewuz.justnotes.Activities
 
 
 import android.app.Activity
+import android.app.NotificationManager
 import android.appwidget.AppWidgetManager
 import android.content.ComponentName
 import android.content.ContentValues

app/src/main/java/com/jjewuz/justnotes/Activities/InfoActivity.kt

@@ -18,10 +18,11 @@ import com.jjewuz.justnotes.R
 
 class InfoActivity : AppCompatActivity() {
 
-    private lateinit var ghBtn: LinearLayout
-    private lateinit var sourceBtn: LinearLayout
-    private lateinit var siteBtn: LinearLayout
-    private lateinit var weblateBtn: LinearLayout
+    private lateinit var siteProfile: Button
+    private lateinit var ghBtn: Button
+    private lateinit var sourceBtn: Button
+    private lateinit var siteBtn: Button
+    private lateinit var weblateBtn: Button
     private lateinit var licenseBtn: Button
 
     private lateinit var tou: Button
@@ -59,6 +60,7 @@ class InfoActivity : AppCompatActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         enableEdgeToEdge()
 
+        siteProfile = findViewById(R.id.profile_site)
         ghBtn = findViewById(R.id.github_profile)
         sourceBtn = findViewById(R.id.github_code)
         siteBtn = findViewById(R.id.site)
@@ -75,13 +77,14 @@ class InfoActivity : AppCompatActivity() {
         versionTxt.text = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
 
         ghBtn.setOnClickListener { openLink("https://github.com/jjewuz/JustNotes") }
+        siteProfile.setOnClickListener{ openLink("https://jjewuz.com") }
         sourceBtn.setOnClickListener { openLink("https://github.com/jjewuz") }
         siteBtn.setOnClickListener{ openLink("https://jjewuz.com/justnotes.html") }
         weblateBtn.setOnClickListener {openLink("https://hosted.weblate.org/engage/justnotes/")}
         licenseBtn.setOnClickListener { startActivity(Intent(this, OssLicensesMenuActivity::class.java)) }
-        tou.setOnClickListener { openLink("https://jjewuz.com/justnotes/termsofuse.html") }
-        pp.setOnClickListener { openLink("https://jjewuz.com/justnotes/privacypolicy.html") }
-        tgBtn.setOnClickListener { openLink("https://t.me/jjewuz_support") }
+        tou.setOnClickListener { openLink("https://jjewuz.com/en/justnotes/termsofuse.html") }
+        pp.setOnClickListener { openLink("https://jjewuz.com/en/justnotes/privacypolicy.html") }
+        tgBtn.setOnClickListener { openLink("https://t.me/jjewuz") }
         vkBtn.setOnClickListener { openLink("https://vk.com/jjewuzhub") }
 
 

app/src/main/java/com/jjewuz/justnotes/Activities/MainActivity.kt

@@ -91,12 +91,6 @@ class ModalBottomSheet: BottomSheetDialogFragment(){
         val notesCountText = view.findViewById<TextView>(R.id.notes_count)
         val notesText = resources.getString(R.string.total_notes)
         val lastBackupText = view.findViewById<TextView>(R.id.last_backup)
-        val jmCard = view.findViewById<MaterialCardView>(R.id.ad_card)
-        jmCard.setOnClickListener{
-            val url = "https://play.google.com/store/apps/details?id=com.jjewuz.executor"
-            val i = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-            startActivity(i)
-        }
 
         viewModel.getNotes().observe(this, Observer { notes ->
             val notesCount = notes.size
@@ -579,9 +573,9 @@ class MainActivity : AppCompatActivity() {
             val builder = MaterialAlertDialogBuilder(this)
             val inflater = this.layoutInflater.inflate(R.layout.contions, null)
             val tou = inflater.findViewById<Button>(R.id.terms_of_use)
-            tou.setOnClickListener { openLink("https://jjewuz.ru/justnotes/termsofuse.html") }
+            tou.setOnClickListener { openLink("https://jjewuz.ru/en/justnotes/termsofuse.html") }
             val pp = inflater.findViewById<Button>(R.id.privacy_policy)
-            pp.setOnClickListener { openLink("https://jjewuz.ru/justnotes/privacypolicy.html") }
+            pp.setOnClickListener { openLink("https://jjewuz.ru/en/justnotes/privacypolicy.html") }
             builder.setView(inflater)
                 .setTitle(R.string.agreement)
                 .setIcon(R.drawable.info)

app/src/main/java/com/jjewuz/justnotes/Fragments/NotesFragment.kt

@@ -2,13 +2,15 @@ package com.jjewuz.justnotes.Fragments
 
 import android.app.NotificationManager
 import android.app.PendingIntent
+import android.app.Service
 import android.appwidget.AppWidgetManager
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Build
 import android.os.Bundle
+import android.os.IBinder
 import android.text.Html
 import android.text.Spanned
 import android.view.LayoutInflater
@@ -22,6 +24,7 @@ import android.widget.SearchView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.core.app.NotificationCompat
+import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@@ -53,6 +56,7 @@ import com.jjewuz.justnotes.Notes.NoteWidget
 import com.jjewuz.justnotes.R
 import com.jjewuz.justnotes.Utils.OnSwipeTouchListener
 import com.jjewuz.justnotes.Utils.Utils
+import com.jjewuz.justnotes.Utils.Utils.fromHtml
 
 class NotesFragment : Fragment(), NoteClickInterface, NoteLongClickInterface {
     lateinit var viewModal: NoteViewModal
@@ -339,7 +343,7 @@ class NotesFragment : Fragment(), NoteClickInterface, NoteLongClickInterface {
             editor.cancel()
         }
         notify.setOnClickListener {
-            sendNotification(requireContext(), note)
+            startPersistentNotification(requireContext(), note)
             Toast.makeText(requireContext(), "Notification sent", Toast.LENGTH_SHORT).show()
             editor.cancel()
         }
@@ -369,50 +373,28 @@ class NotesFragment : Fragment(), NoteClickInterface, NoteLongClickInterface {
        }
     }
 
-    private fun sendNotification(context: Context, note: Note) {
-        val notificationId = note.id
-        val notificationManager =
-            context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+    private fun startPersistentNotification(context: Context, note: Note) {
 
-        // Создаем Intent для открытия AddEditNoteActivity
-        val intent = Intent(context, AddEditNoteActivity::class.java).apply {
-            putExtra("noteType", "Edit")
+        val spannedContent =
+            Html.fromHtml(note.noteDescription, Html.FROM_HTML_MODE_COMPACT).toString()
+        val content = if (spannedContent.length > 100) {
+            "${spannedContent.take(150)}..."
+        } else {
+            spannedContent
+        }
+
+        val serviceIntent = Intent(context, Utils.PersistentService::class.java).apply {
             putExtra("noteId", note.id)
+            putExtra(Utils.PersistentService.NOTE_ID_KEY, note.id)
+            putExtra(Utils.PersistentService.NOTE_LABEL_ID, note.categoryId ?: 0)
             putExtra("noteTitle", note.noteTitle)
             putExtra("noteDescription", note.noteDescription)
             putExtra("timestamp", note.timeStamp)
             putExtra("categoryId", note.categoryId ?: 0)
             putExtra("security", note.security)
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
         }
-
-        val pendingIntent = PendingIntent.getActivity(
-            context,
-            notificationId,
-            intent,
-            PendingIntent.FLAG_IMMUTABLE
-        )
-
-        val spannedContent = Html.fromHtml(note.noteDescription, Html.FROM_HTML_MODE_COMPACT).toString()
-        val content = if (spannedContent.length > 50) {
-            "${spannedContent.take(50)}..."
-        } else {
-            spannedContent
-        }
-
-        val notification = NotificationCompat.Builder(context, "1")
-            .setSmallIcon(R.drawable.note)
-            .setContentTitle(note.noteTitle)
-            .setContentText(content)
-            .setContentIntent(pendingIntent)
-            .setAutoCancel(true)
-            .setOngoing(true)
-            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-            .build()
-
-        notificationManager.notify(notificationId, notification)
+        ContextCompat.startForegroundService(context, serviceIntent)
     }
 
 
-
 }

app/src/main/java/com/jjewuz/justnotes/Notifications/NotificationReciever.kt

@@ -5,27 +5,31 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.util.Log
-import androidx.core.app.NotificationCompat
-import com.jjewuz.justnotes.R
+import androidx.core.content.ContextCompat
+import com.jjewuz.justnotes.Utils.Utils
 
-class NotificationReceiver : BroadcastReceiver() {
 
+class NotificationReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
-        val title = intent.getStringExtra("title")
-        val message = intent.getStringExtra("message")
-        val id = intent.getIntExtra("id", -1)
-
-        val notificationManager =
-            context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        when (intent.action) {
+            "com.jjewuz.NOTIFICATION_DELETED" -> {
+                val serviceIntent = Intent(context, Utils.PersistentService::class.java).apply {
+                    putExtra("noteId", intent.getIntExtra("noteId", -1))
+                    putExtra("noteTitle", intent.getStringExtra("noteTitle"))
+                    putExtra("noteDescription", intent.getStringExtra("noteDescription"))
+                }
+                Log.d("NotesService", "Open note with ${intent.getStringExtra("noteTitle")}")
+                ContextCompat.startForegroundService(context, serviceIntent)
+            }
 
-        val notificationBuilder = NotificationCompat.Builder(context, "0")
-            .setContentTitle(title)
-            .setContentText(message)
-            .setSmallIcon(R.drawable.reminders)
-            .setAutoCancel(true)
-
-        Log.d("NotificationReceiver", "Received notification: $title - $message")
-
-        notificationManager.notify(id, notificationBuilder.build())
+            "com.jjewuz.NOTIFICATION_HIDE" -> {
+                val noteId = intent.getIntExtra("noteId", -1)
+                val notificationManager =
+                    context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+                notificationManager.cancel(noteId)
+                Log.d("NotesService", "Closed note with $noteId")
+            }
+        }
     }
 }
+