mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-24 10:27:10 +02:00
iOS 12.14.8
This commit is contained in:
Laurent Cozic
commit
a9fecb31c3
@ -529,7 +529,7 @@
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
|
||||
CURRENT_PROJECT_VERSION = 114;
|
||||
CURRENT_PROJECT_VERSION = 115;
|
||||
DEVELOPMENT_TEAM = A9BXAFS6CT;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Joplin/Info.plist;
|
||||
@ -540,6 +540,8 @@
|
||||
"$(inherited)",
|
||||
"-ObjC",
|
||||
"-lc++",
|
||||
"-weak_framework",
|
||||
SwiftUI,
|
||||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin;
|
||||
PRODUCT_NAME = Joplin;
|
||||
@ -558,7 +560,7 @@
|
||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
|
||||
CURRENT_PROJECT_VERSION = 114;
|
||||
CURRENT_PROJECT_VERSION = 115;
|
||||
DEVELOPMENT_TEAM = A9BXAFS6CT;
|
||||
INFOPLIST_FILE = Joplin/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
|
||||
@ -568,6 +570,8 @@
|
||||
"$(inherited)",
|
||||
"-ObjC",
|
||||
"-lc++",
|
||||
"-weak_framework",
|
||||
SwiftUI,
|
||||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin;
|
||||
PRODUCT_NAME = Joplin;
|
||||
@ -710,7 +714,7 @@
|
||||
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
|
||||
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 114;
|
||||
CURRENT_PROJECT_VERSION = 115;
|
||||
DEBUG_INFORMATION_FORMAT = dwarf;
|
||||
DEVELOPMENT_TEAM = A9BXAFS6CT;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||
@ -720,6 +724,13 @@
|
||||
MARKETING_VERSION = 13.0.1;
|
||||
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
|
||||
MTL_FAST_MATH = YES;
|
||||
OTHER_LDFLAGS = (
|
||||
"$(inherited)",
|
||||
"-ObjC",
|
||||
"-l\"JoplinCommonShareExtension\"",
|
||||
"-weak_framework",
|
||||
SwiftUI,
|
||||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SKIP_INSTALL = YES;
|
||||
@ -741,7 +752,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
COPY_PHASE_STRIP = NO;
|
||||
CURRENT_PROJECT_VERSION = 114;
|
||||
CURRENT_PROJECT_VERSION = 115;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
DEVELOPMENT_TEAM = A9BXAFS6CT;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu11;
|
||||
@ -750,6 +761,13 @@
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
|
||||
MARKETING_VERSION = 13.0.1;
|
||||
MTL_FAST_MATH = YES;
|
||||
OTHER_LDFLAGS = (
|
||||
"$(inherited)",
|
||||
"-ObjC",
|
||||
"-l\"JoplinCommonShareExtension\"",
|
||||
"-weak_framework",
|
||||
SwiftUI,
|
||||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SKIP_INSTALL = YES;
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
const time = require('./time').default;
|
||||
const shim = require('./shim').default;
|
||||
const JoplinError = require('./JoplinError').default;
|
||||
const Logger = require('@joplin/utils/Logger').default;
|
||||
|
||||
const logger = Logger.create('file-api-driver-dropbox');
|
||||
|
||||
class FileApiDriverDropbox {
|
||||
constructor(api) {
|
||||
@ -97,14 +100,14 @@ class FileApiDriverDropbox {
|
||||
}
|
||||
}
|
||||
|
||||
async list(path) {
|
||||
async list(path, options) {
|
||||
let response = await this.api().exec('POST', 'files/list_folder', {
|
||||
path: this.makePath_(path),
|
||||
});
|
||||
|
||||
let output = this.metadataToStats_(response.entries);
|
||||
|
||||
while (response.has_more) {
|
||||
while (response.has_more && !options?.firstPageOnly) {
|
||||
response = await this.api().exec('POST', 'files/list_folder/continue', {
|
||||
cursor: response.cursor,
|
||||
});
|
||||
@ -114,7 +117,7 @@ class FileApiDriverDropbox {
|
||||
|
||||
return {
|
||||
items: output,
|
||||
hasMore: false,
|
||||
hasMore: !!response.has_more,
|
||||
context: { cursor: response.cursor },
|
||||
};
|
||||
}
|
||||
@ -148,7 +151,9 @@ class FileApiDriverDropbox {
|
||||
} else {
|
||||
try {
|
||||
response = await fetchPath('GET', path);
|
||||
} catch (_error) {
|
||||
} catch (error) {
|
||||
logger.warn('Request to files/download failed. Retrying with workaround. Error: ', error);
|
||||
|
||||
// May 2024: Sending a GET request to files/download sometimes fails
|
||||
// until another file is requested. Because POST requests with empty bodies don't work on iOS,
|
||||
// we send a request for a different file, then re-request the original.
|
||||
@ -156,7 +161,7 @@ class FileApiDriverDropbox {
|
||||
// See https://github.com/laurent22/joplin/issues/10396
|
||||
|
||||
// This workaround requires that the file we request exist.
|
||||
const { items } = await this.list();
|
||||
const { items } = await this.list('', { firstPageOnly: true });
|
||||
const files = items.filter(item => !item.isDir && item.path !== path);
|
||||
|
||||
if (files.length > 0) {
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
# Joplin iOS Changelog
|
||||
|
||||
## [ios-v12.14.8](https://github.com/laurent22/joplin/releases/tag/ios-v12.14.8) - 2024-05-08T13:40:01Z
|
||||
|
||||
- Fixed: Fix Dropbox sync for large file collections (#10411) (#10396 by Henry Heino)
|
||||
- Fixed: Fixed app for iOS 12 (966fe38)
|
||||
|
||||
## [ios-v12.14.7](https://github.com/laurent22/joplin/releases/tag/ios-v12.14.7) - 2024-05-07T16:24:05Z
|
||||
|
||||
- New: Add Privacy manifest file (#10406 by Henry Heino)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user