Compare commits
2 Commits
android-fi
...
meeting-me
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b6f9533f07 | ||
|
|
e9ea89edae |
@@ -1,251 +0,0 @@
|
||||
# Android File Saver Plugin Implementation Guide
|
||||
|
||||
## Overview
|
||||
|
||||
This document outlines the implementation of the `AndroidFileSaver` Capacitor plugin that provides Storage Access Framework (SAF) and MediaStore functionality for direct file saving on Android devices.
|
||||
|
||||
## Plugin Purpose
|
||||
|
||||
The `AndroidFileSaver` plugin enables two key file operations:
|
||||
1. **`saveToDownloads`**: Direct save to Downloads folder using MediaStore (API 29+)
|
||||
2. **`saveAs`**: User-chosen location using Storage Access Framework (SAF)
|
||||
|
||||
## Implementation Requirements
|
||||
|
||||
### 1. Plugin Structure
|
||||
|
||||
```typescript
|
||||
// Plugin interface
|
||||
interface AndroidFileSaverPlugin {
|
||||
saveToDownloads(options: {
|
||||
fileName: string;
|
||||
content: string;
|
||||
mimeType: string
|
||||
}): Promise<{
|
||||
success: boolean;
|
||||
path?: string;
|
||||
error?: string
|
||||
}>;
|
||||
|
||||
saveAs(options: {
|
||||
fileName: string;
|
||||
content: string;
|
||||
mimeType: string
|
||||
}): Promise<{
|
||||
success: boolean;
|
||||
path?: string;
|
||||
error?: string
|
||||
}>;
|
||||
}
|
||||
```
|
||||
|
||||
### 2. Android Implementation
|
||||
|
||||
#### MediaStore for Downloads (API 29+)
|
||||
|
||||
```java
|
||||
@PluginMethod
|
||||
public void saveToDownloads(PluginCall call) {
|
||||
String fileName = call.getString("fileName");
|
||||
String content = call.getString("content");
|
||||
String mimeType = call.getString("mimeType");
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||
// Use MediaStore for Downloads
|
||||
ContentValues values = new ContentValues();
|
||||
values.put(MediaStore.Downloads.DISPLAY_NAME, fileName);
|
||||
values.put(MediaStore.Downloads.MIME_TYPE, mimeType);
|
||||
values.put(MediaStore.Downloads.IS_PENDING, 1);
|
||||
|
||||
ContentResolver resolver = getContext().getContentResolver();
|
||||
Uri uri = resolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, values);
|
||||
|
||||
if (uri != null) {
|
||||
try (ParcelFileDescriptor pfd = resolver.openFileDescriptor(uri, "w")) {
|
||||
if (pfd != null) {
|
||||
try (FileOutputStream fos = new FileOutputStream(pfd.getFileDescriptor())) {
|
||||
fos.write(content.getBytes());
|
||||
fos.flush();
|
||||
|
||||
// Mark as no longer pending
|
||||
values.clear();
|
||||
values.put(MediaStore.Downloads.IS_PENDING, 0);
|
||||
resolver.update(uri, values, null, null);
|
||||
|
||||
call.resolve(new JSObject()
|
||||
.put("success", true)
|
||||
.put("path", uri.toString()));
|
||||
return;
|
||||
}
|
||||
}
|
||||
} catch (IOException e) {
|
||||
resolver.delete(uri, null, null);
|
||||
}
|
||||
}
|
||||
|
||||
call.resolve(new JSObject()
|
||||
.put("success", false)
|
||||
.put("error", "Failed to save file"));
|
||||
} else {
|
||||
// Fallback for older Android versions
|
||||
call.resolve(new JSObject()
|
||||
.put("success", false)
|
||||
.put("error", "Requires Android API 29+"));
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### Storage Access Framework (SAF) for Save As
|
||||
|
||||
```java
|
||||
@PluginMethod
|
||||
public void saveAs(PluginCall call) {
|
||||
String fileName = call.getString("fileName");
|
||||
String content = call.getString("content");
|
||||
String mimeType = call.getString("mimeType");
|
||||
|
||||
// Store call for later use
|
||||
bridge.saveCall(call);
|
||||
|
||||
// Create intent for SAF
|
||||
Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
|
||||
intent.addCategory(Intent.CATEGORY_OPENABLE);
|
||||
intent.setType(mimeType);
|
||||
intent.putExtra(Intent.EXTRA_TITLE, fileName);
|
||||
|
||||
// Start activity for result
|
||||
bridge.startActivityForResult(call, intent, "saveAsResult");
|
||||
}
|
||||
|
||||
@ActivityCallback
|
||||
private void saveAsResult(PluginCall call, ActivityResult result) {
|
||||
if (result.getResultCode() == Activity.RESULT_OK && result.getData() != null) {
|
||||
Uri uri = result.getData().getData();
|
||||
String content = call.getString("content");
|
||||
|
||||
try (ParcelFileDescriptor pfd = getContext().getContentResolver()
|
||||
.openFileDescriptor(uri, "w")) {
|
||||
if (pfd != null) {
|
||||
try (FileOutputStream fos = new FileOutputStream(pfd.getFileDescriptor())) {
|
||||
fos.write(content.getBytes());
|
||||
fos.flush();
|
||||
|
||||
call.resolve(new JSObject()
|
||||
.put("success", true)
|
||||
.put("path", uri.toString()));
|
||||
return;
|
||||
}
|
||||
}
|
||||
} catch (IOException e) {
|
||||
// Handle error
|
||||
}
|
||||
|
||||
call.resolve(new JSObject()
|
||||
.put("success", false)
|
||||
.put("error", "Failed to save file"));
|
||||
} else {
|
||||
call.resolve(new JSObject()
|
||||
.put("success", false)
|
||||
.put("error", "User cancelled or failed"));
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### 3. Plugin Registration
|
||||
|
||||
```java
|
||||
@CapacitorPlugin(name = "AndroidFileSaver")
|
||||
public class AndroidFileSaverPlugin extends Plugin {
|
||||
// Implementation methods here
|
||||
}
|
||||
```
|
||||
|
||||
## Integration Steps
|
||||
|
||||
### 1. Create Plugin Project
|
||||
|
||||
```bash
|
||||
# Create new Capacitor plugin
|
||||
npx @capacitor/cli plugin:generate android-file-saver
|
||||
cd android-file-saver
|
||||
```
|
||||
|
||||
### 2. Add to Android Project
|
||||
|
||||
```bash
|
||||
# In your main project
|
||||
npm install ./android-file-saver
|
||||
npx cap sync android
|
||||
```
|
||||
|
||||
### 3. Update Android Manifest
|
||||
|
||||
Ensure the following permissions are present:
|
||||
|
||||
```xml
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
|
||||
android:maxSdkVersion="28" />
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
|
||||
android:maxSdkVersion="32" />
|
||||
```
|
||||
|
||||
## Fallback Behavior
|
||||
|
||||
When the plugin is not available, the system falls back to:
|
||||
1. **Web**: Browser download mechanism
|
||||
2. **Electron**: Native file save via IPC
|
||||
3. **Capacitor**: Share dialog (existing behavior)
|
||||
|
||||
## Testing
|
||||
|
||||
### 1. Plugin Availability
|
||||
|
||||
```typescript
|
||||
// Check if plugin is available
|
||||
if (AndroidFileSaver) {
|
||||
// Plugin available - use native methods
|
||||
} else {
|
||||
// Plugin not available - use fallback
|
||||
}
|
||||
```
|
||||
|
||||
### 2. Error Handling
|
||||
|
||||
```typescript
|
||||
try {
|
||||
const result = await AndroidFileSaver.saveToDownloads({
|
||||
fileName: "test.json",
|
||||
content: '{"test": "data"}',
|
||||
mimeType: "application/json"
|
||||
});
|
||||
|
||||
if (result.success) {
|
||||
logger.info("File saved:", result.path);
|
||||
} else {
|
||||
logger.error("Save failed:", result.error);
|
||||
}
|
||||
} catch (error) {
|
||||
logger.error("Plugin error:", error);
|
||||
}
|
||||
```
|
||||
|
||||
## Security Considerations
|
||||
|
||||
1. **Content Validation**: Validate file content before saving
|
||||
2. **MIME Type Verification**: Ensure MIME type matches file content
|
||||
3. **Permission Handling**: Request storage permissions appropriately
|
||||
4. **Error Logging**: Log errors without exposing sensitive data
|
||||
|
||||
## Future Enhancements
|
||||
|
||||
1. **Progress Callbacks**: Add progress reporting for large files
|
||||
2. **Batch Operations**: Support saving multiple files
|
||||
3. **Custom Locations**: Allow saving to app-specific directories
|
||||
4. **File Compression**: Add optional file compression
|
||||
|
||||
## References
|
||||
|
||||
- [Android Storage Access Framework](https://developer.android.com/guide/topics/providers/document-provider)
|
||||
- [MediaStore Downloads](https://developer.android.com/reference/android/provider/MediaStore.Downloads)
|
||||
- [Capacitor Plugin Development](https://capacitorjs.com/docs/plugins/android)
|
||||
- [Android Scoped Storage](https://developer.android.com/training/data-storage)
|
||||
@@ -25,46 +25,33 @@ messages * - Conditional UI based on platform capabilities * * @component *
|
||||
Backup Identifier Seed
|
||||
</router-link>
|
||||
|
||||
<div class="flex flex-col gap-2 mt-2">
|
||||
<button
|
||||
:disabled="isExporting"
|
||||
:class="shareButtonClasses"
|
||||
@click="shareContacts()"
|
||||
>
|
||||
{{ isExporting ? "Exporting..." : "Share Contacts" }}
|
||||
</button>
|
||||
|
||||
<button
|
||||
:disabled="isExporting"
|
||||
:class="saveButtonClasses"
|
||||
@click="saveContactsToDevice()"
|
||||
>
|
||||
{{ isExporting ? "Exporting..." : "Save to Device" }}
|
||||
</button>
|
||||
</div>
|
||||
<button
|
||||
:disabled="isExporting"
|
||||
:class="exportButtonClasses"
|
||||
@click="exportDatabase()"
|
||||
>
|
||||
{{ isExporting ? "Exporting..." : "Download Contacts" }}
|
||||
</button>
|
||||
|
||||
<div
|
||||
v-if="capabilities.needsFileHandlingInstructions"
|
||||
:class="instructionsContainerClasses"
|
||||
>
|
||||
<p>Choose how you want to export your contacts:</p>
|
||||
<p>
|
||||
After the export, you can save the file in your preferred storage
|
||||
location.
|
||||
</p>
|
||||
<ul>
|
||||
<li :class="listItemClasses">
|
||||
<strong>Share Contacts:</strong> Opens the system share dialog to send
|
||||
to apps like Gmail, Drive, or messaging apps.
|
||||
</li>
|
||||
<li :class="listItemClasses">
|
||||
<strong>Save to Device:</strong> Saves directly to your device's
|
||||
Downloads folder (Android) or Documents folder (iOS).
|
||||
</li>
|
||||
<li v-if="capabilities.isIOS" :class="listItemClasses">
|
||||
On iOS: Files are saved to the Files app in your Documents folder.
|
||||
On iOS: You will be prompted to choose a location to save your backup
|
||||
file.
|
||||
</li>
|
||||
<li
|
||||
v-if="capabilities.isMobile && !capabilities.isIOS"
|
||||
:class="listItemClasses"
|
||||
>
|
||||
On Android: Files are saved directly to your Downloads folder.
|
||||
On Android: You will be prompted to choose a location to save your
|
||||
backup file.
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -164,20 +151,6 @@ export default class DataExportSection extends Vue {
|
||||
return "block w-full text-center text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md disabled:opacity-50 disabled:cursor-not-allowed";
|
||||
}
|
||||
|
||||
/**
|
||||
* CSS classes for the share button
|
||||
*/
|
||||
get shareButtonClasses(): string {
|
||||
return "block w-full text-center text-md bg-gradient-to-b from-green-400 to-green-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md disabled:opacity-50 disabled:cursor-not-allowed";
|
||||
}
|
||||
|
||||
/**
|
||||
* CSS classes for the save to device button
|
||||
*/
|
||||
get saveButtonClasses(): string {
|
||||
return "block w-full text-center text-md bg-gradient-to-b from-purple-400 to-purple-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md disabled:opacity-50 disabled:cursor-not-allowed";
|
||||
}
|
||||
|
||||
/**
|
||||
* CSS classes for the instructions container
|
||||
*/
|
||||
@@ -255,100 +228,6 @@ export default class DataExportSection extends Vue {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Shares contacts data using the platform's share functionality
|
||||
* Opens the system share dialog for app-to-app handoff
|
||||
*
|
||||
* @throws {Error} If sharing fails
|
||||
*/
|
||||
public async shareContacts(): Promise<void> {
|
||||
if (this.isExporting) {
|
||||
return; // Prevent multiple simultaneous exports
|
||||
}
|
||||
|
||||
try {
|
||||
this.isExporting = true;
|
||||
|
||||
// Fetch contacts from database using mixin's cached method
|
||||
const allContacts = await this.$contacts();
|
||||
|
||||
// Convert contacts to export format
|
||||
const processedContacts: Contact[] = allContacts.map((contact) => {
|
||||
const exContact: Contact = R.omit(["contactMethods"], contact);
|
||||
exContact.contactMethods = contact.contactMethods
|
||||
? typeof contact.contactMethods === "string" &&
|
||||
contact.contactMethods.trim() !== ""
|
||||
? JSON.parse(contact.contactMethods)
|
||||
: []
|
||||
: [];
|
||||
return exContact;
|
||||
});
|
||||
|
||||
const exportData = contactsToExportJson(processedContacts);
|
||||
const jsonStr = JSON.stringify(exportData, null, 2);
|
||||
|
||||
// Use platform service to share the file
|
||||
await this.platformService.writeAndShareFile(this.fileName, jsonStr);
|
||||
|
||||
this.notify.success(
|
||||
"Contact sharing completed successfully. Use the share dialog to send to your preferred app.",
|
||||
);
|
||||
} catch (error) {
|
||||
logger.error("Share Error:", error);
|
||||
this.notify.error(
|
||||
`There was an error sharing the data: ${error instanceof Error ? error.message : "Unknown error"}`,
|
||||
);
|
||||
} finally {
|
||||
this.isExporting = false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves contacts data directly to the device's storage
|
||||
* Uses platform-specific save methods (Downloads folder, Documents, etc.)
|
||||
*
|
||||
* @throws {Error} If saving fails
|
||||
*/
|
||||
public async saveContactsToDevice(): Promise<void> {
|
||||
if (this.isExporting) {
|
||||
return; // Prevent multiple simultaneous exports
|
||||
}
|
||||
|
||||
try {
|
||||
this.isExporting = true;
|
||||
|
||||
// Fetch contacts from database using mixin's cached method
|
||||
const allContacts = await this.$contacts();
|
||||
|
||||
// Convert contacts to export format
|
||||
const processedContacts: Contact[] = allContacts.map((contact) => {
|
||||
const exContact: Contact = R.omit(["contactMethods"], contact);
|
||||
exContact.contactMethods = contact.contactMethods
|
||||
? typeof contact.contactMethods === "string" &&
|
||||
contact.contactMethods.trim() !== ""
|
||||
? JSON.parse(contact.contactMethods)
|
||||
: []
|
||||
: [];
|
||||
return exContact;
|
||||
});
|
||||
|
||||
const exportData = contactsToExportJson(processedContacts);
|
||||
const jsonStr = JSON.stringify(exportData, null, 2);
|
||||
|
||||
// Use platform service to save directly to device
|
||||
await this.platformService.saveToDevice(this.fileName, jsonStr);
|
||||
|
||||
this.notify.success("Contact data saved successfully to your device.");
|
||||
} catch (error) {
|
||||
logger.error("Save Error:", error);
|
||||
this.notify.error(
|
||||
`There was an error saving the data: ${error instanceof Error ? error.message : "Unknown error"}`,
|
||||
);
|
||||
} finally {
|
||||
this.isExporting = false;
|
||||
}
|
||||
}
|
||||
|
||||
created() {
|
||||
this.notify = createNotifyHelpers(this.$notify);
|
||||
this.loadSeedBackupStatus();
|
||||
|
||||
@@ -28,26 +28,14 @@
|
||||
v-if="membersToShow().length > 0 && showOrganizerTools && isOrganizer"
|
||||
>
|
||||
Click
|
||||
<span
|
||||
class="inline-block w-5 h-5 rounded-full bg-blue-100 text-blue-600 text-center"
|
||||
>
|
||||
<font-awesome icon="plus" class="text-sm" />
|
||||
</span>
|
||||
<font-awesome icon="circle-plus" class="text-blue-500 text-sm" />
|
||||
/
|
||||
<span
|
||||
class="inline-block w-5 h-5 rounded-full bg-blue-100 text-blue-600 text-center"
|
||||
>
|
||||
<font-awesome icon="minus" class="text-sm" />
|
||||
</span>
|
||||
<font-awesome icon="circle-minus" class="text-rose-500 text-sm" />
|
||||
to add/remove them to/from the meeting.
|
||||
</li>
|
||||
<li v-if="membersToShow().length > 0">
|
||||
Click
|
||||
<span
|
||||
class="inline-block w-5 h-5 rounded-full bg-green-100 text-green-600 text-center"
|
||||
>
|
||||
<font-awesome icon="circle-user" class="text-sm" />
|
||||
</span>
|
||||
<font-awesome icon="circle-user" class="text-green-600 text-sm" />
|
||||
to add them to your contacts.
|
||||
</li>
|
||||
</ul>
|
||||
@@ -66,6 +54,15 @@
|
||||
Refresh
|
||||
<span class="text-xs">({{ countdownTimer }}s)</span>
|
||||
</button>
|
||||
|
||||
<button
|
||||
v-if="getPendingMembersCount() > 0"
|
||||
class="text-sm bg-gradient-to-b from-blue-100 to-blue-200 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.2)] text-blue-800 px-3 py-1.5 rounded-md"
|
||||
@click="showAdmitAllPendingDialog"
|
||||
>
|
||||
<font-awesome icon="circle-plus" class="text-blue-500" />
|
||||
Admit Pending
|
||||
</button>
|
||||
</div>
|
||||
<ul
|
||||
v-if="membersToShow().length > 0"
|
||||
@@ -74,16 +71,38 @@
|
||||
<li
|
||||
v-for="member in membersToShow()"
|
||||
:key="member.member.memberId"
|
||||
class="border-b border-slate-300 py-1.5"
|
||||
:class="[
|
||||
'border-b px-2 sm:px-3 py-1.5',
|
||||
{
|
||||
'bg-blue-50 border-t border-blue-300 -mt-[1px]':
|
||||
!member.member.admitted,
|
||||
},
|
||||
{ 'border-slate-300': member.member.admitted },
|
||||
]"
|
||||
>
|
||||
<div class="flex items-center gap-2 justify-between">
|
||||
<div class="flex items-center gap-1 overflow-hidden">
|
||||
<h3 class="font-semibold truncate">
|
||||
<h3
|
||||
:class="[
|
||||
'font-semibold truncate',
|
||||
{ 'text-slate-500': !member.member.admitted },
|
||||
]"
|
||||
>
|
||||
<font-awesome
|
||||
v-if="member.member.memberId === members[0]?.memberId"
|
||||
icon="crown"
|
||||
class="fa-fw text-amber-400"
|
||||
/>
|
||||
<font-awesome
|
||||
v-if="!member.member.admitted"
|
||||
icon="hourglass-half"
|
||||
class="fa-fw text-slate-400"
|
||||
/>
|
||||
{{ member.name || unnamedMember }}
|
||||
</h3>
|
||||
<div
|
||||
v-if="!getContactFor(member.did) && member.did !== activeDid"
|
||||
class="flex items-center gap-1"
|
||||
class="flex items-center gap-1.5 ms-1"
|
||||
>
|
||||
<button
|
||||
class="btn-add-contact"
|
||||
@@ -102,7 +121,7 @@
|
||||
)
|
||||
"
|
||||
>
|
||||
<font-awesome icon="circle-info" class="text-sm" />
|
||||
<font-awesome icon="circle-info" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -110,17 +129,23 @@
|
||||
v-if="
|
||||
showOrganizerTools && isOrganizer && member.did !== activeDid
|
||||
"
|
||||
class="flex items-center gap-1"
|
||||
class="flex items-center gap-1.5"
|
||||
>
|
||||
<button
|
||||
class="btn-admission"
|
||||
:class="
|
||||
member.member.admitted
|
||||
? 'btn-admission-remove'
|
||||
: 'btn-admission-add'
|
||||
"
|
||||
:title="
|
||||
member.member.admitted ? 'Remove member' : 'Admit member'
|
||||
"
|
||||
@click="checkWhetherContactBeforeAdmitting(member)"
|
||||
>
|
||||
<font-awesome
|
||||
:icon="member.member.admitted ? 'minus' : 'plus'"
|
||||
:icon="
|
||||
member.member.admitted ? 'circle-minus' : 'circle-plus'
|
||||
"
|
||||
/>
|
||||
</button>
|
||||
|
||||
@@ -129,7 +154,7 @@
|
||||
title="Admission Info"
|
||||
@click="informAboutAdmission()"
|
||||
>
|
||||
<font-awesome icon="circle-info" class="text-sm" />
|
||||
<font-awesome icon="circle-info" />
|
||||
</button>
|
||||
</span>
|
||||
</div>
|
||||
@@ -189,6 +214,7 @@ import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
||||
import {
|
||||
NOTIFY_ADD_CONTACT_FIRST,
|
||||
NOTIFY_CONTINUE_WITHOUT_ADDING,
|
||||
NOTIFY_ADMIT_ALL_PENDING,
|
||||
} from "@/constants/notifications";
|
||||
import { SOMEONE_UNNAMED } from "@/constants/entities";
|
||||
import SetBulkVisibilityDialog from "./SetBulkVisibilityDialog.vue";
|
||||
@@ -378,17 +404,44 @@ export default class MembersList extends Vue {
|
||||
}
|
||||
|
||||
membersToShow(): DecryptedMember[] {
|
||||
let members: DecryptedMember[] = [];
|
||||
|
||||
if (this.isOrganizer) {
|
||||
if (this.showOrganizerTools) {
|
||||
return this.decryptedMembers;
|
||||
members = this.decryptedMembers;
|
||||
} else {
|
||||
return this.decryptedMembers.filter(
|
||||
members = this.decryptedMembers.filter(
|
||||
(member: DecryptedMember) => member.member.admitted,
|
||||
);
|
||||
}
|
||||
} else {
|
||||
// non-organizers only get visible members from server
|
||||
members = this.decryptedMembers;
|
||||
}
|
||||
// non-organizers only get visible members from server
|
||||
return this.decryptedMembers;
|
||||
|
||||
// Sort members according to priority:
|
||||
// 1. Organizer at the top
|
||||
// 2. Non-admitted members next
|
||||
// 3. Everyone else after
|
||||
return members.sort((a, b) => {
|
||||
// Check if either member is the organizer (first member in original list)
|
||||
const aIsOrganizer = a.member.memberId === this.members[0]?.memberId;
|
||||
const bIsOrganizer = b.member.memberId === this.members[0]?.memberId;
|
||||
|
||||
// Organizer always comes first
|
||||
if (aIsOrganizer && !bIsOrganizer) return -1;
|
||||
if (!aIsOrganizer && bIsOrganizer) return 1;
|
||||
|
||||
// If both are organizers or neither are organizers, sort by admission status
|
||||
if (aIsOrganizer && bIsOrganizer) return 0; // Both organizers, maintain original order
|
||||
|
||||
// Non-admitted members come before admitted members
|
||||
if (!a.member.admitted && b.member.admitted) return -1;
|
||||
if (a.member.admitted && !b.member.admitted) return 1;
|
||||
|
||||
// If admission status is the same, maintain original order
|
||||
return 0;
|
||||
});
|
||||
}
|
||||
|
||||
informAboutAdmission() {
|
||||
@@ -701,6 +754,114 @@ export default class MembersList extends Vue {
|
||||
this.startAutoRefresh();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get count of pending (non-admitted) members
|
||||
*/
|
||||
getPendingMembersCount(): number {
|
||||
return this.decryptedMembers.filter(
|
||||
(member) => !member.member.admitted && member.did !== this.activeDid,
|
||||
).length;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get list of pending members
|
||||
*/
|
||||
getPendingMembers(): DecryptedMember[] {
|
||||
return this.decryptedMembers.filter(
|
||||
(member) => !member.member.admitted && member.did !== this.activeDid,
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the admit all pending members dialog
|
||||
*/
|
||||
showAdmitAllPendingDialog() {
|
||||
const pendingCount = this.getPendingMembersCount();
|
||||
|
||||
if (pendingCount === 0) {
|
||||
this.notify.info(
|
||||
"There are no pending members to admit.",
|
||||
TIMEOUTS.STANDARD,
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
// Pause auto-refresh when dialog opens
|
||||
this.stopAutoRefresh();
|
||||
|
||||
const dialogText = NOTIFY_ADMIT_ALL_PENDING.text.replace(
|
||||
"{count}",
|
||||
pendingCount.toString(),
|
||||
);
|
||||
|
||||
this.$notify(
|
||||
{
|
||||
group: "modal",
|
||||
type: "confirm",
|
||||
title: NOTIFY_ADMIT_ALL_PENDING.title,
|
||||
text: dialogText,
|
||||
yesText: NOTIFY_ADMIT_ALL_PENDING.yesText,
|
||||
noText: NOTIFY_ADMIT_ALL_PENDING.noText,
|
||||
onYes: async () => {
|
||||
await this.admitAllPendingMembers(true); // true = add to contacts
|
||||
// Resume auto-refresh after action
|
||||
this.startAutoRefresh();
|
||||
},
|
||||
onNo: async () => {
|
||||
await this.admitAllPendingMembers(false); // false = don't add to contacts
|
||||
// Resume auto-refresh after action
|
||||
this.startAutoRefresh();
|
||||
},
|
||||
onCancel: async () => {
|
||||
// Do nothing - user cancelled
|
||||
// Resume auto-refresh after cancellation
|
||||
this.startAutoRefresh();
|
||||
},
|
||||
},
|
||||
TIMEOUTS.MODAL,
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Admit all pending members with optional contact addition
|
||||
*/
|
||||
async admitAllPendingMembers(addToContacts: boolean) {
|
||||
const pendingMembers = this.getPendingMembers();
|
||||
|
||||
if (pendingMembers.length === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
// Process each pending member
|
||||
for (const member of pendingMembers) {
|
||||
// Add to contacts if requested and not already a contact
|
||||
if (addToContacts && !this.getContactFor(member.did)) {
|
||||
await this.addAsContact(member);
|
||||
}
|
||||
|
||||
// Admit the member
|
||||
await this.toggleAdmission(member);
|
||||
}
|
||||
|
||||
// Show success message
|
||||
const contactMessage = addToContacts ? " and added to your contacts" : "";
|
||||
this.notify.success(
|
||||
`All ${pendingMembers.length} pending members have been admitted${contactMessage}.`,
|
||||
TIMEOUTS.STANDARD,
|
||||
);
|
||||
} catch (error) {
|
||||
this.$logAndConsole(
|
||||
"Error admitting all pending members: " + errorStringForLog(error),
|
||||
true,
|
||||
);
|
||||
this.notify.error(
|
||||
"Failed to admit some members. Please try again.",
|
||||
TIMEOUTS.LONG,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
beforeDestroy() {
|
||||
this.stopAutoRefresh();
|
||||
}
|
||||
@@ -718,23 +879,26 @@ export default class MembersList extends Vue {
|
||||
|
||||
.btn-add-contact {
|
||||
/* stylelint-disable-next-line at-rule-no-unknown */
|
||||
@apply w-6 h-6 flex items-center justify-center rounded-full
|
||||
bg-green-100 text-green-600 hover:bg-green-200 hover:text-green-800
|
||||
@apply text-lg text-green-600 hover:text-green-800
|
||||
transition-colors;
|
||||
}
|
||||
|
||||
.btn-info-contact,
|
||||
.btn-info-admission {
|
||||
/* stylelint-disable-next-line at-rule-no-unknown */
|
||||
@apply w-6 h-6 flex items-center justify-center rounded-full
|
||||
bg-slate-100 text-slate-400 hover:text-slate-600
|
||||
@apply text-slate-400 hover:text-slate-600
|
||||
transition-colors;
|
||||
}
|
||||
|
||||
.btn-admission {
|
||||
.btn-admission-add {
|
||||
/* stylelint-disable-next-line at-rule-no-unknown */
|
||||
@apply w-6 h-6 flex items-center justify-center rounded-full
|
||||
bg-blue-100 text-blue-600 hover:bg-blue-200 hover:text-blue-800
|
||||
@apply text-lg text-blue-500 hover:text-blue-700
|
||||
transition-colors;
|
||||
}
|
||||
|
||||
.btn-admission-remove {
|
||||
/* stylelint-disable-next-line at-rule-no-unknown */
|
||||
@apply text-lg text-rose-500 hover:text-rose-700
|
||||
transition-colors;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -471,6 +471,14 @@ export const NOTIFY_CONTINUE_WITHOUT_ADDING = {
|
||||
noText: "No, Cancel",
|
||||
};
|
||||
|
||||
// Used in: MembersList.vue (complex modal for admitting all pending members)
|
||||
export const NOTIFY_ADMIT_ALL_PENDING = {
|
||||
title: "Admit All Pending Members",
|
||||
text: "You are about to admit {count} pending member/s. Would you also like to add them to your Contacts list?",
|
||||
yesText: "Admit and Add to Contacts",
|
||||
noText: "Admit Only",
|
||||
};
|
||||
|
||||
// HelpNotificationsView.vue specific constants
|
||||
// Used in: HelpNotificationsView.vue (sendTestWebPushMessage method - not subscribed error)
|
||||
export const NOTIFY_PUSH_NOT_SUBSCRIBED = {
|
||||
|
||||
@@ -29,6 +29,7 @@ import {
|
||||
faCircle,
|
||||
faCircleCheck,
|
||||
faCircleInfo,
|
||||
faCircleMinus,
|
||||
faCirclePlus,
|
||||
faCircleQuestion,
|
||||
faCircleRight,
|
||||
@@ -37,6 +38,7 @@ import {
|
||||
faCoins,
|
||||
faComment,
|
||||
faCopy,
|
||||
faCrown,
|
||||
faDollar,
|
||||
faDownload,
|
||||
faEllipsis,
|
||||
@@ -58,6 +60,7 @@ import {
|
||||
faHand,
|
||||
faHandHoldingDollar,
|
||||
faHandHoldingHeart,
|
||||
faHourglassHalf,
|
||||
faHouseChimney,
|
||||
faImage,
|
||||
faImagePortrait,
|
||||
@@ -123,6 +126,7 @@ library.add(
|
||||
faCircle,
|
||||
faCircleCheck,
|
||||
faCircleInfo,
|
||||
faCircleMinus,
|
||||
faCirclePlus,
|
||||
faCircleQuestion,
|
||||
faCircleRight,
|
||||
@@ -131,6 +135,7 @@ library.add(
|
||||
faCoins,
|
||||
faComment,
|
||||
faCopy,
|
||||
faCrown,
|
||||
faDollar,
|
||||
faDownload,
|
||||
faEllipsis,
|
||||
@@ -152,6 +157,7 @@ library.add(
|
||||
faHand,
|
||||
faHandHoldingDollar,
|
||||
faHandHoldingHeart,
|
||||
faHourglassHalf,
|
||||
faHouseChimney,
|
||||
faImage,
|
||||
faImagePortrait,
|
||||
|
||||
@@ -88,24 +88,6 @@ export interface PlatformService {
|
||||
*/
|
||||
writeAndShareFile(fileName: string, content: string): Promise<void>;
|
||||
|
||||
/**
|
||||
* Saves content directly to the device's Downloads folder (Android) or Documents folder (iOS).
|
||||
* Uses MediaStore on Android API 29+ and falls back to SAF on older versions.
|
||||
* @param fileName - The filename of the file to save
|
||||
* @param content - The content to write to the file
|
||||
* @returns Promise that resolves when the file is saved
|
||||
*/
|
||||
saveToDevice(fileName: string, content: string): Promise<void>;
|
||||
|
||||
/**
|
||||
* Opens the system file picker to let the user choose where to save a file.
|
||||
* Uses Storage Access Framework (SAF) on Android and appropriate APIs on other platforms.
|
||||
* @param fileName - The suggested filename for the file
|
||||
* @param content - The content to write to the file
|
||||
* @returns Promise that resolves when the file is saved
|
||||
*/
|
||||
saveAs(fileName: string, content: string): Promise<void>;
|
||||
|
||||
/**
|
||||
* Deletes a file at the specified path.
|
||||
* @param path - The path to the file to delete
|
||||
|
||||
@@ -14,65 +14,6 @@ import {
|
||||
DBSQLiteValues,
|
||||
} from "@capacitor-community/sqlite";
|
||||
|
||||
// Android-specific imports for SAF and MediaStore
|
||||
import { registerPlugin } from "@capacitor/core";
|
||||
|
||||
// Define interfaces for Android-specific functionality
|
||||
interface AndroidFileSaverPlugin {
|
||||
saveToDownloads(options: {
|
||||
fileName: string;
|
||||
content: string;
|
||||
mimeType: string;
|
||||
}): Promise<{ success: boolean; path?: string; error?: string }>;
|
||||
saveAs(options: {
|
||||
fileName: string;
|
||||
content: string;
|
||||
mimeType: string;
|
||||
}): Promise<{ success: boolean; path?: string; error?: string }>;
|
||||
}
|
||||
|
||||
// Register the plugin (will be undefined if not available)
|
||||
const AndroidFileSaver =
|
||||
registerPlugin<AndroidFileSaverPlugin>("AndroidFileSaver");
|
||||
|
||||
// Fallback implementation for when the plugin is not available
|
||||
class AndroidFileSaverFallback implements AndroidFileSaverPlugin {
|
||||
async saveToDownloads(options: {
|
||||
fileName: string;
|
||||
content: string;
|
||||
mimeType: string;
|
||||
}): Promise<{ success: boolean; path?: string; error?: string }> {
|
||||
logger.warn(
|
||||
"[CapacitorPlatformService] AndroidFileSaver plugin not available, using fallback",
|
||||
{
|
||||
fileName: options.fileName,
|
||||
mimeType: options.mimeType,
|
||||
contentLength: options.content.length,
|
||||
},
|
||||
);
|
||||
return { success: false, error: "AndroidFileSaver plugin not available" };
|
||||
}
|
||||
|
||||
async saveAs(options: {
|
||||
fileName: string;
|
||||
content: string;
|
||||
mimeType: string;
|
||||
}): Promise<{ success: boolean; path?: string; error?: string }> {
|
||||
logger.warn(
|
||||
"[CapacitorPlatformService] AndroidFileSaver plugin not available, using fallback",
|
||||
{
|
||||
fileName: options.fileName,
|
||||
mimeType: options.mimeType,
|
||||
contentLength: options.content.length,
|
||||
},
|
||||
);
|
||||
return { success: false, error: "AndroidFileSaver plugin not available" };
|
||||
}
|
||||
}
|
||||
|
||||
// Use fallback if plugin is not available
|
||||
const AndroidFileSaverImpl = AndroidFileSaver || new AndroidFileSaverFallback();
|
||||
|
||||
import { runMigrations } from "@/db-sql/migration";
|
||||
import { QueryExecResult } from "@/interfaces/database";
|
||||
import {
|
||||
@@ -527,7 +468,7 @@ export class CapacitorPlatformService implements PlatformService {
|
||||
* ## Logging:
|
||||
*
|
||||
* Detailed logging is provided throughout the process using emoji-tagged
|
||||
* log messages that appear in the Electron DevTools. This
|
||||
* console messages that appear in the Electron DevTools console. This
|
||||
* includes:
|
||||
* - SQL statement execution details
|
||||
* - Parameter values for debugging
|
||||
@@ -1178,280 +1119,6 @@ export class CapacitorPlatformService implements PlatformService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves content directly to the device's Downloads folder (Android) or Documents folder (iOS).
|
||||
* Uses MediaStore on Android API 29+ and falls back to SAF on older versions.
|
||||
*
|
||||
* @param fileName - The filename of the file to save
|
||||
* @param content - The content to write to the file
|
||||
* @returns Promise that resolves when the file is saved
|
||||
*/
|
||||
async saveToDevice(fileName: string, content: string): Promise<void> {
|
||||
const timestamp = new Date().toISOString();
|
||||
const logData = {
|
||||
action: "saveToDevice",
|
||||
fileName,
|
||||
contentLength: content.length,
|
||||
platform: this.getCapabilities().isIOS ? "iOS" : "Android",
|
||||
timestamp,
|
||||
};
|
||||
logger.log("[CapacitorPlatformService]", JSON.stringify(logData, null, 2));
|
||||
|
||||
try {
|
||||
// Validate JSON content
|
||||
try {
|
||||
JSON.parse(content);
|
||||
} catch {
|
||||
throw new Error('Content must be valid JSON');
|
||||
}
|
||||
|
||||
// Generate unique filename
|
||||
const uniqueFileName = this.generateUniqueFileName(fileName);
|
||||
|
||||
if (this.getCapabilities().isIOS) {
|
||||
// iOS: Use Filesystem to save to Documents directory
|
||||
const { uri } = await Filesystem.writeFile({
|
||||
path: uniqueFileName,
|
||||
data: content,
|
||||
directory: Directory.Documents,
|
||||
encoding: Encoding.UTF8,
|
||||
recursive: true,
|
||||
});
|
||||
|
||||
logger.log("[CapacitorPlatformService] File saved to iOS Documents:", {
|
||||
uri,
|
||||
fileName: uniqueFileName,
|
||||
timestamp: new Date().toISOString(),
|
||||
});
|
||||
} else {
|
||||
// Android: Try to use native MediaStore/SAF implementation
|
||||
const result = await AndroidFileSaverImpl.saveToDownloads({
|
||||
fileName: uniqueFileName,
|
||||
content,
|
||||
mimeType: this.getMimeType(uniqueFileName),
|
||||
});
|
||||
|
||||
if (result.success) {
|
||||
logger.log(
|
||||
"[CapacitorPlatformService] File saved to Android Downloads:",
|
||||
{
|
||||
path: result.path,
|
||||
fileName: uniqueFileName,
|
||||
timestamp: new Date().toISOString(),
|
||||
},
|
||||
);
|
||||
} else {
|
||||
throw new Error(`Failed to save to Downloads: ${result.error}`);
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
const err = error as Error;
|
||||
const errLog = {
|
||||
message: err.message,
|
||||
stack: err.stack,
|
||||
timestamp: new Date().toISOString(),
|
||||
};
|
||||
logger.error(
|
||||
"[CapacitorPlatformService] Error saving file to device:",
|
||||
JSON.stringify(errLog, null, 2),
|
||||
);
|
||||
throw new Error(`Failed to save file to device: ${err.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Opens the system file picker to let the user choose where to save a file.
|
||||
* Uses Storage Access Framework (SAF) on Android and appropriate APIs on other platforms.
|
||||
*
|
||||
* @param fileName - The suggested filename for the file
|
||||
* @param content - The content to write to the file
|
||||
* @returns Promise that resolves when the file is saved
|
||||
*/
|
||||
async saveAs(fileName: string, content: string): Promise<void> {
|
||||
const timestamp = new Date().toISOString();
|
||||
const logData = {
|
||||
action: "saveAs",
|
||||
fileName,
|
||||
contentLength: content.length,
|
||||
platform: this.getCapabilities().isIOS ? "iOS" : "Android",
|
||||
timestamp,
|
||||
};
|
||||
logger.log("[CapacitorPlatformService]", JSON.stringify(logData, null, 2));
|
||||
|
||||
try {
|
||||
// Validate JSON content
|
||||
try {
|
||||
JSON.parse(content);
|
||||
} catch {
|
||||
throw new Error('Content must be valid JSON');
|
||||
}
|
||||
|
||||
// Generate unique filename
|
||||
const uniqueFileName = this.generateUniqueFileName(fileName);
|
||||
|
||||
if (this.getCapabilities().isIOS) {
|
||||
// iOS: Use Filesystem to save to Documents directory with user choice
|
||||
const { uri } = await Filesystem.writeFile({
|
||||
path: uniqueFileName,
|
||||
data: content,
|
||||
directory: Directory.Documents,
|
||||
encoding: Encoding.UTF8,
|
||||
recursive: true,
|
||||
});
|
||||
|
||||
logger.log("[CapacitorPlatformService] File saved to iOS Documents:", {
|
||||
uri,
|
||||
fileName: uniqueFileName,
|
||||
timestamp: new Date().toISOString(),
|
||||
});
|
||||
} else {
|
||||
// Android: Use SAF for user-chosen location
|
||||
const result = await AndroidFileSaverImpl.saveAs({
|
||||
fileName: uniqueFileName,
|
||||
content,
|
||||
mimeType: this.getMimeType(uniqueFileName),
|
||||
});
|
||||
|
||||
if (result.success) {
|
||||
logger.log(
|
||||
"[CapacitorPlatformService] File saved via Android SAF:",
|
||||
{
|
||||
path: result.path,
|
||||
fileName: uniqueFileName,
|
||||
timestamp: new Date().toISOString(),
|
||||
},
|
||||
);
|
||||
} else {
|
||||
throw new Error(`Failed to save via SAF: ${result.error}`);
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
const err = error as Error;
|
||||
const errLog = {
|
||||
message: err.message,
|
||||
stack: err.stack,
|
||||
timestamp: new Date().toISOString(),
|
||||
};
|
||||
logger.error(
|
||||
"[CapacitorPlatformService] Error in saveAs:",
|
||||
JSON.stringify(errLog, null, 2),
|
||||
);
|
||||
throw new Error(`Failed to save file: ${err.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates unique filename with timestamp, hashed device ID, and counter
|
||||
*/
|
||||
private generateUniqueFileName(baseName: string, counter = 0): string {
|
||||
const now = new Date();
|
||||
const timestamp = now.toISOString()
|
||||
.replace(/[:.]/g, '-')
|
||||
.replace('T', '_')
|
||||
.replace('Z', '');
|
||||
|
||||
const deviceIdHash = this.getHashedDeviceIdentifier();
|
||||
const counterSuffix = counter > 0 ? `_${counter}` : '';
|
||||
|
||||
const maxBaseLength = 45;
|
||||
const truncatedBase = baseName.length > maxBaseLength
|
||||
? baseName.substring(0, maxBaseLength)
|
||||
: baseName;
|
||||
|
||||
const nameWithoutExt = truncatedBase.replace(/\.json$/i, '');
|
||||
const extension = '.json';
|
||||
const devicePart = `_${deviceIdHash}`;
|
||||
const timestampPart = `_${timestamp}${counterSuffix}`;
|
||||
|
||||
const totalLength = nameWithoutExt.length + devicePart.length + timestampPart.length + extension.length;
|
||||
|
||||
if (totalLength > 200) {
|
||||
const availableLength = 200 - devicePart.length - timestampPart.length - extension.length;
|
||||
const finalBase = nameWithoutExt.substring(0, Math.max(10, availableLength));
|
||||
return `${finalBase}${devicePart}${timestampPart}${extension}`;
|
||||
}
|
||||
|
||||
return `${nameWithoutExt}${devicePart}${timestampPart}${extension}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets hashed device identifier
|
||||
*/
|
||||
private getHashedDeviceIdentifier(): string {
|
||||
try {
|
||||
const deviceInfo = this.getDeviceInfo();
|
||||
return this.hashString(deviceInfo);
|
||||
} catch (error) {
|
||||
return 'mobile';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets device info string
|
||||
*/
|
||||
private getDeviceInfo(): string {
|
||||
try {
|
||||
// For mobile platforms, use device info
|
||||
const capabilities = this.getCapabilities();
|
||||
if (capabilities.isIOS) {
|
||||
return 'ios_mobile';
|
||||
} else if (capabilities.isAndroid) {
|
||||
return 'android_mobile';
|
||||
} else {
|
||||
return 'mobile';
|
||||
}
|
||||
} catch (error) {
|
||||
return 'mobile';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Simple hash function for device ID
|
||||
*/
|
||||
private hashString(str: string): string {
|
||||
let hash = 0;
|
||||
for (let i = 0; i < str.length; i++) {
|
||||
const char = str.charCodeAt(i);
|
||||
hash = ((hash << 5) - hash) + char;
|
||||
hash = hash & hash;
|
||||
}
|
||||
return Math.abs(hash).toString(16).padStart(4, '0').substring(0, 4);
|
||||
}
|
||||
|
||||
/**
|
||||
* Determines the MIME type for a given filename based on its extension.
|
||||
*
|
||||
* @param fileName - The filename to determine MIME type for
|
||||
* @returns The MIME type string
|
||||
*/
|
||||
private getMimeType(fileName: string): string {
|
||||
const extension = fileName.split(".").pop()?.toLowerCase();
|
||||
|
||||
switch (extension) {
|
||||
case "json":
|
||||
return "application/json";
|
||||
case "txt":
|
||||
return "text/plain";
|
||||
case "csv":
|
||||
return "text/csv";
|
||||
case "pdf":
|
||||
return "application/pdf";
|
||||
case "xml":
|
||||
return "application/xml";
|
||||
case "html":
|
||||
return "text/html";
|
||||
case "jpg":
|
||||
case "jpeg":
|
||||
return "image/jpeg";
|
||||
case "png":
|
||||
return "image/png";
|
||||
case "gif":
|
||||
return "image/gif";
|
||||
default:
|
||||
return "application/octet-stream";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes a file from the app's data directory.
|
||||
* @param path - Relative path to the file to delete
|
||||
|
||||
@@ -146,236 +146,6 @@ export class ElectronPlatformService extends CapacitorPlatformService {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves content directly to the device's Downloads folder (Electron platform).
|
||||
* Uses Electron's IPC to save files directly to the Downloads directory.
|
||||
*
|
||||
* @param fileName - The filename of the file to save
|
||||
* @param content - The content to write to the file
|
||||
* @returns Promise that resolves when the file is saved
|
||||
*/
|
||||
async saveToDevice(fileName: string, content: string): Promise<void> {
|
||||
try {
|
||||
// Ensure content is valid JSON
|
||||
try {
|
||||
JSON.parse(content);
|
||||
} catch {
|
||||
throw new Error('Content must be valid JSON');
|
||||
}
|
||||
|
||||
// Generate unique filename
|
||||
const uniqueFileName = this.generateUniqueFileNameElectron(fileName);
|
||||
|
||||
logger.info(
|
||||
`[ElectronPlatformService] Using native IPC for direct file save`,
|
||||
uniqueFileName,
|
||||
);
|
||||
|
||||
// Check if we're running in Electron with the API available
|
||||
if (typeof window !== "undefined" && window.electronAPI) {
|
||||
// Use the native Electron IPC API for file exports
|
||||
const result = await window.electronAPI.exportData(uniqueFileName, content);
|
||||
|
||||
if (result.success) {
|
||||
logger.info(
|
||||
`[ElectronPlatformService] File saved successfully to`,
|
||||
result.path,
|
||||
);
|
||||
logger.info(
|
||||
`[ElectronPlatformService] File saved to Downloads folder`,
|
||||
uniqueFileName,
|
||||
);
|
||||
} else {
|
||||
logger.error(
|
||||
`[ElectronPlatformService] Native save failed`,
|
||||
result.error,
|
||||
);
|
||||
throw new Error(`Native file save failed: ${result.error}`);
|
||||
}
|
||||
} else {
|
||||
// Fallback to web-style download if Electron API is not available
|
||||
logger.warn(
|
||||
"[ElectronPlatformService] Electron API not available, falling back to web download",
|
||||
);
|
||||
|
||||
const blob = new Blob([content], { type: "application/json" });
|
||||
const url = URL.createObjectURL(blob);
|
||||
const downloadLink = document.createElement("a");
|
||||
downloadLink.href = url;
|
||||
downloadLink.download = uniqueFileName;
|
||||
downloadLink.style.display = "none";
|
||||
|
||||
document.body.appendChild(downloadLink);
|
||||
downloadLink.click();
|
||||
document.body.removeChild(downloadLink);
|
||||
|
||||
setTimeout(() => URL.revokeObjectURL(url), 1000);
|
||||
|
||||
logger.info(
|
||||
`[ElectronPlatformService] Fallback download initiated`,
|
||||
uniqueFileName,
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
logger.error("[ElectronPlatformService] File save failed", error);
|
||||
throw new Error(`Failed to save file: ${error}`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Opens the system file picker to let the user choose where to save a file (Electron platform).
|
||||
* Uses Electron's IPC to show the native save dialog.
|
||||
*
|
||||
* @param fileName - The suggested filename for the file
|
||||
* @param content - The content to write to the file
|
||||
* @returns Promise that resolves when the file is saved
|
||||
*/
|
||||
async saveAs(fileName: string, content: string): Promise<void> {
|
||||
try {
|
||||
// Ensure content is valid JSON
|
||||
try {
|
||||
JSON.parse(content);
|
||||
} catch {
|
||||
throw new Error('Content must be valid JSON');
|
||||
}
|
||||
|
||||
// Generate unique filename
|
||||
const uniqueFileName = this.generateUniqueFileNameElectron(fileName);
|
||||
|
||||
logger.info(
|
||||
`[ElectronPlatformService] Using native IPC for save as dialog`,
|
||||
uniqueFileName,
|
||||
);
|
||||
|
||||
// Check if we're running in Electron with the API available
|
||||
if (typeof window !== "undefined" && window.electronAPI) {
|
||||
// Use the native Electron IPC API for file exports (same as saveToDevice for now)
|
||||
// TODO: Implement native save dialog when available
|
||||
const result = await window.electronAPI.exportData(uniqueFileName, content);
|
||||
|
||||
if (result.success) {
|
||||
logger.info(
|
||||
`[ElectronPlatformService] File saved successfully to`,
|
||||
result.path,
|
||||
);
|
||||
logger.info(
|
||||
`[ElectronPlatformService] File saved via save as`,
|
||||
uniqueFileName,
|
||||
);
|
||||
} else {
|
||||
logger.error(
|
||||
`[ElectronPlatformService] Native save as failed`,
|
||||
result.error,
|
||||
);
|
||||
throw new Error(`Native file save as failed: ${result.error}`);
|
||||
}
|
||||
} else {
|
||||
// Fallback to web-style download if Electron API is not available
|
||||
logger.warn(
|
||||
"[ElectronPlatformService] Electron API not available, falling back to web download",
|
||||
);
|
||||
|
||||
const blob = new Blob([content], { type: "application/json" });
|
||||
const url = URL.createObjectURL(blob);
|
||||
const downloadLink = document.createElement("a");
|
||||
downloadLink.href = url;
|
||||
downloadLink.download = uniqueFileName;
|
||||
downloadLink.style.display = "none";
|
||||
|
||||
document.body.appendChild(downloadLink);
|
||||
downloadLink.click();
|
||||
document.body.removeChild(downloadLink);
|
||||
|
||||
setTimeout(() => URL.revokeObjectURL(url), 1000);
|
||||
|
||||
logger.info(
|
||||
`[ElectronPlatformService] Fallback download initiated`,
|
||||
uniqueFileName,
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
logger.error("[ElectronPlatformService] File save as failed", error);
|
||||
throw new Error(`Failed to save file as: ${error}`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates unique filename with timestamp, hashed device ID, and counter
|
||||
*/
|
||||
private generateUniqueFileNameElectron(baseName: string, counter = 0): string {
|
||||
const now = new Date();
|
||||
const timestamp = now.toISOString()
|
||||
.replace(/[:.]/g, '-')
|
||||
.replace('T', '_')
|
||||
.replace('Z', '');
|
||||
|
||||
const deviceIdHash = this.getHashedDeviceIdentifierElectron();
|
||||
const counterSuffix = counter > 0 ? `_${counter}` : '';
|
||||
|
||||
const maxBaseLength = 45;
|
||||
const truncatedBase = baseName.length > maxBaseLength
|
||||
? baseName.substring(0, maxBaseLength)
|
||||
: baseName;
|
||||
|
||||
const nameWithoutExt = truncatedBase.replace(/\.json$/i, '');
|
||||
const extension = '.json';
|
||||
const devicePart = `_${deviceIdHash}`;
|
||||
const timestampPart = `_${timestamp}${counterSuffix}`;
|
||||
|
||||
const totalLength = nameWithoutExt.length + devicePart.length + timestampPart.length + extension.length;
|
||||
|
||||
if (totalLength > 200) {
|
||||
const availableLength = 200 - devicePart.length - timestampPart.length - extension.length;
|
||||
const finalBase = nameWithoutExt.substring(0, Math.max(10, availableLength));
|
||||
return `${finalBase}${devicePart}${timestampPart}${extension}`;
|
||||
}
|
||||
|
||||
return `${nameWithoutExt}${devicePart}${timestampPart}${extension}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets hashed device identifier
|
||||
*/
|
||||
private getHashedDeviceIdentifierElectron(): string {
|
||||
try {
|
||||
const deviceInfo = this.getDeviceInfoElectron();
|
||||
return this.hashStringElectron(deviceInfo);
|
||||
} catch (error) {
|
||||
return 'electron';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets device info string
|
||||
*/
|
||||
private getDeviceInfoElectron(): string {
|
||||
try {
|
||||
// Use machine-specific information
|
||||
const os = require('os');
|
||||
const hostname = os.hostname() || 'unknown';
|
||||
const platform = os.platform() || 'unknown';
|
||||
const arch = os.arch() || 'unknown';
|
||||
|
||||
// Create device info string
|
||||
return `${platform}_${hostname}_${arch}`;
|
||||
} catch (error) {
|
||||
return 'electron';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Simple hash function for device ID
|
||||
*/
|
||||
private hashStringElectron(str: string): string {
|
||||
let hash = 0;
|
||||
for (let i = 0; i < str.length; i++) {
|
||||
const char = str.charCodeAt(i);
|
||||
hash = ((hash << 5) - hash) + char;
|
||||
hash = hash & hash;
|
||||
}
|
||||
return Math.abs(hash).toString(16).padStart(4, '0').substring(0, 4);
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if running on Capacitor platform.
|
||||
*
|
||||
|
||||
@@ -97,7 +97,9 @@ export class WebPlatformService implements PlatformService {
|
||||
}
|
||||
} else {
|
||||
// We're in a worker context - skip initBackend call
|
||||
logger.info(
|
||||
// Use console for critical startup message to avoid circular dependency
|
||||
// eslint-disable-next-line no-console
|
||||
console.log(
|
||||
"[WebPlatformService] Skipping initBackend call in worker context",
|
||||
);
|
||||
}
|
||||
@@ -592,157 +594,6 @@ export class WebPlatformService implements PlatformService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves content directly to the device's Downloads folder (Android) or Documents folder (iOS).
|
||||
* Uses MediaStore on Android API 29+ and falls back to SAF on older versions.
|
||||
*
|
||||
* @param fileName - The filename of the file to save
|
||||
* @param content - The content to write to the file
|
||||
* @returns Promise that resolves when the file is saved
|
||||
*/
|
||||
async saveToDevice(fileName: string, content: string): Promise<void> {
|
||||
try {
|
||||
// Ensure content is valid JSON
|
||||
try {
|
||||
JSON.parse(content);
|
||||
} catch {
|
||||
throw new Error('Content must be valid JSON');
|
||||
}
|
||||
|
||||
// Generate unique filename
|
||||
const uniqueFileName = this.generateUniqueFileName(fileName);
|
||||
|
||||
// Web platform: Use the same download mechanism as writeAndShareFile
|
||||
await this.writeAndShareFile(uniqueFileName, content);
|
||||
logger.log("[WebPlatformService] File saved to device", uniqueFileName);
|
||||
} catch (error) {
|
||||
logger.error("[WebPlatformService] Error saving file to device", error);
|
||||
throw new Error(
|
||||
`Failed to save file to device: ${error instanceof Error ? error.message : "Unknown error"}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Opens the system file picker to let the user choose where to save a file (web platform).
|
||||
* Uses the browser's download mechanism with a suggested filename.
|
||||
*
|
||||
* @param fileName - The suggested filename for the file
|
||||
* @param content - The content to write to the file
|
||||
* @returns Promise that resolves when the file is saved
|
||||
*/
|
||||
async saveAs(fileName: string, content: string): Promise<void> {
|
||||
try {
|
||||
// Ensure content is valid JSON
|
||||
try {
|
||||
JSON.parse(content);
|
||||
} catch {
|
||||
throw new Error('Content must be valid JSON');
|
||||
}
|
||||
|
||||
// Generate unique filename
|
||||
const uniqueFileName = this.generateUniqueFileName(fileName);
|
||||
|
||||
// Web platform: Use the same download mechanism as writeAndShareFile
|
||||
await this.writeAndShareFile(uniqueFileName, content);
|
||||
logger.log("[WebPlatformService] File saved as", uniqueFileName);
|
||||
} catch (error) {
|
||||
logger.error("[WebPlatformService] Error saving file as", error);
|
||||
throw new Error(
|
||||
`Failed to save file as: ${error instanceof Error ? error.message : "Unknown error"}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates unique filename with timestamp, hashed device ID, and counter
|
||||
*/
|
||||
private generateUniqueFileName(baseName: string, counter = 0): string {
|
||||
const now = new Date();
|
||||
const timestamp = now.toISOString()
|
||||
.replace(/[:.]/g, '-')
|
||||
.replace('T', '_')
|
||||
.replace('Z', '');
|
||||
|
||||
const deviceIdHash = this.getHashedDeviceIdentifier();
|
||||
const counterSuffix = counter > 0 ? `_${counter}` : '';
|
||||
|
||||
const maxBaseLength = 45;
|
||||
const truncatedBase = baseName.length > maxBaseLength
|
||||
? baseName.substring(0, maxBaseLength)
|
||||
: baseName;
|
||||
|
||||
const nameWithoutExt = truncatedBase.replace(/\.json$/i, '');
|
||||
const extension = '.json';
|
||||
const devicePart = `_${deviceIdHash}`;
|
||||
const timestampPart = `_${timestamp}${counterSuffix}`;
|
||||
|
||||
const totalLength = nameWithoutExt.length + devicePart.length + timestampPart.length + extension.length;
|
||||
|
||||
if (totalLength > 200) {
|
||||
const availableLength = 200 - devicePart.length - timestampPart.length - extension.length;
|
||||
const finalBase = nameWithoutExt.substring(0, Math.max(10, availableLength));
|
||||
return `${finalBase}${devicePart}${timestampPart}${extension}`;
|
||||
}
|
||||
|
||||
return `${nameWithoutExt}${devicePart}${timestampPart}${extension}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets hashed device identifier
|
||||
*/
|
||||
private getHashedDeviceIdentifier(): string {
|
||||
try {
|
||||
const deviceInfo = this.getDeviceInfo();
|
||||
return this.hashString(deviceInfo);
|
||||
} catch (error) {
|
||||
return 'web';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets device info string
|
||||
*/
|
||||
private getDeviceInfo(): string {
|
||||
try {
|
||||
// Use browser fingerprint or fallback
|
||||
const userAgent = navigator.userAgent;
|
||||
const language = navigator.language || 'unknown';
|
||||
const platform = navigator.platform || 'unknown';
|
||||
|
||||
let browser = 'unknown';
|
||||
let os = 'unknown';
|
||||
|
||||
if (userAgent.includes('Chrome')) browser = 'chrome';
|
||||
else if (userAgent.includes('Firefox')) browser = 'firefox';
|
||||
else if (userAgent.includes('Safari')) browser = 'safari';
|
||||
else if (userAgent.includes('Edge')) browser = 'edge';
|
||||
|
||||
if (userAgent.includes('Windows')) os = 'win';
|
||||
else if (userAgent.includes('Mac')) os = 'mac';
|
||||
else if (userAgent.includes('Linux')) os = 'linux';
|
||||
else if (userAgent.includes('Android')) os = 'android';
|
||||
else if (userAgent.includes('iOS')) os = 'ios';
|
||||
|
||||
return `${browser}_${os}_${platform}_${language}`;
|
||||
} catch (error) {
|
||||
return 'web';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Simple hash function for device ID
|
||||
*/
|
||||
private hashString(str: string): string {
|
||||
let hash = 0;
|
||||
for (let i = 0; i < str.length; i++) {
|
||||
const char = str.charCodeAt(i);
|
||||
hash = ((hash << 5) - hash) + char;
|
||||
hash = hash & hash;
|
||||
}
|
||||
return Math.abs(hash).toString(16).padStart(4, '0').substring(0, 4);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see PlatformService.dbQuery
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user