Skip to content

app: Add support for local sync provider on Android #13860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

app: Add support for local sync provider on Android #13860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 35 additions & 2 deletions app/src/config/repos.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {showMessage} from "../dialog/message";
import {bindSyncCloudListEvent, getSyncCloudList} from "../sync/syncGuide";
import {processSync} from "../dialog/processSystem";
import {getCloudURL} from "./util/about";
import {openByMobile} from "../protyle/util/compatibility";
import {externalFolderPickerMobile, isInAndroid, openByMobile} from "../protyle/util/compatibility";
import {confirmDialog} from "../dialog/confirmDialog";
import {isKernelInMobile} from "../util/functions";

Expand Down Expand Up @@ -180,13 +180,38 @@ const renderProvider = (provider: number) => {
</button>
</div>`;
} else if (provider === 4) {
if (isKernelInMobile()) {
if (isKernelInMobile() && !isInAndroid()) {
return `<div class="b3-label b3-label--inner">
${window.siyuan.languages.syncThirdPartyProviderLocalIntro}
<div class="fn__hr"></div>
<em>${window.siyuan.languages.proFeature}</em>
<div class="fn__hr"></div>
${window.siyuan.languages.deviceNotSupport}
</div>`;
}
else if (isInAndroid()) {
return `<div class="b3-label b3-label--inner">
${window.siyuan.languages.syncThirdPartyProviderLocalIntro}
<div class="fn__hr"></div>
<em>${window.siyuan.languages.proFeature}</em>
</div>
<div class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">Endpoint</div>
<div class="fn__space"></div>
<div class="b3-form__icona fn__block">
<input id="endpoint" class="b3-text-field b3-form__icona-input" value="${window.siyuan.config.sync.local.endpoint}">
<svg class="b3-form__icona-icon" data-action="folderSelectionDialog"><use xlink:href="#iconFolder"></use></svg>
</div>
</div>
<div class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">Timeout (s)</div>
<div class="fn__space"></div>
<input id="timeout" class="b3-text-field fn__block" type="number" min="7" max="300" value="${window.siyuan.config.sync.local.timeout}">
</div>
<div class="b3-label b3-label--inner fn__flex">
<div class="fn__flex-center fn__size200">Concurrent Reqs</div>
<div class="fn__space"></div>
<input id="localConcurrentReqs" class="b3-text-field fn__block" type="number" min="1" max="1024" value="${window.siyuan.config.sync.local.concurrentReqs}">
</div>`;
}
return `<div class="b3-label b3-label--inner">
Expand Down Expand Up @@ -623,6 +648,14 @@ export const repos = {
fetchPost("/api/repo/purgeCloudRepo");
});
break;
} else if (action === "folderSelectionDialog") {
const selectedPath = externalFolderPickerMobile();
const endpointInput = target.parentElement.querySelector("#endpoint") as HTMLInputElement;
if (endpointInput && selectedPath) {
endpointInput.value = selectedPath;
endpointInput.dispatchEvent(new Event('blur'));
}
break;
}
target = target.parentElement;
}
Expand Down
8 changes: 8 additions & 0 deletions app/src/protyle/util/compatibility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ export const openByMobile = (uri: string) => {
}
};

export const externalFolderPickerMobile = () => {
if (isInAndroid()) {
return window.JSAndroid.getLocalFileSystemPath();
}

return null
};

export const readText = () => {
if (isInAndroid()) {
return window.JSAndroid.readClipboard();
Expand Down
1 change: 1 addition & 0 deletions app/src/types/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ interface Window {
writeImageClipboard(uri: string): void
readClipboard(): string
getBlockURL(): string
getLocalFileSystemPath(): string
}
JSHarmony: {
openExternal(url: string): void
Expand Down
Loading