Fix & Closes #59

Signed-off-by: Fung Gwo <fython@163.com>

Author: fython

mobile/src/main/kotlin/info/papdt/express/helper/Constants.kt

@@ -1,8 +1,5 @@
 package info.papdt.express.helper
 
-const val BUGLY_APP_ID = "a499a51858"
-const val BUGLY_ENABLE_DEBUG = false
-
 const val RESULT_EXTRA_PACKAGE_JSON = "package_json"
 const val RESULT_EXTRA_COMPANY_CODE = "company_code"
 
@@ -16,9 +13,11 @@ const val RESULT_RENAMED = 2002
 const val ACTION_PREFIX = BuildConfig.APPLICATION_ID + ".action"
 const val ACTION_SEARCH = "$ACTION_PREFIX.SEARCH"
 const val ACTION_REQUEST_DELETE_PACK = "$ACTION_PREFIX.REQUEST_DELETE_PACK"
+const val ACTION_REQUEST_OPEN_DETAILS = "$ACTION_PREFIX.REQUEST_OPEN_DETAILS"
 
 const val EXTRA_PREFIX = BuildConfig.APPLICATION_ID + ".extra"
 const val EXTRA_DATA = "$EXTRA_PREFIX.DATA"
 const val EXTRA_OLD_DATA = "$EXTRA_PREFIX.OLD_DATA"
+const val EXTRA_STATE = "$EXTRA_PREFIX.STATE"
 
 const val CHANNEL_ID_PACKAGE_STATUS = "package_status"

mobile/src/main/kotlin/info/papdt/express/helper/services/ReminderService.kt

@@ -6,22 +6,21 @@ import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.os.IBinder
 import androidx.core.app.NotificationCompat
 import android.util.Log
-import info.papdt.express.helper.CHANNEL_ID_PACKAGE_STATUS
+import info.papdt.express.helper.*
+import info.papdt.express.helper.R
 
 import java.text.ParseException
 import java.text.SimpleDateFormat
 
-import info.papdt.express.helper.R
 import info.papdt.express.helper.dao.PackageDatabase
 import info.papdt.express.helper.model.Kuaidi100Package
 import info.papdt.express.helper.support.PushUtils
 import info.papdt.express.helper.support.Settings
 import info.papdt.express.helper.support.SettingsInstance
-import info.papdt.express.helper.ui.DetailsActivity
+import info.papdt.express.helper.ui.HomeActivity
 import info.papdt.express.helper.ui.launcher.AppWidgetProvider
 import moe.feng.kotlinyan.common.*
 import java.util.*
@@ -90,10 +89,7 @@ class ReminderService : IntentService(TAG) {
 			builder.setContentIntent(contentIntent)
 			if (time > 0) builder.setWhen(time)
 			builder.setAutoCancel(true)
-
-			if (Build.VERSION.SDK_INT >= 21) {
-				builder.color = color
-			}
+			builder.color = color
 			n = builder.build()
 
 			return n
@@ -106,10 +102,10 @@ class ReminderService : IntentService(TAG) {
 				val pi = PendingIntent.getActivity(
 						context.applicationContext,
 						position,
-						Intent(context.applicationContext, DetailsActivity::class.java).apply {
+						Intent(context, HomeActivity::class.java).apply {
 							flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
-							this["extra_package_json"] = exp.toJsonString()
-							this["extra_state"] = exp.getState()
+							action = ACTION_REQUEST_OPEN_DETAILS
+							this[EXTRA_DATA] = exp
 						},
 						PendingIntent.FLAG_UPDATE_CURRENT)
 

mobile/src/main/kotlin/info/papdt/express/helper/ui/DetailsActivity.kt

@@ -17,11 +17,9 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.ImageView
-
+import info.papdt.express.helper.*
 import info.papdt.express.helper.R
-import info.papdt.express.helper.REQUEST_DETAILS
-import info.papdt.express.helper.RESULT_DELETED
-import info.papdt.express.helper.RESULT_RENAMED
+
 import info.papdt.express.helper.api.PackageApi
 import info.papdt.express.helper.dao.PackageDatabase
 import info.papdt.express.helper.model.BaseMessage
@@ -67,7 +65,7 @@ class DetailsActivity : AbsActivity() {
 		}
 	}
 
-	private var data: Kuaidi100Package? = null
+	private lateinit var data: Kuaidi100Package
 	private var state: Int = 0
 
 	private val progressDialog: ProgressDialog by lazy {
@@ -126,10 +124,10 @@ class DetailsActivity : AbsActivity() {
 
 	private fun buildItems(): Items {
 		val newItems = Items()
-		newItems.add(DetailsTwoLineItem(DetailsTwoLineItem.TYPE_NAME, data!!.name!!))
-		newItems.add(DetailsTwoLineItem(DetailsTwoLineItem.TYPE_NUMBER, data!!.number!!, data!!.companyChineseName))
+		newItems.add(DetailsTwoLineItem(DetailsTwoLineItem.TYPE_NAME, data.name!!))
+		newItems.add(DetailsTwoLineItem(DetailsTwoLineItem.TYPE_NUMBER, data.number!!, data.companyChineseName))
 		newItems.add(getString(R.string.list_status_subheader))
-		newItems.addAll(data!!.data ?: listOf())
+		newItems.addAll(data.data ?: listOf())
 		return newItems
 	}
 
@@ -145,9 +143,12 @@ class DetailsActivity : AbsActivity() {
                 return true
             }
 			R.id.action_copy_code -> {
-				ClipboardUtils.putString(applicationContext, data!!.number)
-				Snackbar.make(findViewById(R.id.coordinator_layout)!!, R.string.toast_copied_code, Snackbar.LENGTH_LONG)
-						.show()
+				ClipboardUtils.putString(applicationContext, data.number)
+				Snackbar.make(
+						findViewById(R.id.coordinator_layout)!!,
+						R.string.toast_copied_code,
+						Snackbar.LENGTH_LONG
+				).show()
 				return true
 			}
 			R.id.action_share -> {
@@ -159,14 +160,14 @@ class DetailsActivity : AbsActivity() {
 				return true
 			}
 			R.id.action_set_unread -> {
-				data!!.unreadNew = true
+				data.unreadNew = true
 
 				val intent = Intent()
-				intent.putExtra("id", data!!.number)
+				intent.putExtra("id", data.number)
 				setResult(RESULT_RENAMED, intent)
 
 				val db = PackageDatabase.getInstance(applicationContext)
-				db[db.indexOf(data!!.number!!)] = data!!
+				db[db.indexOf(data.number!!)] = data
 
 				finish()
 				return true
@@ -175,21 +176,21 @@ class DetailsActivity : AbsActivity() {
 				ui {
 					progressDialog.show()
 					val result = asyncIO {
-						val newPack = PackageApi.getPackage(data!!.number!!, data!!.companyType)
+						val newPack = PackageApi.getPackage(data.number!!, data.companyType)
 						if (newPack.code != BaseMessage.CODE_OKAY || newPack.data?.data == null) {
 							false
 						} else {
-							data!!.applyNewData(newPack.data)
+							data.applyNewData(newPack.data)
 							val db = PackageDatabase.getInstance(applicationContext)
-							db[db.indexOf(data!!.number!!)] = data!!
+							db[db.indexOf(data.number!!)] = data
 							db.save()
 							true
 						}
 					}.await()
 					progressDialog.dismiss()
 					if (result) {
 						val intent = Intent()
-						intent["id"] = data!!.number
+						intent["id"] = data.number
 						setResult(RESULT_RENAMED, intent)
 						setUpData()
 					}
@@ -201,7 +202,7 @@ class DetailsActivity : AbsActivity() {
 	}
 
 	fun showNameEditDialog() {
-		EditPackageDialog.newInstance(data!!).show(supportFragmentManager, "edit")
+		EditPackageDialog.newInstance(data).show(supportFragmentManager, "edit")
 	}
 
 	private fun showDeleteDialog() {
@@ -210,11 +211,11 @@ class DetailsActivity : AbsActivity() {
 
 	private fun showShareChooser() {
 		val text = getString(R.string.share_info_format,
-				data!!.name,
-				data!!.number,
-				data!!.companyChineseName,
-				if (data!!.data!!.size > 0) data!!.data!![0].context else "Unknown",
-				if (data!!.data!!.size > 0) data!!.data!![0].time else ""
+				data.name,
+				data.number,
+				data.companyChineseName,
+				if (data.data!!.size > 0) data.data!![0].context else "Unknown",
+				if (data.data!!.size > 0) data.data!![0].time else ""
 		)
 
 		val intent = Intent(Intent.ACTION_SEND)
@@ -226,8 +227,8 @@ class DetailsActivity : AbsActivity() {
 	private inner class ListBuildTask : AsyncTask<Void, Void, Items>() {
 
 		override fun doInBackground(vararg voids: Void): Items {
-			if (data == null) {
-				data = Kuaidi100Package.buildFromJson(intent.getStringExtra(EXTRA_PACKAGE_JSON))
+			if (!this@DetailsActivity::data.isInitialized) {
+				data = intent.getParcelableExtra(EXTRA_DATA)
 			}
 
 			return buildItems()
@@ -237,33 +238,31 @@ class DetailsActivity : AbsActivity() {
 			mStatusBinder.setData(data)
 			mAdapter.items = items
 			mStatusBinder.showChiba =
-					(data?.data?.find { it.context!!.contains("佛山") || it.context!!.contains("广州") } != null)
-							&& (data?.companyChineseName?.contains("圆通") == true)
+					(data.data?.find { it.context!!.contains("佛山") || it.context!!.contains("广州") } != null)
+							&& (data.companyChineseName?.contains("圆通") == true)
 			mAdapter.notifyDataSetChanged()
 
 			val color: Int = when (state) {
 				Kuaidi100Package.STATUS_DELIVERED -> resources.color[R.color.teal_500]
 				Kuaidi100Package.STATUS_FAILED -> resources.color[R.color.blue_grey_500]
 				else -> resources.color[R.color.blue_500]
 			}
-            val taskDesc = ActivityManager.TaskDescription(data!!.name, null, color)
+            val taskDesc = ActivityManager.TaskDescription(data.name, null, color)
             setTaskDescription(taskDesc)
 		}
 
 	}
 
 	companion object {
 
-		private const val EXTRA_PACKAGE_JSON = "extra_package_json"
-		private const val EXTRA_STATE = "extra_state"
-
 		fun launch(activity: Activity, p: Kuaidi100Package) {
 			val intent = Intent(activity, DetailsActivity::class.java)
 			intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
-			intent[EXTRA_PACKAGE_JSON] = p.toJsonString()
+			intent[EXTRA_DATA] = p
 			intent[EXTRA_STATE] = p.getState()
 			activity.startActivityForResult(intent, REQUEST_DETAILS)
 		}
+
 	}
 
 }

mobile/src/main/kotlin/info/papdt/express/helper/ui/HomeActivity.kt

@@ -168,6 +168,9 @@ class HomeActivity : AbsActivity(), OnRefreshListener {
                     addButton.performClick()
                 }
             }
+            ACTION_REQUEST_OPEN_DETAILS -> {
+                DetailsActivity.launch(this, intent.getParcelableExtra(EXTRA_DATA))
+            }
             ScannerActivity.ACTION_SCAN_TO_ADD -> {
                 scanButton.performClick()
             }