From aa14d3022db0f950d96ddbe48447cadf1ca4712b Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 26 Mar 2018 16:34:09 +0200
Subject: [PATCH] fix #357, handle com.android.calendar/events intent

---
 app/src/main/AndroidManifest.xml                 |  6 ++++++
 .../calendar/activities/MainActivity.kt          | 16 ++++++++++++++--
 .../calendar/helpers/DBHelper.kt                 | 12 ++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index abffa3001..51fc63868 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -61,6 +61,12 @@
                 <data android:host="com.android.calendar"/>
                 <data android:scheme="content"/>
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="vnd.android.cursor.item/event"/>
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
index a889e2943..a67036f25 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
@@ -83,8 +83,20 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
         if (intent?.action == Intent.ACTION_VIEW && intent.data != null) {
             val uri = intent.data
             if (uri.authority == "com.android.calendar") {
-                // clicking date on a third party widget: content://com.android.calendar/time/1507309245683
-                if (intent?.extras?.getBoolean("DETAIL_VIEW", false) == true) {
+                if (uri.path.startsWith("/events")) {
+                    // intents like content://com.android.calendar/events/1756
+                    val eventId = uri.lastPathSegment
+                    val id = dbHelper.getEventIdWithLastImportId(eventId)
+                    if (id != 0) {
+                        Intent(this, EventActivity::class.java).apply {
+                            putExtra(EVENT_ID, id)
+                            startActivity(this)
+                        }
+                    } else {
+                        toast(R.string.unknown_error_occurred)
+                    }
+                } else if (intent?.extras?.getBoolean("DETAIL_VIEW", false) == true) {
+                    // clicking date on a third party widget: content://com.android.calendar/time/1507309245683
                     val timestamp = uri.pathSegments.last()
                     if (timestamp.areDigitsOnly()) {
                         openDayAt(timestamp.toLong())
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt
index 99ae0a221..d2ba62ed1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/helpers/DBHelper.kt
@@ -605,6 +605,18 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
         }
     }
 
+    fun getEventIdWithLastImportId(id: String): Int {
+        val selection = "$MAIN_TABLE_NAME.$COL_IMPORT_ID LIKE ?"
+        val selectionArgs = arrayOf("%-$id")
+        val cursor = getEventsCursor(selection, selectionArgs)
+        val events = fillEvents(cursor)
+        return if (events.isNotEmpty()) {
+            events.minBy { it.id }?.id ?: 0
+        } else {
+            0
+        }
+    }
+
     fun getEventsWithSearchQuery(text: String, callback: (searchedText: String, events: List<Event>) -> Unit) {
         Thread {
             val searchQuery = "%$text%"