Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions platform/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ android {
applicationId = "cn.lineai"
minSdk = huxeruiMinSdk
targetSdk = huxeruiTargetSdk
versionCode = 36
versionName = "1.3.2"
versionCode = 37
versionName = "1.3.3"

externalNativeBuild {
cmake {
Expand Down
9 changes: 7 additions & 2 deletions platform/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,12 @@
<provider
android:name=".platform.WorkspaceDirectoryProvider"
android:authorities="${applicationId}.workspace"
android:exported="false"
android:grantUriPermissions="true" />
android:exported="true"
android:grantUriPermissions="true"
android:permission="android.permission.MANAGE_DOCUMENTS">
<intent-filter>
<action android:name="android.content.action.DOCUMENTS_PROVIDER" />
</intent-filter>
</provider>
</application>
</manifest>
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package cn.lineai.platform;

import android.content.ClipData;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.provider.DocumentsContract;
import android.widget.Toast;

import cn.lineai.R;
Expand All @@ -12,7 +12,7 @@
import org.huxerui.HuxerUIPlatformModule;
import org.huxerui.PlatformPayload;

/** Android boundary for opening the private LineCode workspace directory. */
/** Android boundary for opening the LineCode workspace in the system picker. */
public final class LineCodeWorkspaceDirectoryShareModule
implements HuxerUIPlatformModule.Factory {
@Override
Expand All @@ -38,7 +38,7 @@ public HuxerUIPlatformChannel.Cancellation invoke(
String method,
PlatformPayload arguments,
HuxerUIPlatformChannel.Result result) {
if (!"openHome".equals(method)) {
if (!"mountWorkspace".equals(method)) {
result.fail(
"linecode/workspace-directory-share/not-implemented",
"Unknown workspace-directory-share method: " + method,
Expand All @@ -47,7 +47,7 @@ public HuxerUIPlatformChannel.Cancellation invoke(
}
try {
arguments.requireNull();
openHome(context);
mountWorkspace(context);
result.complete(PlatformPayload.nullValue());
} catch (RuntimeException error) {
Toast.makeText(
Expand All @@ -70,45 +70,20 @@ public void dispose() {
}
}

private static void openHome(Context context) {
File home = WorkspaceDirectoryProvider.homeDirectory(context);
if (!home.isDirectory() && !home.mkdirs()) {
private static void mountWorkspace(Context context) {
File workspace = WorkspaceDirectoryProvider.workspaceDirectory(context);
if (!workspace.isDirectory() && !workspace.mkdirs()) {
throw new IllegalStateException(
context.getString(R.string.workspace_provider_open_failed));
}

Uri homeUri = WorkspaceDirectoryProvider.fileUri(context, "home");
Intent view = new Intent(Intent.ACTION_VIEW);
view.setDataAndType(homeUri, "resource/folder");
view.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
| Intent.FLAG_GRANT_WRITE_URI_PERMISSION
| Intent.FLAG_ACTIVITY_NEW_TASK);
Intent chooser = Intent.createChooser(
view, context.getString(R.string.workspace_provider_open_title));
chooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
if (context.getPackageManager().queryIntentActivities(view, 0).isEmpty()) {
openSendFallback(context, home);
return;
}
try {
context.startActivity(chooser);
} catch (RuntimeException primary) {
openSendFallback(context, home);
Intent picker = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
picker.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_GRANT_READ_URI_PERMISSION
| Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
picker.putExtra(DocumentsContract.EXTRA_INITIAL_URI,
WorkspaceDirectoryProvider.rootDocumentUri(context));
}
}

private static void openSendFallback(Context context, File home) {
Uri rootUri = WorkspaceDirectoryProvider.rootUri(context);
Intent send = new Intent(Intent.ACTION_SEND);
send.setType("text/plain");
send.putExtra(Intent.EXTRA_TEXT, home.getAbsolutePath());
send.putExtra(Intent.EXTRA_STREAM, rootUri);
send.setClipData(ClipData.newRawUri("LineCode workspace", rootUri));
send.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
| Intent.FLAG_ACTIVITY_NEW_TASK);
Intent fallback = Intent.createChooser(
send, context.getString(R.string.workspace_provider_open_title));
fallback.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(fallback);
context.startActivity(picker);
}
}
Loading
Loading