along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<manifest package="com.owncloud.android"
- android:versionCode="105003"
- android:versionName="1.5.3" xmlns:android="http://schemas.android.com/apk/res/android">
+ android:versionCode="105004"
+ android:versionName="1.5.4" xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
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 ..
* 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.
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.owncloud.android.workaround.accounts"
- android:versionCode="0100012"
- android:versionName="1.0.12" >
+ android:versionCode="0100013"
+ android:versionName="1.0.13" >
<uses-sdk
android:minSdkVersion="16"
-Subproject commit 6992df89b04c3c35bf906c3f810fa05daad7b43f
+Subproject commit a0fdb521cf2eb24a6742635a40702d8d9e564de0
<owncloud.version>1.5.1-SNAPSHOT</owncloud.version>
<java-version>1.6</java-version>
<!-- Given by maven-android-sdk-deployer -->
- <google.android-version>4.4_r1</google.android-version>
+ <google.android-version>4.4.2_r2</google.android-version>
<!-- Usually the latest Android API -->
<google.android-api>19</google.android-api>
<actionbarsherlock-version>4.2.0</actionbarsherlock-version>
<type>apklib</type>
</dependency>
- <!-- MUST BE INSTALLED FIRST: cd oc_framework; mvn install -->
+ <!-- MUST BE INSTALLED FIRST: cd owncloud-android-library; mvn install -->
<dependency>
<groupId>com.owncloud.android</groupId>
- <artifactId>oc_framework</artifactId>
+ <artifactId>owncloud-android-library</artifactId>
<version>${owncloud.version}</version>
</dependency>
<string name="filedetails_sync_file">Obnovit soubor</string>
<string name="filedetails_renamed_in_upload_msg">Soubor byl v průběhu odesílání přejmenován na %1$s</string>
<string name="action_share_file">Sdílet odkaz</string>
+ <string name="action_unshare_file">Zrušit sdílení odkazu</string>
<string name="common_yes">Ano</string>
<string name="common_no">Ne</string>
<string name="common_ok">OK</string>
<string name="wait_a_moment">Počkejte chvíli</string>
<string name="filedisplay_unexpected_bad_get_content">Neočekávaný problém - zkuste zvolit soubor jinou aplikací</string>
<string name="filedisplay_no_file_selected">Žádný soubor nebyl vybrán</string>
+ <string name="activity_chooser_title">Odeslat odkaz ...</string>
<string name="oauth_check_onoff">Přihlásit se s oAuth2</string>
<string name="oauth_login_connection">Připojuji se k oAuth2 serveru...</string>
<string name="ssl_validator_header">Identitu stránky nelze ověřit</string>
<string name="failed_upload_retry_do_nothing_text">nic nedělat nejste připojeni pro okamžité odeslání</string>
<string name="failed_upload_failure_text">Chybová zpráva:</string>
<string name="failed_upload_quota_exceeded_text">Zkontrolujte prosím nastavení vašeho serveru, možná jste překročili kvótu.</string>
+ <string name="share_link_no_support_share_api">Je nám líto, ale sdílení není na vašem serveru povoleno. Kontaktujte vašeho administrátora.</string>
+ <string name="share_link_file_no_exist">Nepodařilo se sdílet tento soubor či složku. Ujistěte se, že existuje.</string>
+ <string name="share_link_file_error">Při pokusu o sdílení tohoto souboru či složky nastala chyba</string>
+ <string name="unshare_link_file_error">Při pokusu o zrušení sdílení tohoto souboru či složky nastala chyba</string>
</resources>
<string name="filedetails_sync_file">Opdater fil</string>
<string name="filedetails_renamed_in_upload_msg">Filen blev omdøbt til %1$s under upload</string>
<string name="action_share_file">Del link</string>
+ <string name="action_unshare_file">Ophæv deling</string>
<string name="common_yes">Ja</string>
<string name="common_no">Nej</string>
<string name="common_ok">OK</string>
<?xml version='1.0' encoding='UTF-8'?>
<resources>
+ <string name="about_android">%1$s 安卓应用</string>
<string name="about_version">版本：%1$s</string>
<string name="actionbar_sync">刷新帐户</string>
<string name="actionbar_upload">上传</string>
<string name="prefs_instant_upload">开启即时上传</string>
<string name="prefs_instant_upload_summary">即时上传相机拍摄的照片</string>
<string name="prefs_log_title">开启日志</string>
+ <string name="prefs_log_summary">这过去是日志问题</string>
<string name="prefs_log_title_history">日志历史</string>
+ <string name="prefs_log_summary_history">这显示已经保存的日志</string>
<string name="prefs_log_delete_history_button">删除历史</string>
<string name="prefs_help">帮助</string>
<string name="prefs_feedback">反馈</string>
<string name="auth_check_server">检查服务器</string>
<string name="auth_username">用户名</string>
<string name="auth_password">密码</string>
+ <string name="auth_register">新增到 %1$s?</string>
<string name="sync_string_files">文件</string>
<string name="setup_btn_connect">连接</string>
<string name="uploader_btn_upload_text">上传</string>
<string name="filedetails_created">创建于：</string>
<string name="filedetails_modified">已修改：</string>
<string name="filedetails_download">下载</string>
+ <string name="filedetails_sync_file">刷新文件</string>
<string name="filedetails_renamed_in_upload_msg">上传过程中文件被更名为了 %1$s</string>
+ <string name="action_share_file">分享链接</string>
+ <string name="action_unshare_file">取消共享链接</string>
<string name="common_yes">是</string>
<string name="common_no">否</string>
<string name="common_ok">OK</string>
<string name="auth_wrong_connection_title">无法建立连接</string>
<string name="auth_secure_connection">加密连接已建立</string>
<string name="auth_unauthorized">用户名或密码错误！</string>
+ <string name="auth_oauth_error">认证不成功</string>
+ <string name="auth_oauth_error_access_denied">访问被认证服务器拒绝</string>
+ <string name="auth_wtf_reenter_URL">意外状态；请再次输入服务器的地址</string>
<string name="auth_expired_basic_auth_toast">请输入当前密码：</string>
<string name="fd_keep_in_sync">保证文件更新</string>
<string name="common_rename">重命名</string>
<string name="wait_a_moment">请稍候</string>
<string name="filedisplay_unexpected_bad_get_content">未知问题；请试试用其他程序选择此文件</string>
<string name="filedisplay_no_file_selected">未选择文件。</string>
+ <string name="activity_chooser_title">发送链接给 …</string>
+ <string name="oauth_login_connection">连接oAuth2 服务器...</string>
<string name="ssl_validator_header">站点身份无法验证</string>
<string name="ssl_validator_reason_cert_not_trusted">不受信任的服务器证书</string>
<string name="ssl_validator_reason_cert_expired">服务器证书过期</string>
<string name="failed_upload_retry_do_nothing_text">不在线时不开启即时上传</string>
<string name="failed_upload_failure_text">失败消息</string>
<string name="failed_upload_quota_exceeded_text">请检查服务器设置。可能走出配额。</string>
+ <string name="share_link_no_support_share_api">对不起，共享服务功能未开启，请联系管理员</string>
+ <string name="share_link_file_no_exist">无法共享该文件或目录，请确定该文件或目录存在</string>
+ <string name="share_link_file_error">共享文件或目录出错</string>
+ <string name="unshare_link_file_error">解除文件或目录共享时出错</string>
</resources>
<string name ="db_name">ownCloud</string>
<string name ="data_folder">owncloud</string>
<string name ="log_name">Owncloud_</string>
- <string name ="default_display_name_for_root_folder">/</string>
+ <string name ="default_display_name_for_root_folder">ownCloud</string>
<!-- URLs and flags related -->
<string name="server_url"></string>
<bool name="multiaccount_support">true</bool>
<!-- Help, imprint and feedback -->
- <bool name="help_enabled">false</bool>
+ <bool name="help_enabled">true</bool>
<bool name="imprint_enabled">false</bool>
- <bool name="recommend_enabled">false</bool>
- <bool name="feedback_enabled">false</bool>
- <string name="url_help">https://owncloud.com/mobile/help</string>
+ <bool name="recommend_enabled">true</bool>
+ <bool name="feedback_enabled">true</bool>
+ <string name="url_help">http://owncloud.com/mobile/help</string>
<string name="url_imprint"></string>
<string name="mail_recommend">"mailto:"</string>
<string name="mail_feedback">"mailto:apps@owncloud.com"</string>
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;
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)
projects / pub / Android / ownCloud.git / commitdiff