From bc26098c7dbb948b3a8c583c3aa03d58d21ba9ac Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Mon, 5 Feb 2018 22:19:21 +0000 Subject: [PATCH] Android release v0.10.85 --- ElectronClient/app/ElectronAppWrapper.js | 9 ++++++++- ElectronClient/app/package.json | 1 + README.md | 2 +- ReactNativeClient/android/app/build.gradle | 4 ++-- docs/index.html | 10 +++++----- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ElectronClient/app/ElectronAppWrapper.js b/ElectronClient/app/ElectronAppWrapper.js index 7b199bc7c3b..b1232051a93 100644 --- a/ElectronClient/app/ElectronAppWrapper.js +++ b/ElectronClient/app/ElectronAppWrapper.js @@ -4,6 +4,7 @@ const { shim } = require('lib/shim'); const url = require('url') const path = require('path') const urlUtils = require('lib/urlUtils.js'); +const { dirname } = require('lib/path-utils'); class ElectronAppWrapper { @@ -114,9 +115,15 @@ class ElectronAppWrapper { return !!this.tray_; } + buildDir() { + let dir = __dirname; + if (dir.indexOf('.asar') >= 0) dir = dirname(dir); + return dir + '/build'; + } + // Note: this must be called only after the "ready" event of the app has been dispatched createTray(contextMenu) { - this.tray_ = new Tray(__dirname + '/build/icons/16x16.png') + this.tray_ = new Tray(this.buildDir() + '/icons/16x16.png') this.tray_.setToolTip(this.electronApp_.getName()) this.tray_.setContextMenu(contextMenu) diff --git a/ElectronClient/app/package.json b/ElectronClient/app/package.json index f2534dc7c90..f60cae9db35 100644 --- a/ElectronClient/app/package.json +++ b/ElectronClient/app/package.json @@ -22,6 +22,7 @@ }, "build": { "appId": "net.cozic.joplin-desktop", + "extraResources": ["build/icons/*"], "win": { "icon": "../../Assets/Joplin.ico" }, diff --git a/README.md b/README.md index 891c79c9c61..7bc7e7c4772 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Linux | Get it on Google Play | or [Download APK File](https://github.com/laurent22/joplin/releases/download/android-v0.10.83/joplin-v0.10.83.apk) +Android | Get it on Google Play | or [Download APK File](https://github.com/laurent22/joplin/releases/download/android-v0.10.85/joplin-v0.10.85.apk) iOS | Get it on the App Store | - ## Terminal application diff --git a/ReactNativeClient/android/app/build.gradle b/ReactNativeClient/android/app/build.gradle index 8472a8698f0..db701e0b017 100644 --- a/ReactNativeClient/android/app/build.gradle +++ b/ReactNativeClient/android/app/build.gradle @@ -90,8 +90,8 @@ android { applicationId "net.cozic.joplin" minSdkVersion 16 targetSdkVersion 22 - versionCode 2097261 - versionName "0.10.83" + versionCode 2097263 + versionName "0.10.85" ndk { abiFilters "armeabi-v7a", "x86" } diff --git a/docs/index.html b/docs/index.html index ae29c85ace1..5665fbe372b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -243,7 +243,7 @@

Mobile applications

Android Get it on Google Play -or Download APK File +or Download APK File iOS @@ -355,14 +355,14 @@

Localisation

Croatian hr_HR -Hrvoje Mandić trbuhom@net.hr +Hrvoje Mandić trbuhom@net.hr 72% Deutsch de_DE -Tobias Strobel git@strobeltobias.de +Tobias Strobel git@strobeltobias.de 92% @@ -418,14 +418,14 @@

Localisation

Русский ru_RU -Artyom Karlov artyom.karlov@gmail.com +Artyom Karlov artyom.karlov@gmail.com 96% 中文 (简体) zh_CN -RCJacH RCJacH@outlook.com +RCJacH RCJacH@outlook.com 76%