REFACTOR: Migrate to Kotlin.

Author: oasisfeng

build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:7.0.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -45,6 +45,7 @@ android {
 
 dependencies {
     implementation project(':sdk') //implementation 'com.oasisfeng.nevo:sdk:2.0.0-rc01'
-    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7'
+    androidTestImplementation 'junit:junit:4.13.2'
 }

src/androidTest/java/com/oasisfeng/nevo/decorators/wechat/EmojiTranslatorTest.java

@@ -0,0 +1,27 @@
+package com.oasisfeng.nevo.decorators.wechat
+
+import com.oasisfeng.nevo.decorators.wechat.EmojiTranslator.translate
+import org.junit.Assert
+import org.junit.Test
+
+/**
+ * Created by Oasis on 2018-8-9.
+ */
+class EmojiTranslatorTest {
+
+    @Test fun testConvert() {
+        test("[Smile]", "😃")
+        test("Left[Smile]", "Left😃")
+        test("[Smile] Right", "😃 Right")
+        test("Left[Smile] Right", "Left😃 Right")
+        test("Left [色][色][发呆]Right", "Left 😍😍😳Right")
+        test("Left[[Smile]", "Left[😃")
+        test("Left[Smile]]", "Left😃]")
+        test("Left[[Smile]]", "Left[😃]")
+        test("Left[NotEmoji][][[Smile][", "Left[NotEmoji][][😃[")
+    }
+
+    companion object {
+        private fun test(input: String, expected: String) = Assert.assertEquals(expected, translate(input).toString())
+    }
+}

src/androidTest/java/com/oasisfeng/nevo/decorators/wechat/EmojiTranslatorTest.kt

@@ -21,14 +21,13 @@ import android.util.LruCache
 import androidx.annotation.RequiresApi
 import androidx.core.content.getSystemService
 import com.oasisfeng.nevo.decorators.wechat.ConversationManager.Conversation
-import com.oasisfeng.nevo.decorators.wechat.WeChatDecorator.AGENT_PACKAGE
-import com.oasisfeng.nevo.decorators.wechat.WeChatDecorator.TAG
-import com.oasisfeng.nevo.decorators.wechat.WeChatDecorator.WECHAT_PACKAGE
+import com.oasisfeng.nevo.decorators.wechat.IconHelper.toLocalAdaptiveIcon
 import java.lang.reflect.Method
 
 @RequiresApi(N_MR1) class AgentShortcuts(private val context: Context) {
 
 	companion object {
+		private const val FLAG_ALLOW_EMBEDDED = -0x80000000
 		fun buildShortcutId(key: String) = "C:$key"
 	}
 
@@ -62,13 +61,15 @@ import java.lang.reflect.Method
 		}
 
 		val shortcut = ShortcutInfo.Builder(agentContext, id).setActivity(ComponentName(AGENT_PACKAGE, activity))
-				.setShortLabel(conversation.title).setRank(if (conversation.isGroupChat) 1 else 0)  // Always keep last direct message conversation on top.
+				.setShortLabel(conversation.title!!).setRank(if (conversation.isGroupChat()) 1 else 0)  // Always keep last direct message conversation on top.
 				.setIntent(intent.apply { if (action == null) action = Intent.ACTION_MAIN })
 				.setCategories(setOf(ShortcutInfo.SHORTCUT_CATEGORY_CONVERSATION)).apply {
-					if (conversation.icon != null) setIcon(conversation.icon.toLocalAdaptiveIcon(context, sm))
-					if (SDK_INT >= Q) @SuppressLint("RestrictedApi") {
+					conversation.icon?.run { setIcon(toLocalAdaptiveIcon(context, sm)) }
+					if (SDK_INT >= Q) {
 						setLongLived(true).setLocusId(LocusId(id))
-						if (! conversation.isGroupChat) setPerson(conversation.sender().build().toAndroidPerson()) }}.build()
+						if (! conversation.isGroupChat()) setPerson(conversation.sender().build().toNative())
+					}
+				}.build()
 		Log.i(TAG, "Updating shortcut \"${shortcut.id}\"${if (BuildConfig.DEBUG) ": " + shortcut.intent.toString() else ""}")
 		return if (sm.addDynamicShortcuts(listOf(shortcut))) true.also { Log.i(TAG, "Shortcut updated: $id") }
 		else false.also { Log.e(TAG, "Unexpected rate limit.") }
@@ -82,12 +83,12 @@ import java.lang.reflect.Method
 		catch (e: RuntimeException) { null.also { Log.e(TAG, "Error creating context for agent in user ${profile.hashCode()}", e) }}
 
 	/** @return whether shortcut is ready */
-	@RequiresApi(N_MR1) fun updateShortcutIfNeeded(id: String, conversation: Conversation, profile: UserHandle): Boolean {
-		if (! conversation.isChat || conversation.isBotMessage) return false
+	fun updateShortcutIfNeeded(id: String, conversation: Conversation, profile: UserHandle): Boolean {
+		if (! conversation.isChat() || conversation.isBotMessage()) return false
 		val agentContext = mAgentContextByProfile[profile] ?: return false
 		if (mDynamicShortcutContacts.get(id) != null) return true
 		try { if (updateShortcut(id, conversation, agentContext))
-			return true.also { if (conversation.icon.type != TYPE_RESOURCE) mDynamicShortcutContacts.put(id, Unit) }}   // If no large icon, wait for the next update
+			return true.also { if (conversation.icon?.type != TYPE_RESOURCE) mDynamicShortcutContacts.put(id, Unit) }}   // If no large icon, wait for the next update
 		catch (e: RuntimeException) { Log.e(TAG, "Error publishing shortcut: $id", e) }
 		return false
 	}
@@ -126,5 +127,3 @@ import java.lang.reflect.Method
 		mAgentContextByProfile.clear()
 	}
 }
-
-const val FLAG_ALLOW_EMBEDDED = -0x80000000

src/main/java/com/oasisfeng/nevo/decorators/wechat/AgentShortcuts.kt

@@ -0,0 +1,40 @@
+package com.oasisfeng.nevo.decorators.wechat
+
+import android.content.ContentProvider
+import android.content.ContentValues
+import android.content.res.AssetFileDescriptor
+import android.database.Cursor
+import android.net.Uri
+import android.util.Log
+import java.io.FileNotFoundException
+import java.io.IOException
+
+/**
+ * Expose asset file with content URI
+ *
+ * Created by Oasis on 2019-1-28.
+ */
+class AssetFileProvider : ContentProvider() {
+
+    @Throws(FileNotFoundException::class) override fun openAssetFile(uri: Uri, mode: String): AssetFileDescriptor? {
+        val filename = uri.lastPathSegment ?: throw FileNotFoundException()
+        val context = context!!
+        return try {
+            val suffix = context.getString(R.string.repacked_asset_suffix)
+            val offset = context.resources.getInteger(R.integer.repacked_asset_offset)
+            val afd = context.assets.openFd(
+                if (suffix.isNotEmpty() && filename.endsWith(suffix)) filename + context.getString(R.string.repacked_asset_appendix) else filename)
+            AssetFileDescriptor(afd.parcelFileDescriptor, afd.startOffset + offset, afd.length - offset)
+        } catch (e: IOException) {
+            null.also { Log.e(TAG, "Error opening asset", e) }
+        }
+    }
+
+    override fun onCreate() = true
+
+    override fun getType(uri: Uri): String? = null
+    override fun query(uri: Uri, p: Array<String>?, s: String?, sa: Array<String>?, so: String?): Cursor? = null
+    override fun insert(uri: Uri, values: ContentValues?): Uri? = null
+    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<String>?) = 0
+    override fun update(uri: Uri, values: ContentValues?, selection: String?, selectionArgs: Array<String>?) = 0
+}

src/main/java/com/oasisfeng/nevo/decorators/wechat/AssetFileProvider.java

@@ -8,25 +8,19 @@ import android.net.Uri
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import androidx.core.util.Consumer
 
 object CompatModeController {
 
-	@JvmStatic fun query(context: Context, result_callback: (Consumer<Boolean>)?) {
-		sendRequest(context, null, result_callback)
-	}
-
-	@JvmStatic fun request(context: Context, enabled: Boolean, result_callback: (Consumer<Boolean>)?) {
-		sendRequest(context, enabled, result_callback)
-	}
+	fun query(context: Context, callback: (Boolean) -> Unit) = sendRequest(context, null, callback)
+	fun request(context: Context, enabled: Boolean, callback: (Boolean) -> Unit) = sendRequest(context, enabled, callback)
 
-	private fun sendRequest(context: Context, enabled: Boolean?, callback: (Consumer<Boolean>)?) {
+	private fun sendRequest(context: Context, enabled: Boolean?, callback: (Boolean) -> Unit) {
 		val uri = Uri.fromParts("nevo", "compat", if (enabled == null) null else if (enabled) "1" else "0")
 		context.sendOrderedBroadcast(Intent("", uri), null, object : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) {
 			when (resultCode) {
-				Activity.RESULT_FIRST_USER  -> callback?.accept(true)   // Changed (for request) or enabled (for query)
-				Activity.RESULT_OK          -> callback?.accept(false)  // Unchanged
-				else -> Log.e(WeChatDecorator.TAG, "Unexpected result code: $resultCode") }
+				Activity.RESULT_FIRST_USER  -> callback(true)   // Changed (for request) or enabled (for query)
+				Activity.RESULT_OK          -> callback(false)  // Unchanged
+				else 						-> Log.e(TAG, "Unexpected result code: $resultCode") }
 		}}, Handler(Looper.getMainLooper()), Activity.RESULT_CANCELED, null, null)
 	}
 }