Merge pull request #173 from Ryosuke839/#164-process-text-optional

Make intent-filter android.intent.action.PROCESS_TEXT optional
Ryosuke839 · Apr 7, 2024 · b949fec · b949fec
2 parents 6036141 + d2ccf8a
commit b949fec
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 11 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
 
 	<queries>
 		<intent>
-			<action android:name="android.intent.action.VIEW" />
+			<action android:name="android.intent.action.PROCESS_TEXT" />
 		</intent>
 	</queries>
 
@@ -65,20 +65,22 @@
 
 				<category android:name="android.intent.category.DEFAULT" />
 			</intent-filter>
+			<meta-data android:name="android.app.shortcuts"
+				android:resource="@xml/shortcuts" />
+		</activity>
+
+		<activity-alias
+			android:name="UnicodeActivityAlias"
+			android:targetActivity="UnicodeActivity"
+			android:enabled="true"
+			android:exported="true">
+
 			<intent-filter android:icon="@mipmap/ic_launcher">
 				<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" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<data android:scheme="http" />
-				<data android:scheme="https" />
-			</intent-filter>
-			<meta-data android:name="android.app.shortcuts"
-				android:resource="@xml/shortcuts" />
-		</activity>
+		</activity-alias>
 
 		<activity android:name="SettingActivity"
 			android:parentActivityName=".UnicodeActivity" />

diff --git a/app/src/main/java/jp/ddo/hotmist/unicodepad/SettingActivity.kt b/app/src/main/java/jp/ddo/hotmist/unicodepad/SettingActivity.kt
@@ -18,8 +18,10 @@
 package jp.ddo.hotmist.unicodepad
 
 import android.app.AlertDialog
+import android.content.ComponentName
 import android.content.DialogInterface
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -33,7 +35,6 @@ import androidx.preference.*
 import org.json.JSONException
 import org.json.JSONObject
 import java.io.IOException
-import java.util.*
 
 class SettingActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -111,6 +112,7 @@ class SettingActivity : BaseActivity() {
             setText(findPreference("checker")!!)
             setText(findPreference("recentsize")!!)
             setEntry(findPreference("scroll")!!)
+            findPreference<Preference>("process_text")!!.onPreferenceChangeListener = this
             findPreference<Preference>("legal_app")!!.also {
                 it.setOnPreferenceClickListener {
                     openPage("https://github.com/Ryosuke839/UnicodePad")
@@ -164,6 +166,16 @@ class SettingActivity : BaseActivity() {
                     Toast.makeText(activity, R.string.theme_title, Toast.LENGTH_SHORT).show()
                     activity.setResult(RESULT_FIRST_USER)
                 }
+                if (key == "process_text") {
+                    val packageName = activity.packageName
+                    val newState =
+                        if (newValue as Boolean) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else PackageManager.COMPONENT_ENABLED_STATE_DISABLED
+                    activity.packageManager.setComponentEnabledSetting(
+                        ComponentName(packageName, "$packageName.UnicodeActivityAlias"),
+                        newState, PackageManager.DONT_KILL_APP
+                    )
+                    return true
+                }
             }
             preference.summary = if (preference is ListPreference) preference.entries[preference.findIndexOfValue(newValue.toString())] else newValue.toString()
             return true
@@ -243,6 +255,7 @@ class SettingActivity : BaseActivity() {
                                         it.put("ime", if (pref.contains("ime")) pref.getBoolean("ime", true) else null)
                                         it.put("clear", if (pref.contains("clear")) pref.getBoolean("clear", true) else null)
                                         it.put("buttons", if (pref.contains("buttons")) pref.getBoolean("buttons", true) else null)
+                                        it.put("process_text", if (pref.contains("process_text")) pref.getBoolean("process_text", true) else null)
                                         it.put("scroll", pref.getString("scroll", null))
                                         it.put("recentsize", pref.getString("recentsize", null))
                                     })
@@ -366,6 +379,7 @@ class SettingActivity : BaseActivity() {
                                         (it.opt("ime") as? Boolean)?.let { bool -> edit.putBoolean("ime", bool) }
                                         (it.opt("clear") as? Boolean)?.let { bool -> edit.putBoolean("clear", bool) }
                                         (it.opt("buttons") as? Boolean)?.let { bool -> edit.putBoolean("buttons", bool) }
+                                        (it.opt("process_text") as? Boolean)?.let { bool -> edit.putBoolean("process_text", bool) }
                                         (it.opt("scroll") as? String)?.let { str -> edit.putString("scroll", str) }
                                         (it.opt("recentsize") as? String)?.let { str -> edit.putString("recentsize", str) }
                                     }

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -433,6 +433,7 @@
 	<string name="ime_desc">IMEを無効化</string>
 	<string name="clear_desc">全削除ボタンを表示</string>
 	<string name="buttons_desc">ボタン行を表示</string>
+	<string name="process_text_desc">テキスト選択メニューから起動する</string>
 	<string name="malformed">ZIP内のファイル名が破損</string>
 	<string name="legal">法的表記</string>
 	<string name="legal_uni2">本アプリケーションはUnicode Data Fileの改変された版を含んでいます。

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -478,6 +478,7 @@
 	<string name="ime_desc">Disable IME</string>
 	<string name="clear_desc">Show clear button</string>
 	<string name="buttons_desc">Show button row</string>
+	<string name="process_text_desc">Launch from text selection context menu</string>
 	<string name="clear" translatable="false">⌧</string>
 	<string name="erase" translatable="false">⌫</string>
 	<string name="notacharacter" translatable="false">&lt;not a character&gt;</string>

diff --git a/app/src/main/res/xml/setting.xml b/app/src/main/res/xml/setting.xml
@@ -157,6 +157,10 @@
 			android:inputType="number"
 			android:summary=""
 			android:title="@string/recent_desc" />
+		<CheckBoxPreference
+			android:defaultValue="true"
+			android:key="process_text"
+			android:title="@string/process_text_desc" />
 	</PreferenceCategory>
 	<PreferenceCategory
 		android:key="legal"