feat: support process text query for chatgpt.

plateaukao · May 15, 2023 · 185d5fb · 185d5fb
1 parent 6b6aace
commit 185d5fb
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 32 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -73,6 +73,15 @@
                 <action android:name="colordict.intent.action.PICK_RESULT" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter
+                android:order="1"
+                android:priority="1">
+                <action android:name="android.intent.action.PROCESS_TEXT" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data android:mimeType="text/plain" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".activity.SettingActivity"
@@ -126,15 +135,6 @@
                 <action android:name="sc_history" />
                 <action android:name="notification" />
             </intent-filter>
-            <intent-filter
-                android:order="1"
-                android:priority="1">
-                <action android:name="android.intent.action.PROCESS_TEXT" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="text/plain" />
-            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 

diff --git a/app/src/main/java/info/plateaukao/einkbro/activity/BrowserActivity.kt b/app/src/main/java/info/plateaukao/einkbro/activity/BrowserActivity.kt
@@ -1955,7 +1955,9 @@ open class BrowserActivity : FragmentActivity(), BrowserController {
     }
 
     private fun hideSearchPanel() {
-        ninjaWebView.clearMatches()
+        if (this::ninjaWebView.isInitialized) {
+            ninjaWebView.clearMatches()
+        }
         searchOnSite = false
         hideKeyboard()
         showToolbar()

diff --git a/app/src/main/java/info/plateaukao/einkbro/activity/DictActivity.kt b/app/src/main/java/info/plateaukao/einkbro/activity/DictActivity.kt
@@ -20,35 +20,61 @@ class DictActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_dict)
 
-        if (intent.action in
-            listOf("colordict.intent.action.PICK_RESULT", "colordict.intent.action.SEARCH")
-        ) {
-            if (!config.externalSearchWithGpt) {
-                val newIntent = Intent(this, BrowserActivity::class.java).apply {
-                    action = ACTION_DICT
-                    putExtra("EXTRA_QUERY", intent.getStringExtra("EXTRA_QUERY"))
+        when (intent.action) {
+            in listOf("colordict.intent.action.PICK_RESULT", "colordict.intent.action.SEARCH") -> {
+                if (!config.externalSearchWithGpt) {
+                    forwardDictIntentAndFinish()
+                } else {
+                    val text = intent.getStringExtra("EXTRA_QUERY") ?: return
+                    searchWithGpt(text)
                 }
-                startActivity(newIntent)
-                finish()
-            } else {
-                val text = intent.getStringExtra("EXTRA_QUERY") ?: return
-                gptViewModel.updateInputMessage(text)
-                if (gptViewModel.hasApiKey()) {
-                    GPTDialogFragment(
-                        gptViewModel,
-                        Point(50, 50),
-                        hasBackgroundColor = true,
-                        onDismissed = { finish(); overridePendingTransition(0, 0) }
-                    )
-                        .show(supportFragmentManager, "contextMenu")
-                    monitorFragmentStack()
+            }
+
+            Intent.ACTION_PROCESS_TEXT -> {
+                if (!config.externalSearchWithGpt) {
+                    forwardProcessTextIntentAndFinish()
                 } else {
-                    NinjaToast.show(this, R.string.gpt_api_key_not_set)
+                    val text = intent.getStringExtra(Intent.EXTRA_PROCESS_TEXT) ?: return
+                    searchWithGpt(text)
                 }
             }
         }
     }
 
+    private fun searchWithGpt(text: String) {
+        gptViewModel.updateInputMessage(text)
+        if (gptViewModel.hasApiKey()) {
+            GPTDialogFragment(
+                gptViewModel,
+                Point(50, 50),
+                hasBackgroundColor = true,
+                onDismissed = { finish(); overridePendingTransition(0, 0) }
+            )
+                .show(supportFragmentManager, "contextMenu")
+            monitorFragmentStack()
+        } else {
+            NinjaToast.show(this, R.string.gpt_api_key_not_set)
+        }
+    }
+
+    private fun forwardDictIntentAndFinish() {
+        val newIntent = Intent(this, BrowserActivity::class.java).apply {
+            action = ACTION_DICT
+            putExtra("EXTRA_QUERY", intent.getStringExtra("EXTRA_QUERY"))
+        }
+        startActivity(newIntent)
+        finish()
+    }
+
+    private fun forwardProcessTextIntentAndFinish() {
+        val newIntent = Intent(this, BrowserActivity::class.java).apply {
+            action = Intent.ACTION_PROCESS_TEXT
+            putExtra(Intent.EXTRA_PROCESS_TEXT, intent.getStringExtra(Intent.EXTRA_PROCESS_TEXT))
+        }
+        startActivity(newIntent)
+        finish()
+    }
+
     private fun monitorFragmentStack() {
         supportFragmentManager.addOnBackStackChangedListener {
             if (supportFragmentManager.backStackEntryCount == 0) {