Skip to content

Commit aa0c62c

Browse files
nphyattnphyatt
committed
working on android
1 parent 1301ba7 commit aa0c62c

File tree

12 files changed

+415
-151
lines changed

12 files changed

+415
-151
lines changed

‎package.json‎

Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,9 @@
88
"ios"
99
]
1010
},
11-
"types": "types/IonicCordova.d.ts",
11+
"main": "dist/index.js",
12+
"types": "dist/IonicCordova.d.ts",
1213
"description": "Ionic Cordova SDK",
13-
"engines": {
14-
"cordovaDependencies": {
15-
">5.0.0": {
16-
"cordova-plugin-splashscreen": ">=5.0.1",
17-
"cordova-plugin-file": ">=6.0.1",
18-
"cordova-plugin-ionic-webview": ">=2.1.0",
19-
"cordova-plugin-whitelist": ">=1.3.3"
20-
},
21-
"4.1.7": {
22-
"cordova-plugin-splashscreen": ">=5.0.1"
23-
},
24-
"3.1.3": {
25-
"cordova-plugin-splashscreen": ">=5.0.1"
26-
},
27-
"2.0.4": {
28-
"cordova-plugin-splashscreen": ">=4.0.0"
29-
}
30-
}
31-
},
3214
"scripts": {
3315
"apply-dev": "npm run build && ./apply-changes.sh",
3416
"create-dev": "./create-local-app.sh",
@@ -61,13 +43,6 @@
6143
"cordova-android",
6244
"cordova-ios"
6345
],
64-
"dependencies": {
65-
"@types/cordova-plugin-file-transfer": "^1.6.2",
66-
"mkpath": ">=1.0.0",
67-
"node-version-compare": ">=1.0.1",
68-
"plist": ">=1.2.0",
69-
"xml2js": ">=0.4"
70-
},
7146
"author": "Ionic",
7247
"contributors": [
7348
{
@@ -82,7 +57,6 @@
8257
"license": "MIT",
8358
"devDependencies": {
8459
"@types/cordova": "0.0.34",
85-
"cordova-plugin-file": "^6.0.1",
8660
"jest": "^22.4.3",
8761
"np": "^3.0.4",
8862
"rimraf": "^2.6.2",
@@ -92,8 +66,8 @@
9266
"tslint-ionic-rules": "0.0.14",
9367
"typedoc": "^0.11.1",
9468
"typedoc-plugin-markdown": "^1.1.6",
95-
"typescript": "^2.6.2",
96-
"watch": "^1.0.2"
69+
"watch": "^1.0.2",
70+
"@angular/core": "^7.2.15"
9771
},
9872
"jest": {
9973
"globals": {
@@ -109,5 +83,8 @@
10983
".(ts)": "./node_modules/ts-jest/preprocessor.js"
11084
},
11185
"testRegex": "tests/.*\\.(ts|js)$"
86+
},
87+
"dependencies": {
88+
"typescript": "^3.5.3"
11289
}
11390
}

‎plugin.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,15 @@
6868
<string name="ionic_max_versions">$MAX_STORE</string>
6969
<string name="ionic_min_background_duration">$MIN_BACKGROUND_DURATION</string>
7070
</config-file>
71+
<framework src="src/android/cordovapluginionic.gradle" custom="true" type="gradleReference"/>
7172
<source-file src="src/android/IonicCordovaCommon.java" target-dir="src/com/ionicframework/common"/>
7273
</platform>
7374
<platform name="browser">
7475
<js-module src="src/browser/IonicCordovaCommon.js" name="IonicCordovaCommon">
7576
<runs/>
7677
</js-module>
7778
</platform>
78-
<dependency id="cordova-plugin-splashscreen" version="^5.0.1"/>
7979
<dependency id="cordova-plugin-ionic-webview" version=">=2.1.4"/>
80-
<dependency id="cordova-plugin-file" version="^6.0.1"/>
81-
<dependency id="cordova-plugin-file-transfer" version="^1.7.1"/>
8280
<dependency id="cordova-plugin-whitelist" version="^1.3.3"/>
8381
<author>Ionic</author>
8482
</plugin>

‎src/android/IonicCordovaCommon.java‎

Lines changed: 216 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
package com.ionicframework.common;
22

3-
import android.app.Dialog;
43
import android.content.Context;
54
import android.content.SharedPreferences;
6-
import android.graphics.Color;
5+
import android.content.res.AssetManager;
76
import android.net.Uri;
8-
import android.view.animation.AlphaAnimation;
9-
import android.view.animation.Animation;
10-
import android.view.animation.DecelerateInterpolator;
11-
import android.view.Display;
12-
import android.view.WindowManager;
13-
import android.widget.ImageView;
14-
import android.widget.LinearLayout;
15-
import android.widget.LinearLayout.LayoutParams;
167

8+
import org.apache.commons.io.FileUtils;
179
import org.apache.cordova.CordovaWebView;
1810
import org.apache.cordova.CallbackContext;
1911
import org.apache.cordova.CordovaPlugin;
@@ -23,23 +15,36 @@
2315
import org.json.JSONObject;
2416
import org.json.JSONException;
2517

18+
import android.os.Environment;
2619
import android.util.Log;
2720
import android.app.Activity;
2821
import android.content.pm.PackageInfo;
2922
import android.os.Build;
3023

24+
import java.io.DataInputStream;
3125
import java.io.File;
26+
import java.io.FileOutputStream;
27+
import java.io.IOException;
28+
import java.io.InputStream;
29+
import java.io.OutputStream;
30+
import java.net.URL;
3231
import java.util.Iterator;
3332
import java.util.UUID;
3433

3534
public class IonicCordovaCommon extends CordovaPlugin {
3635
public static final String TAG = "IonicCordovaCommon";
3736
private static final String PREFS_KEY = "ionicDeploySavedPreferences";
3837
private static final String CUSTOM_PREFS_KEY = "ionicDeployCustomPreferences";
38+
private AssetManager assetManager;
39+
3940

4041
private SharedPreferences prefs;
4142
private String uuid;
4243

44+
private interface FileOp {
45+
void run(final JSONArray args, final CallbackContext callbackContext) throws Exception;
46+
}
47+
4348
/**
4449
* Sets the context of the Command. This can then be used to do things like
4550
* get file paths associated with the Activity.
@@ -53,11 +58,23 @@ public void initialize(CordovaInterface cordova, CordovaWebView webView) {
5358
// Initialize shared preferences
5459
Context cxt = this.cordova.getActivity().getApplicationContext();
5560
this.prefs = cxt.getSharedPreferences("com.ionic.common.preferences", Context.MODE_PRIVATE);
61+
assetManager = cordova.getContext().getAssets();
5662

5763
// Get or generate a plugin UUID
5864
this.uuid = this.prefs.getString("uuid", UUID.randomUUID().toString());
5965
prefs.edit().putString("uuid", this.uuid).apply();
66+
}
6067

68+
private void threadhelper(final FileOp f, final JSONArray args, final CallbackContext callbackContext){
69+
cordova.getThreadPool().execute(new Runnable() {
70+
public void run() {
71+
try {
72+
f.run(args, callbackContext);
73+
} catch ( Exception e) {
74+
callbackContext.error(e.getMessage());
75+
}
76+
}
77+
});
6178
}
6279

6380
/**
@@ -77,13 +94,202 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
7794
this.setPreferences(callbackContext, args.getJSONObject(0));
7895
} else if (action.equals("configure")){
7996
this.configure(callbackContext, args.getJSONObject(0));
97+
} else if (action.equals("copyTo")){
98+
this.copyTo(callbackContext, args.getJSONObject(0));
99+
} else if (action.equals("remove")){
100+
this.remove(callbackContext, args.getJSONObject(0));
101+
} else if (action.equals("downloadFile")){
102+
threadhelper( new FileOp( ){
103+
public void run(final JSONArray passedArgs, final CallbackContext cbcontext) throws JSONException {
104+
downloadFile(cbcontext, passedArgs.getJSONObject(0));
105+
}
106+
}, args, callbackContext);
107+
80108
} else {
81109
return false;
82110
}
83111

84112
return true;
85113
}
86114

115+
private File getDirectory(String directory) {
116+
Context c = cordova.getContext();
117+
switch(directory) {
118+
case "DOCUMENTS":
119+
return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS);
120+
case "DATA":
121+
return c.getFilesDir();
122+
case "CACHE":
123+
return c.getCacheDir();
124+
case "EXTERNAL":
125+
return c.getExternalFilesDir(null);
126+
case "EXTERNAL_STORAGE":
127+
return Environment.getExternalStorageDirectory();
128+
}
129+
return null;
130+
}
131+
132+
private void copyAssets(String assetPath, String targetDir) throws IOException {
133+
String[] files = null;
134+
try {
135+
files = assetManager.list(assetPath);
136+
} catch (IOException e) {
137+
Log.e("tag", "Failed to get asset file list.", e);
138+
}
139+
if (files != null) for (String filename : files) {
140+
InputStream in = null;
141+
OutputStream out = null;
142+
try {
143+
if (assetManager.list(assetPath + "/" + filename).length > 0) {
144+
File newDir = new File(targetDir, filename);
145+
newDir.mkdir();
146+
copyAssets(assetPath + "/" + filename, newDir.getPath());
147+
continue;
148+
}
149+
in = assetManager.open(assetPath + "/" + filename);
150+
File destDir = new File(targetDir);
151+
if (!destDir.exists()) {
152+
destDir.mkdirs();
153+
}
154+
File outFile = new File(targetDir, filename);
155+
out = new FileOutputStream(outFile);
156+
copyFile(in, out);
157+
} catch(IOException e) {
158+
Log.e("tag", "Failed to copy asset file: " + filename, e);
159+
}
160+
finally {
161+
if (in != null) {
162+
try {
163+
in.close();
164+
} catch (IOException e) {
165+
// NOOP
166+
}
167+
}
168+
if (out != null) {
169+
try {
170+
out.close();
171+
} catch (IOException e) {
172+
// NOOP
173+
}
174+
}
175+
}
176+
}
177+
}
178+
179+
private void copyFile(InputStream in, OutputStream out) throws IOException {
180+
byte[] buffer = new byte[1024];
181+
int read;
182+
while((read = in.read(buffer)) != -1){
183+
out.write(buffer, 0, read);
184+
}
185+
}
186+
187+
/**
188+
* copy a directory or file to another location
189+
*
190+
*/
191+
public void copyTo(CallbackContext callbackContext, JSONObject options) throws JSONException {
192+
Log.d(TAG, "copyTo called with " + options.toString());
193+
PluginResult result;
194+
195+
try {
196+
JSONObject source = options.getJSONObject("source");
197+
String target = options.getString("target");
198+
199+
if (source.getString("directory").equals("APPLICATION")) {
200+
this.copyAssets(source.getString("path"), target);
201+
} else {
202+
File srcDir = this.getDirectory(source.getString("directory"));
203+
File srcFile = new File(srcDir.getPath() + "/" + source.getString("path"));
204+
205+
if (!srcFile.exists()) {
206+
result = new PluginResult(PluginResult.Status.ERROR, "source file or directory does not exist");
207+
result.setKeepCallback(false);
208+
callbackContext.sendPluginResult(result);
209+
return;
210+
}
211+
212+
if (srcFile.isDirectory()) {
213+
FileUtils.copyDirectory(srcFile, new File(target));
214+
} else {
215+
FileUtils.copyFile(srcFile, new File(target));
216+
}
217+
}
218+
} catch (Exception e) {
219+
result = new PluginResult(PluginResult.Status.ERROR, e.getMessage());
220+
result.setKeepCallback(false);
221+
callbackContext.sendPluginResult(result);
222+
return;
223+
}
224+
225+
result = new PluginResult(PluginResult.Status.OK);
226+
result.setKeepCallback(false);
227+
callbackContext.sendPluginResult(result);
228+
}
229+
230+
/**
231+
* recursively remove a directory or a file
232+
*
233+
*/
234+
public void remove(CallbackContext callbackContext, JSONObject options) throws JSONException {
235+
Log.d(TAG, "recursiveRemove called with " + options.toString());
236+
String target = options.getString("target");
237+
File dest = new File(target);
238+
final PluginResult result;
239+
240+
if (!dest.exists()) {
241+
result = new PluginResult(PluginResult.Status.ERROR, "file or directory does not exist");
242+
result.setKeepCallback(false);
243+
callbackContext.sendPluginResult(result);
244+
return;
245+
}
246+
247+
try {
248+
FileUtils.forceDelete(dest);
249+
} catch (IOException e) {
250+
result = new PluginResult(PluginResult.Status.ERROR, e.getMessage());
251+
result.setKeepCallback(false);
252+
callbackContext.sendPluginResult(result);
253+
return;
254+
}
255+
256+
result = new PluginResult(PluginResult.Status.OK);
257+
result.setKeepCallback(false);
258+
callbackContext.sendPluginResult(result);
259+
}
260+
261+
public void downloadFile(CallbackContext callbackContext, JSONObject options) throws JSONException {
262+
Log.d(TAG, "downloadFile called with " + options.toString());
263+
String url = options.getString("url");
264+
String dest = options.getString("target");
265+
final PluginResult result;
266+
267+
try {
268+
URL u = new URL(url);
269+
InputStream is = u.openStream();
270+
271+
DataInputStream dis = new DataInputStream(is);
272+
273+
byte[] buffer = new byte[1024];
274+
int length;
275+
276+
FileOutputStream fos = new FileOutputStream(new File(dest));
277+
while ((length = dis.read(buffer))>0) {
278+
fos.write(buffer, 0, length);
279+
}
280+
281+
} catch (Exception e) {
282+
Log.e(TAG, "downloadFile error", e);
283+
result = new PluginResult(PluginResult.Status.ERROR, e.getMessage());
284+
result.setKeepCallback(false);
285+
callbackContext.sendPluginResult(result);
286+
return;
287+
}
288+
result = new PluginResult(PluginResult.Status.OK);
289+
result.setKeepCallback(false);
290+
callbackContext.sendPluginResult(result);
291+
}
292+
87293
/**
88294
* Get basic app information. Used for the Ionic monitoring service.
89295
*
@@ -289,4 +495,3 @@ private static String toDirUrl(File f) {
289495
}
290496

291497
}
292-

0 commit comments

Comments
 (0)