From: David A. Velasco Date: Tue, 18 Feb 2014 10:16:22 +0000 (+0100) Subject: Merge branch 'share_link__unshare_file' into release-1.5.4 X-Git-Tag: oc-android-1.5.5~35^2~7 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0f99af779e39e3bdca3ca67b5a196d69d36691fe?hp=4cc578faf9cfd7f32153549ce45b3acf7d563e5b Merge branch 'share_link__unshare_file' into release-1.5.4 --- diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 465dec84..141d56a8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -18,8 +18,8 @@ along with this program. If not, see . --> + android:versionCode="105004" + android:versionName="1.5.4" xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/SETUP.md b/SETUP.md index 13c4f592..12db83dc 100644 --- a/SETUP.md +++ b/SETUP.md @@ -27,13 +27,13 @@ NOTE: You must have the Android SDK 'tools/', and 'platforms-tools/' folders in NOTE: You must have mvn (version >= 3.1.1) in your environment path. Current Android 'platforms-tools' need to be installed. -Download/install Android plugin for Maven, install oc_framework, then build ownCloud with mvn: +Download/install Android plugin for Maven, install owncloud-android-library, then build ownCloud with mvn: * cd .. * git clone https://github.com/mosabua/maven-android-sdk-deployer.git * cd maven-android-sdk-deployer * mvn -pl com.simpligility.android.sdk-deployer:android-19 -am install -* cd ../android/oc_framework +* cd ../android/owncloud-android-library * mvn install * cd .. @@ -48,15 +48,15 @@ NOTE: You must have the Android SDK 'tools/', and 'platforms-tools/' folders in * Clean project and compile. * If any error appear, check the project properties; in the 'Android' section, API Level should be greater or equal than 14. * Make sure android/actionbarsherlock/library/bin/library.jar was created. -* Create a new "Android Project from Existing Code". Choose android/oc_framework as root. +* Create a new "Android Project from Existing Code". Choose android/owncloud-android-library as root. * Clean project and compile. * If any error appear, check the project properties; in the 'Android' section, API Level should be 19 or greater. -* Make sure android/oc_framework/bin/classes.jar was created. +* Make sure android/owncloud-android-library/bin/classes.jar was created. * Import ownCloud Android project. * Clean project and compile. * If any error appears, check the project properties of owncloud-android project; in the 'Android' section: - API Level should be 19 or greater. - - Two library projects should appear referred in the bottom square: actionbarsherlock/library and oc_framework. Add them if needed. + - Two library projects should appear referred in the bottom square: actionbarsherlock/library and owncloud-android-library. Add them if needed. * After those actions you should be good to go. HAVE FUN! NOTE: Even though API level is set to 19, APK also runs on older devices because in AndroidManifest.xml minSdkVersion is set to 8. diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml index ea251057..4bc25bae 100644 --- a/oc_jb_workaround/AndroidManifest.xml +++ b/oc_jb_workaround/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="0100013" + android:versionName="1.0.13" > 1.5.1-SNAPSHOT 1.6 - 4.4_r1 + 4.4.2_r2 19 4.2.0 @@ -50,10 +50,10 @@ apklib - + com.owncloud.android - oc_framework + owncloud-android-library ${owncloud.version} diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml index c4d6821f..03bc06a3 100644 --- a/res/values-cs-rCZ/strings.xml +++ b/res/values-cs-rCZ/strings.xml @@ -56,6 +56,7 @@ Obnovit soubor Soubor byl v průběhu odesílání přejmenován na %1$s Sdílet odkaz + Zrušit sdílení odkazu Ano Ne OK @@ -180,6 +181,7 @@ Počkejte chvíli Neočekávaný problém - zkuste zvolit soubor jinou aplikací Žádný soubor nebyl vybrán + Odeslat odkaz ... Přihlásit se s oAuth2 Připojuji se k oAuth2 serveru... Identitu stránky nelze ověřit @@ -231,4 +233,8 @@ nic nedělat nejste připojeni pro okamžité odeslání Chybová zpráva: Zkontrolujte prosím nastavení vašeho serveru, možná jste překročili kvótu. + Je nám líto, ale sdílení není na vašem serveru povoleno. Kontaktujte vašeho administrátora. + Nepodařilo se sdílet tento soubor či složku. Ujistěte se, že existuje. + Při pokusu o sdílení tohoto souboru či složky nastala chyba + Při pokusu o zrušení sdílení tohoto souboru či složky nastala chyba diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index fb7ea89f..71a7bff0 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -56,6 +56,7 @@ Opdater fil Filen blev omdøbt til %1$s under upload Del link + Ophæv deling Ja Nej OK diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 2b83a782..3b4f8ebb 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -1,5 +1,6 @@ + %1$s 安卓应用 版本:%1$s 刷新帐户 上传 @@ -18,7 +19,9 @@ 开启即时上传 即时上传相机拍摄的照片 开启日志 + 这过去是日志问题 日志历史 + 这显示已经保存的日志 删除历史 帮助 反馈 @@ -26,6 +29,7 @@ 检查服务器 用户名 密码 + 新增到 %1$s? 文件 连接 上传 @@ -45,7 +49,10 @@ 创建于: 已修改: 下载 + 刷新文件 上传过程中文件被更名为了 %1$s + 分享链接 + 取消共享链接 是 否 OK @@ -135,6 +142,9 @@ 无法建立连接 加密连接已建立 用户名或密码错误! + 认证不成功 + 访问被认证服务器拒绝 + 意外状态;请再次输入服务器的地址 请输入当前密码: 保证文件更新 重命名 @@ -156,6 +166,8 @@ 请稍候 未知问题;请试试用其他程序选择此文件 未选择文件。 + 发送链接给 … + 连接oAuth2 服务器... 站点身份无法验证 不受信任的服务器证书 服务器证书过期 @@ -204,4 +216,8 @@ 不在线时不开启即时上传 失败消息 请检查服务器设置。可能走出配额。 + 对不起,共享服务功能未开启,请联系管理员 + 无法共享该文件或目录,请确定该文件或目录存在 + 共享文件或目录出错 + 解除文件或目录共享时出错 diff --git a/res/values/setup.xml b/res/values/setup.xml index 2e07ae4b..948b4d35 100644 --- a/res/values/setup.xml +++ b/res/values/setup.xml @@ -8,7 +8,7 @@ ownCloud owncloud Owncloud_ - / + ownCloud @@ -35,11 +35,11 @@ true - false + true false - false - false - https://owncloud.com/mobile/help + true + true + http://owncloud.com/mobile/help "mailto:" "mailto:apps@owncloud.com" diff --git a/src/com/owncloud/android/files/services/FileObserverService.java b/src/com/owncloud/android/files/services/FileObserverService.java index fa1fec24..c6753896 100644 --- a/src/com/owncloud/android/files/services/FileObserverService.java +++ b/src/com/owncloud/android/files/services/FileObserverService.java @@ -22,6 +22,7 @@ import java.io.File; import java.util.HashMap; import java.util.Map; +import com.owncloud.android.MainApp; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.db.ProviderMeta.ProviderTableMeta; @@ -141,7 +142,7 @@ public class FileObserverService extends Service { null); if (c == null || !c.moveToFirst()) return; AccountManager acm = AccountManager.get(this); - Account[] accounts = acm.getAccounts(); + Account[] accounts = acm.getAccountsByType(MainApp.getAccountType()); do { Account account = null; for (Account a : accounts)