Commit cbb0345e authored by Mygod's avatar Mygod

Fix obtaining packageName in NativePlugin

parent 128d47ab
package com.github.shadowsocks.plugin package com.github.shadowsocks.plugin
import android.content.ContentResolver
import android.content.pm.{PackageManager, ResolveInfo} import android.content.pm.{PackageManager, ResolveInfo}
import android.net.Uri
import android.os.Bundle import android.os.Bundle
/** /**
...@@ -12,8 +10,5 @@ final class NativePlugin(resolveInfo: ResolveInfo, packageManager: PackageManage ...@@ -12,8 +10,5 @@ final class NativePlugin(resolveInfo: ResolveInfo, packageManager: PackageManage
extends ResolvedPlugin(resolveInfo, packageManager) { extends ResolvedPlugin(resolveInfo, packageManager) {
assert(resolveInfo.providerInfo != null) assert(resolveInfo.providerInfo != null)
override protected def metaData: Bundle = resolveInfo.providerInfo.metaData override protected def metaData: Bundle = resolveInfo.providerInfo.metaData
override def packageName: String = resolveInfo.providerInfo.packageName
private lazy val uriBuilder: Uri.Builder = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(resolveInfo.providerInfo.authority)
} }
...@@ -18,5 +18,5 @@ abstract class ResolvedPlugin(resolveInfo: ResolveInfo, packageManager: PackageM ...@@ -18,5 +18,5 @@ abstract class ResolvedPlugin(resolveInfo: ResolveInfo, packageManager: PackageM
override final lazy val label: CharSequence = resolveInfo.loadLabel(packageManager) override final lazy val label: CharSequence = resolveInfo.loadLabel(packageManager)
override final lazy val icon: Drawable = resolveInfo.loadIcon(packageManager) override final lazy val icon: Drawable = resolveInfo.loadIcon(packageManager)
override final lazy val defaultConfig: String = metaData.getString(PluginContract.METADATA_KEY_DEFAULT_CONFIG) override final lazy val defaultConfig: String = metaData.getString(PluginContract.METADATA_KEY_DEFAULT_CONFIG)
override final def packageName: String = resolveInfo.resolvePackageName override def packageName: String = resolveInfo.resolvePackageName
} }
...@@ -70,7 +70,7 @@ final class BottomSheetPreferenceDialogFragment extends PreferenceDialogFragment ...@@ -70,7 +70,7 @@ final class BottomSheetPreferenceDialogFragment extends PreferenceDialogFragment
case null => false case null => false
case pn => try { case pn => try {
startActivity(new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, new Uri.Builder() startActivity(new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, new Uri.Builder()
.authority(Settings.AUTHORITY) .scheme("package")
.opaquePart(pn) .opaquePart(pn)
.build())) .build()))
true true
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment