Commit ec803d98 authored by Mygod's avatar Mygod

Fix assert not working

parent f63842f7
...@@ -25,7 +25,7 @@ import android.os.Bundle ...@@ -25,7 +25,7 @@ import android.os.Bundle
class NativePlugin(resolveInfo: ResolveInfo) : ResolvedPlugin(resolveInfo) { class NativePlugin(resolveInfo: ResolveInfo) : ResolvedPlugin(resolveInfo) {
init { init {
assert(resolveInfo.providerInfo != null) check(resolveInfo.providerInfo != null)
} }
override val metaData: Bundle get() = resolveInfo.providerInfo.metaData override val metaData: Bundle get() = resolveInfo.providerInfo.metaData
......
...@@ -134,7 +134,7 @@ object PluginManager { ...@@ -134,7 +134,7 @@ object PluginManager {
private fun initNative(options: PluginOptions): String? { private fun initNative(options: PluginOptions): String? {
val providers = app.packageManager.queryIntentContentProviders( val providers = app.packageManager.queryIntentContentProviders(
Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(options.id)), 0) Intent(PluginContract.ACTION_NATIVE_PLUGIN, buildUri(options.id)), 0)
assert(providers.size == 1) check(providers.size == 1)
val uri = Uri.Builder() val uri = Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT) .scheme(ContentResolver.SCHEME_CONTENT)
.authority(providers[0].providerInfo.authority) .authority(providers[0].providerInfo.authority)
...@@ -154,7 +154,7 @@ object PluginManager { ...@@ -154,7 +154,7 @@ object PluginManager {
out.putString(PluginContract.EXTRA_OPTIONS, options.id) out.putString(PluginContract.EXTRA_OPTIONS, options.id)
val result = cr.call(uri, PluginContract.METHOD_GET_EXECUTABLE, null, out) val result = cr.call(uri, PluginContract.METHOD_GET_EXECUTABLE, null, out)
.getString(PluginContract.EXTRA_ENTRY) .getString(PluginContract.EXTRA_ENTRY)
assert(File(result).canExecute()) check(File(result).canExecute())
return result return result
} }
...@@ -173,7 +173,7 @@ object PluginManager { ...@@ -173,7 +173,7 @@ object PluginManager {
do { do {
val path = cursor.getString(0) val path = cursor.getString(0)
val file = File(pluginDir, path) val file = File(pluginDir, path)
assert(file.absolutePath.startsWith(pluginDirPath)) check(file.absolutePath.startsWith(pluginDirPath))
cr.openInputStream(uri.buildUpon().path(path).build()).use { inStream -> cr.openInputStream(uri.buildUpon().path(path).build()).use { inStream ->
file.outputStream().use { outStream -> inStream.copyTo(outStream) } file.outputStream().use { outStream -> inStream.copyTo(outStream) }
} }
......
...@@ -61,7 +61,7 @@ abstract class NativePluginProvider : ContentProvider() { ...@@ -61,7 +61,7 @@ abstract class NativePluginProvider : ContentProvider() {
override fun query(uri: Uri, projection: Array<out String>?, selection: String?, selectionArgs: Array<out String>?, override fun query(uri: Uri, projection: Array<out String>?, selection: String?, selectionArgs: Array<out String>?,
sortOrder: String?): Cursor { sortOrder: String?): Cursor {
assert(selection == null && selectionArgs == null && sortOrder == null) check(selection == null && selectionArgs == null && sortOrder == null)
val result = MatrixCursor(projection) val result = MatrixCursor(projection)
populateFiles(PathProvider(uri, result)) populateFiles(PathProvider(uri, result))
return result return result
...@@ -79,7 +79,7 @@ abstract class NativePluginProvider : ContentProvider() { ...@@ -79,7 +79,7 @@ abstract class NativePluginProvider : ContentProvider() {
abstract fun openFile(uri: Uri?): ParcelFileDescriptor abstract fun openFile(uri: Uri?): ParcelFileDescriptor
override fun openFile(uri: Uri?, mode: String?): ParcelFileDescriptor { override fun openFile(uri: Uri?, mode: String?): ParcelFileDescriptor {
assert(mode == "r") check(mode == "r")
return openFile(uri) return openFile(uri)
} }
......
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