Small improvements

README.md

@@ -10,6 +10,12 @@
 var downloadManager = require('cordova-plugin-android-downloadmanager.DownloadManager')
 ```
 
+-- OR --
+
+```js
+var downloadManager = cordova.plugins.DownloadManager
+```
+
 ## API
 
 Please refer to [`DownloadManager`](https://developer.android.com/reference/android/app/DownloadManager.html)
@@ -101,6 +107,13 @@ Note: Don't include any `file://` prefix in the path.
 npm install cordova-plugin-android-downloadmanager
 ```
 
+-- OR --
+
+```sh
+cordova plugin add --save cordova-plugin-android-downloadmanager
+```
+
+
 ## License
 
 [ISC](LICENSE)

package.json

@@ -3,9 +3,6 @@
   "version": "0.5.0",
   "description": "Plugin to expose Android's DownloadManager in Javascript",
   "main": "www/index.js",
-  "dependencies": {
-    "nanoassert": "^1.1.0"
-  },
   "devDependencies": {
     "sync-cordova-xml": "^0.3.0"
   },

plugin.xml

@@ -8,6 +8,9 @@
   <repo>git+https://github.com/emilbayes/cordova-plugin-android-downloadmanager.git</repo>
   <issue>https://github.com/emilbayes/cordova-plugin-android-downloadmanager/issues</issue>
   <platform name="android">
+    <js-module src="www/index.js" name="DownloadManagerPlugin">
+      <clobbers target="cordova.plugins.DownloadManagerPlugin" />
+    </js-module>
     <source-file src="src/com/github/emilbayes/downloadmanager/DownloadManagerPlugin.java" target-dir="src/com/github/emilbayes/downloadmanager"/>
     <config-file target="res/xml/config.xml" parent="/*">
       <feature name="DownloadManagerPlugin">

src/com/github/emilbayes/downloadmanager/DownloadManagerPlugin.java

@@ -165,7 +165,11 @@ private static JSONArray JSONFromCursor(Cursor cursor) throws JSONException {
             rowObject.put("title", cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_TITLE)));
             rowObject.put("description", cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_DESCRIPTION)));
             rowObject.put("mediaType", cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_MEDIA_TYPE)));
-            rowObject.put("localFilename", cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_FILENAME)));
+
+            if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.N) {
+              rowObject.put("localFilename", cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_FILENAME)));
+            }
+
             rowObject.put("localUri", cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)));
             rowObject.put("mediaproviderUri", cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_MEDIAPROVIDER_URI)));
             rowObject.put("uri", cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_URI)));

www/index.js

@@ -1,11 +1,14 @@
-var assert = require('nanoassert')
 module.exports = new DownloadManager()
 
-function DownloadManager () {
+function DownloadManager() {
 }
 
-DownloadManager.prototype.enqueue = function(req, cb) {
-  if (typeof req === 'string') req = {uri: req}
+function assert(assertion, message) {
+  if (!assertion) throw new Error(message || 'AssertionError')
+}
+
+DownloadManager.prototype.enqueue = function (req, cb) {
+  if (typeof req === 'string') req = { uri: req }
   if (req.url) req.uri = req.url
 
   assert(typeof req.uri === 'string', 'req.uri must be string')
@@ -27,7 +30,7 @@ DownloadManager.prototype.enqueue = function(req, cb) {
   exec('enqueue', [req], cb)
 }
 
-DownloadManager.prototype.query = function(filter, cb) {
+DownloadManager.prototype.query = function (filter, cb) {
   if (typeof filter === 'function') {
     cb = filter
     filter = null
@@ -40,7 +43,7 @@ DownloadManager.prototype.query = function(filter, cb) {
   exec('query', [filter], cb)
 }
 
-DownloadManager.prototype.remove = function(ids, cb) {
+DownloadManager.prototype.remove = function (ids, cb) {
   assert(Array.isArray(ids), 'ids must be array')
   assert(cb == null ? true : typeof cb === 'function', 'cb must be function')
 
@@ -55,16 +58,16 @@ function exec (method, args, cb) {
   if (cb == null) cb = noop
   cordova.exec(onsuccess, onerror, 'DownloadManagerPlugin', method, args || [])
 
-  function onsuccess () {
+  function onsuccess() {
     var args = Array.prototype.slice.call(arguments)
     args.unshift(null)
     cb.apply(null, args)
   }
 
-  function onerror (err) {
+  function onerror(err) {
     err = (err instanceof Error) ? err : new Error(err)
     cb(err)
   }
 }
 
-function noop () {}
+function noop() { }