Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix: android build by removing old folder picker plugin

ilian14ad5f7dbf11
diff --git a/cordova/platforms/android/android.json b/cordova/platforms/android/android.json
index 8f9d9e495..23ec372f5 100644
--- a/cordova/platforms/android/android.json
+++ b/cordova/platforms/android/android.json
@@ -10,11 +10,11 @@
"/manifest/application/activity": [
{
"xml": "<intent-filter><action android:name=\"android.intent.action.VIEW\" /><category android:name=\"android.intent.category.DEFAULT\" /><category android:name=\"android.intent.category.BROWSABLE\" /><data android:mimeType=\"application/pdf\" android:scheme=\"file\" /><data android:mimeType=\"text/plain\" android:scheme=\"file\" /><data android:mimeType=\"image/x-windows-bmp\" android:scheme=\"file\" /><data android:mimeType=\"image/gif\" android:scheme=\"file\" /><data android:mimeType=\"image/png\" android:scheme=\"file\" /><data android:mimeType=\"image/jpeg\" android:scheme=\"file\" /><data android:mimeType=\"image/webp\" android:scheme=\"file\" /><data android:mimeType=\"video/webm\" android:scheme=\"file\" /><data android:mimeType=\"video/ogg\" android:scheme=\"file\" /><data android:mimeType=\"text/html\" android:scheme=\"file\" /><data android:mimeType=\"application/json\" android:scheme=\"file\" /></intent-filter>",
- "count": 35
+ "count": 44
},
{
"xml": "<intent-filter><action android:name=\"android.intent.action.VIEW\" /><category android:name=\"android.intent.category.DEFAULT\" /><category android:name=\"android.intent.category.BROWSABLE\" /><data android:host=\"*\" android:mimeType=\"*/*\" android:pathPattern=\"..json\" android:scheme=\"file\" /><data android:host=\"*\" android:mimeType=\"*/*\" android:pathPattern=\"..mht\" android:scheme=\"file\" /><data android:host=\"*\" android:mimeType=\"*/*\" android:pathPattern=\"..mhtml\" android:scheme=\"file\" /><data android:host=\"*\" android:mimeType=\"*/*\" android:pathPattern=\"..md\" android:scheme=\"file\" /><data android:host=\"*\" android:mimeType=\"*/*\" android:pathPattern=\"..md.txt\" android:scheme=\"file\" /><data android:host=\"*\" android:mimeType=\"*/*\" android:pathPattern=\"..markdown\" android:scheme=\"file\" /><data android:host=\"*\" android:mimeType=\"*/*\" android:pathPattern=\"..ogv\" android:scheme=\"file\" /></intent-filter>",
- "count": 35
+ "count": 44
},
{
"xml": "<intent-filter><action android:name=\"com.darryncampbell.cordova.plugin.intent.ACTION\" /><category android:name=\"android.intent.category.DEFAULT\" /></intent-filter>",
@@ -34,10 +34,6 @@
"xml": "<activity android:label=\"Our Code World filepicker\" android:name=\"com.ourcodeworld.plugins.filebrowser.DialogShowPicker\"><intent-filter><action android:name=\"com.ourcodeworld.plugins.filebrowser.DialogShowPicker\" /><category android:name=\"android.intent.category.DEFAULT\" /></intent-filter></activity>",
"count": 1
},
- {
- "xml": "<activity android:label=\"Filepicker\" android:name=\"com.nononsenseapps.filepicker.FilePickerActivity\" android:theme=\"@style/FilePickerTheme\"><intent-filter><action android:name=\"android.intent.action.GET_CONTENT\" /><category android:name=\"android.intent.category.DEFAULT\" /></intent-filter></activity>",
- "count": 1
- },
{
"xml": "<service android:name=\"de.appplant.cordova.plugin.background.ForegroundService\" />",
"count": 1
@@ -48,7 +44,7 @@
},
{
"xml": "<provider android:authorities=\"${applicationId}.provider\" android:exported=\"false\" android:grantUriPermissions=\"true\" android:name=\"androidx.core.content.FileProvider\"><meta-data android:name=\"android.support.FILE_PROVIDER_PATHS\" android:resource=\"@xml/mnk_file_path\" /></provider>",
- "count": 16
+ "count": 25
}
],
"/manifest": [
diff --git a/cordova/platforms/android/app/src/main/AndroidManifest.xml b/cordova/platforms/android/app/src/main/AndroidManifest.xml
index 499325b40..afe78bcb1 100644
--- a/cordova/platforms/android/app/src/main/AndroidManifest.xml
+++ b/cordova/platforms/android/app/src/main/AndroidManifest.xml
@@ -50,12 +50,6 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
- <activity android:label="Filepicker" android:name="com.nononsenseapps.filepicker.FilePickerActivity" android:theme="@style/FilePickerTheme">
- <intent-filter>
- <action android:name="android.intent.action.GET_CONTENT" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
<service android:name="de.appplant.cordova.plugin.background.ForegroundService" />
<provider android:authorities="${applicationId}.cordova.plugin.camera.provider" android:exported="false" android:grantUriPermissions="true" android:name="org.apache.cordova.camera.FileProvider">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/camera_provider_paths" />
@@ -119,6 +113,30 @@
<provider android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/mnk_file_path" />
</provider>
+ <provider android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/mnk_file_path" />
+ </provider>
+ <provider android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/mnk_file_path" />
+ </provider>
+ <provider android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/mnk_file_path" />
+ </provider>
+ <provider android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/mnk_file_path" />
+ </provider>
+ <provider android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/mnk_file_path" />
+ </provider>
+ <provider android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/mnk_file_path" />
+ </provider>
+ <provider android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/mnk_file_path" />
+ </provider>
+ <provider android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
+ <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/mnk_file_path" />
+ </provider>
</application>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
diff --git a/cordova/platforms/android/app/src/main/java/com/ourcodeworld/plugin/DialogShowPicker.java b/cordova/platforms/android/app/src/main/java/com/ourcodeworld/plugin/DialogShowPicker.java
index b9d796125..c6e7bdb83 100644
--- a/cordova/platforms/android/app/src/main/java/com/ourcodeworld/plugin/DialogShowPicker.java
+++ b/cordova/platforms/android/app/src/main/java/com/ourcodeworld/plugin/DialogShowPicker.java
@@ -3,67 +3,42 @@ package com.ourcodeworld.plugins.filebrowser;
import org.apache.cordova.*;
import android.app.Activity;
import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
import android.content.Intent;
-import android.content.Context;
import android.os.Bundle;
import android.net.Uri;
-import java.util.Map;
-import java.util.ArrayList;
-import com.nononsenseapps.filepicker.FilePickerActivity;
-import android.os.Environment;
-import android.os.Build;
import android.content.ClipData;
-public class DialogShowPicker extends Activity{
+public class DialogShowPicker extends Activity {
static final int FILE_CODE = 1;
private boolean firstTime = true;
-
+
@Override
public void onStart() {
super.onStart();
- if(firstTime == true){
+ if (firstTime) {
Bundle extras = getIntent().getExtras();
-
String action = extras.getString("action");
- String startDirectory = extras.getString("start_directory");
- Context context = getApplicationContext();
- Intent i = new Intent(context, FilePickerActivity.class);
- i.putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, true);
- i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ Intent i;
- // Set start up directory in case it's not the android default
- if(startDirectory.equals("default")){
- i.putExtra(FilePickerActivity.EXTRA_START_PATH, Environment.getExternalStorageDirectory().getPath());
- }else{
- i.putExtra(FilePickerActivity.EXTRA_START_PATH, startDirectory);
- }
-
- // Start single filepicker
- if (action.equals("showPicker")) {
- i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false);
- i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_FILE);
- // Start multi filepicker
- }else if(action.equals("showMultiFilepicker")){
- i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, true);
- i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_FILE);
- // Start folder (dir) picker
- }else if(action.equals("showFolderpicker")){
- i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false);
- i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_DIR);
- // Start multi folder (dir) picker
- }else if(action.equals("showMultiFolderpicker")){
- i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, true);
- i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_DIR);
- }else if(action.equals("showMixedPicker")){
- i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, true);
- i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_FILE_AND_DIR);
- }else if(action.equals("showCreatefile")){
- //i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, true);
- i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_NEW_FILE);
+ if (action.equals("showFolderpicker") || action.equals("showMultiFolderpicker")) {
+ i = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+ i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION);
+ } else if (action.equals("showCreatefile")) {
+ i = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+ i.addCategory(Intent.CATEGORY_OPENABLE);
+ i.setType("*/*");
+ i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+ } else {
+ // showPicker, showMultiFilepicker, showMixedPicker
+ i = new Intent(Intent.ACTION_GET_CONTENT);
+ i.addCategory(Intent.CATEGORY_OPENABLE);
+ i.setType("*/*");
+ i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ if (action.equals("showMultiFilepicker") || action.equals("showMixedPicker")) {
+ i.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
+ }
}
startActivityForResult(i, FILE_CODE);
@@ -75,36 +50,17 @@ public class DialogShowPicker extends Activity{
firstTime = false;
JSONArray jsonArray = new JSONArray();
- // Retrieve file, folders paths
- if (requestCode == FILE_CODE && resultCode == Activity.RESULT_OK) {
- if (data.getBooleanExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false)) {
- // For JellyBean and above
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
- ClipData clip = data.getClipData();
-
- if (clip != null) {
- for (int i = 0; i < clip.getItemCount(); i++) {
- jsonArray.put(clip.getItemAt(i).getUri().toString());
- }
- }
- // For Ice Cream Sandwich
- } else {
- ArrayList<String> paths = data.getStringArrayListExtra
- (FilePickerActivity.EXTRA_PATHS);
-
- if (paths != null) {
- for (String path: paths) {
- jsonArray.put(Uri.parse(path).toString());
- }
- }
+ if (requestCode == FILE_CODE && resultCode == Activity.RESULT_OK && data != null) {
+ if (data.getClipData() != null) {
+ ClipData clip = data.getClipData();
+ for (int i = 0; i < clip.getItemCount(); i++) {
+ jsonArray.put(clip.getItemAt(i).getUri().toString());
}
-
- } else {
+ } else if (data.getData() != null) {
jsonArray.put(data.getData().toString());
}
}
- // Send information
Intent intent = new Intent();
intent.putExtra("information", jsonArray.toString());
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
diff --git a/cordova/platforms/android/com.ourcodeworld.plugins.Filebrowser/mobileapp-plugin.gradle b/cordova/platforms/android/com.ourcodeworld.plugins.Filebrowser/mobileapp-plugin.gradle
index 5f9144e02..78fbb3e9f 100644
--- a/cordova/platforms/android/com.ourcodeworld.plugins.Filebrowser/mobileapp-plugin.gradle
+++ b/cordova/platforms/android/com.ourcodeworld.plugins.Filebrowser/mobileapp-plugin.gradle
@@ -1,6 +1,3 @@
dependencies {
- implementation fileTree(dir: '../app/libs', include: ['*.aar'])
- implementation 'androidx.appcompat:appcompat:1.1.0'
- implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.core:core:1.0.0'
}