fix: exposed uri error

This commit is contained in:
hyb1996
2018-10-10 14:49:59 +08:00
parent 6cebca179c
commit cce09209a3
17 changed files with 125 additions and 47 deletions

View File

@@ -7,6 +7,7 @@
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
<uses-permission android:name="android.permission.WRITE_SETTINGS"/>
<application

View File

@@ -31,7 +31,7 @@ public class OpenCVHelper {
}
public static void initIfNeeded(Activity activity, InitializeCallback callback) {
if(mInitialized){
if (mInitialized) {
callback.onInitFinish();
return;
}
@@ -55,17 +55,18 @@ public class OpenCVHelper {
public void onManagerConnected(int status) {
switch (status) {
case 0:
finish();
break;
case 1:
default:
Log.e(LOG_TAG, "OpenCV loading failed!");
new MaterialDialog.Builder(mActivity)
.title("OpenCV error")
.content("OpenCV was not initialised correctly. Application will be shut down")
.cancelable(false)
.positiveText("OK")
.onPositive((dialog, which) -> finish())
.show();
.title("OpenCV error")
.content("OpenCV was not initialised correctly. Application will be shut down")
.cancelable(false)
.positiveText("OK")
.onPositive((dialog, which) -> finish())
.show();
break;
case 2:
Log.e(LOG_TAG, "Package installation failed!");
@@ -117,6 +118,8 @@ public class OpenCVHelper {
.negativeText("Exit")
.onNegative(((dialog, which) -> callback.cancel()))
.show();
default:
finish();
}
}

View File

@@ -7,9 +7,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
import android.webkit.MimeTypeMap;
import com.stardust.autojs.annotation.ScriptInterface;
import com.stardust.util.IntentUtil;
@@ -18,8 +16,6 @@ import com.stardust.util.MimeTypes;
import java.lang.ref.WeakReference;
import java.util.List;
import static com.stardust.pio.PFiles.getExtension;
/**
* Created by Stardust on 2017/4/2.
*/
@@ -28,9 +24,16 @@ public class AppUtils {
private Context mContext;
private volatile WeakReference<Activity> mCurrentActivity = new WeakReference<>(null);
private final String mFileProviderAuthority;
public AppUtils(Context context) {
mContext = context;
mFileProviderAuthority = null;
}
public AppUtils(Context context, String fileProviderAuthority) {
mContext = context;
mFileProviderAuthority = fileProviderAuthority;
}
@ScriptInterface
@@ -99,22 +102,14 @@ public class AppUtils {
public void viewFile(String path) {
if (path == null)
throw new NullPointerException("path == null");
path = "file://" + path;
String mimeType = MimeTypes.fromFileOr(path, "*/*");
mContext.startActivity(new Intent(Intent.ACTION_VIEW)
.setDataAndType(Uri.parse(path), mimeType)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
IntentUtil.viewFile(mContext, path, mFileProviderAuthority);
}
@ScriptInterface
public void editFile(String path) {
if (path == null)
throw new NullPointerException("path == null");
path = "file://" + path;
String mimeType = MimeTypes.fromFileOr(path, "*/*");
mContext.startActivity(new Intent(Intent.ACTION_EDIT)
.setDataAndType(Uri.parse(path), mimeType)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
IntentUtil.editFile(mContext, path, mFileProviderAuthority);
}
@ScriptInterface