self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-30 23:44:55 +02:00
Code Issues Releases Activity

All: Minor tweaks regarding encryption

Browse Source
This commit is contained in:
Laurent Cozic
2017-01-29 19:29:34 +01:00
parent 685f541bb4
commit 0115e74163
9 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReactNativeClient/android/app/build.gradle
View File

@ -90,8 +90,8 @@ android {
applicationId "net.cozic.joplin"
minSdkVersion 16
targetSdkVersion 22
versionCode 81
versionName "0.10.66"
versionCode 83
versionName "0.10.68"
ndk {
abiFilters "armeabi-v7a", "x86"
}

3
ReactNativeClient/lib/registry.js
View File

@ -65,7 +65,7 @@ reg.scheduleSync = async (delay = null) => {
const timeoutCallback = async () => {
reg.scheduleSyncId_ = null;
reg.logger().info('Doing scheduled sync');
reg.logger().info('Preparing scheduled sync');
const syncTargetId = Setting.value('sync.target');
@ -82,6 +82,7 @@ reg.scheduleSync = async (delay = null) => {
let context = Setting.value(contextKey);
context = context ? JSON.parse(context) : {};
try {
reg.logger().info('Starting scheduled sync');
let newContext = await sync.start({ context: context });
Setting.setValue(contextKey, JSON.stringify(newContext));
} catch (error) {

6
ReactNativeClient/lib/services/report.js
View File

@ -118,8 +118,12 @@ class ReportService {
for (let i = 0; i < disabledItems.length; i++) {
const row = disabledItems[i];
section.body.push(_('"%s": "%s"', row.item.title, row.syncInfo.sync_disabled_reason));
section.body.push(_('%s (%s): %s', row.item.title, row.item.id, row.syncInfo.sync_disabled_reason));
}
section.body.push('');
section.body.push(_('These items will remain on the device but will not be uploaded to the sync target. In order to find these items, either search for the title or the ID (which is displayed in brackets above).'));
sections.push(section);
}

2
ReactNativeClient/lib/synchronizer.js
View File

@ -191,7 +191,7 @@ class Synchronizer {
let synchronizationId = time.unixMs().toString();
let outputContext = Object.assign({}, lastContext);
this.dispatch({ type: 'SYNC_STARTED' });
this.logSyncOperation('starting', null, null, 'Starting synchronisation to target ' + syncTargetId + '... [' + synchronizationId + ']');