along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<manifest package="com.owncloud.android"
- android:versionCode="105001"
- android:versionName="1.5.1" xmlns:android="http://schemas.android.com/apk/res/android">
+ android:versionCode="105002"
+ android:versionName="1.5.2" 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" />
### 3. Building with console/maven:
-NOTE: You must have mvn in your environment path
+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, 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-17 -am install"
-* "cd ../android"
-* Now you can create APK using "mvn package"
+* "mvn -pl com.simpligility.android.sdk-deployer:android-19 -am install"
+* "cd ../android/oc_framework"
+* "mvn install"
+* "cd .."
+* Now you can create ownCloud APK using "mvn package"
### 4. Building with Eclipse:
* 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/library as root.
+* Create a new "Android Project from Existing Code". Choose android/oc_framework 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.
* Import ownCloud Android project.
* Clean project and compile.
-* If any error appears, check the project properties; in the 'Android' section:
+* 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.
* After those actions you should be good to go. HAVE FUN!
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.owncloud.android</groupId>
+ <artifactId>oc_framework</artifactId>
+ <version>${owncloud.version}</version>
+ <packaging>jar</packaging>
+ <name>oc_framework for Owncloud Android</name>
+
+ <properties>
+ <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>
+ <!-- Usually the latest Android API -->
+ <google.android-api>19</google.android-api>
+ </properties>
+
+ <description>oc_framwork for Owncloud for Android</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>android</groupId>
+ <artifactId>android</artifactId>
+ <version>${google.android-version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-webdav</artifactId>
+ <version>2.5.2</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+
+ <sourceDirectory>src</sourceDirectory>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+ <source>${java-version}</source>
+ <target>${java-version}</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+ <artifactId>android-maven-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <sdk>
+ <path>${env.ANDROID_HOME}</path>
+ <platform>${google.android-api}</platform>
+ </sdk>
+ </configuration>
+ <extensions>true</extensions>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+</project>
+
public class ChunkedUploadRemoteFileOperation extends UploadRemoteFileOperation {
- private static final long CHUNK_SIZE = 1024000;
+ public static final long CHUNK_SIZE = 1024000;
private static final String OC_CHUNKED_HEADER = "OC-Chunked";
private static final String TAG = ChunkedUploadRemoteFileOperation.class.getSimpleName();
<?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="0100010"
- android:versionName="1.0.10" >
+ android:versionCode="0100011"
+ android:versionName="1.0.11" >
<uses-sdk
android:minSdkVersion="16"
<modelVersion>4.0.0</modelVersion>
<groupId>com.owncloud.android</groupId>
<artifactId>owncloud</artifactId>
- <version>1.3.21-SNAPSHOT</version>
+ <version>${owncloud.version}</version>
<packaging>apk</packaging>
<name>Owncloud Android</name>
<properties>
+ <owncloud.version>1.5.1-SNAPSHOT</owncloud.version>
<java-version>1.6</java-version>
- <google.android-version>4.2.2_r2</google.android-version>
+ <!-- Given by maven-android-sdk-deployer -->
+ <google.android-version>4.4_r1</google.android-version>
+ <!-- Usually the latest Android API -->
+ <google.android-api>19</google.android-api>
<actionbarsherlock-version>4.2.0</actionbarsherlock-version>
</properties>
<developerConnection>scm:git:git@github.com:owncloud/android.git</developerConnection>
<url>https://github.com/owncloud/android</url>
</scm>
-
+
<dependencies>
<dependency>
<artifactId>jackrabbit-webdav</artifactId>
<version>2.5.2</version>
</dependency>
+
+ <!-- MUST BE INSTALLED FIRST: cd oc_framework; mvn install -->
+ <dependency>
+ <groupId>com.owncloud.android</groupId>
+ <artifactId>oc_framework</artifactId>
+ <version>${owncloud.version}</version>
+ </dependency>
</dependencies>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
- <version>3.5.0</version>
+ <version>3.8.0</version>
<configuration>
<sdk>
- <!-- platform or api level (api level 4 = platform 1.6)-->
<path>${env.ANDROID_HOME}</path>
- <platform>17</platform>
+ <platform>${google.android-api}</platform>
</sdk>
</configuration>
<extensions>true</extensions>
<string name="prefs_accounts">حسابات</string>
<string name="prefs_help">المساعدة</string>
<string name="prefs_imprint">الدمغة.</string>
- <string name="auth_host_url">عنوان الخادم</string>
<string name="auth_username">إسم المستخدم</string>
<string name="auth_password">كلمات السر</string>
<string name="auth_register">جديد لـ %1$s ؟</string>
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
<string name="prefs_accounts">Профили</string>
<string name="prefs_instant_upload_summary">Своевременно качване на снимки направени с камерата</string>
<string name="prefs_help">Помощ</string>
- <string name="auth_host_url">Адрес на сървъра</string>
<string name="auth_username">Потребител</string>
<string name="auth_password">Парола</string>
<string name="sync_string_files">Файлове</string>
<string name="prefs_category_more">বেশী</string>
<string name="prefs_accounts">একাউন্ট</string>
<string name="prefs_help">সহায়িকা</string>
- <string name="auth_host_url">সার্ভার ঠিকানা</string>
<string name="auth_username">ব্যবহারকারি</string>
<string name="auth_password">কূটশব্দ</string>
<string name="sync_string_files">ফাইল</string>
<string name="recommend_subject">Proveu %1$s a un telèfon avançat!</string>
<string name="recommend_text">Vull convidar-te a usar l\'aplicació %1$s al teu telèfon avançat!\nBaixa\'l aquí: %2$s</string>
<string name="auth_check_server">Comprova el servidor</string>
- <string name="auth_host_url">Adreça del servidor</string>
<string name="auth_username">Nom d\'usuari</string>
<string name="auth_password">Contrasenya</string>
<string name="auth_register">Nou a %1$s?</string>
<string name="recommend_subject">Zkuste %1$s na vašem smartphonu!</string>
<string name="recommend_text">Chtěl bych vás pozvat k používání %1$s na vašem smartphonu.\nKe stažení zde: %2$s</string>
<string name="auth_check_server">Zkontrolovat server</string>
- <string name="auth_host_url">Adresa serveru</string>
<string name="auth_username">Uživatelské jméno</string>
<string name="auth_password">Heslo</string>
<string name="auth_register">Nováček s %1$s?</string>
<string name="prefs_help">Hjælp</string>
<string name="prefs_imprint">Imprint</string>
<string name="auth_check_server">Check Server</string>
- <string name="auth_host_url">Serveradresse</string>
<string name="auth_username">Brugernavn</string>
<string name="auth_password">Kodeord</string>
<string name="auth_register">Uvant med %1$s</string>
<string name="prefs_feedback">Rückmeldungen</string>
<string name="prefs_imprint">Impressum</string>
<string name="auth_check_server">Server überprüfen</string>
- <string name="auth_host_url">Adresse des Servers</string>
<string name="auth_username">Benutzername</string>
<string name="auth_password">Passwort</string>
<string name="auth_register">Ist %1$s neu für Sie?</string>
<string name="recommend_subject">Probieren Sie %1$s auf Ihrem Smartphone!</string>
<string name="recommend_text">Ich möchte Sie zum Benutzen von %1$s auf Ihrem Smartphone einladen!\nLaden Sie es hier herunter: %2$s</string>
<string name="auth_check_server">Server überprüfen</string>
- <string name="auth_host_url">Adresse des Servers</string>
<string name="auth_username">Benutzername</string>
<string name="auth_password">Passwort</string>
<string name="auth_register">Ist %1$s neu für Sie?</string>
<string name="recommend_subject">Probiere %1$s auf Deinem Smartphone!</string>
<string name="recommend_text">Ich möchte Dich zu %1$s für Dein Smartphone einladen!\nLade es hier herunter: %2$s</string>
<string name="auth_check_server">Überprüfe den Server</string>
- <string name="auth_host_url">Adresse des Servers</string>
<string name="auth_username">Benutzername</string>
<string name="auth_password">Passwort</string>
<string name="auth_register">Ist %1$s neu für dich?</string>
<string name="recommend_subject">Δοκιμάστε %1$s στο κινητό σας!</string>
<string name="recommend_text">Θέλω να σας προσκαλέσω να χρησιμοποιήσετε το %1$s στο κινητό σας!\nΚατεβάστε το εδώ: %2$s</string>
<string name="auth_check_server">Έλεγχος Διακομιστή</string>
- <string name="auth_host_url">Διεύθυνση εξυπηρέτη</string>
<string name="auth_username">Όνομα χρήστη</string>
<string name="auth_password">Συνθηματικό</string>
<string name="sync_string_files">Αρχεία</string>
<string name="recommend_subject">Try %1$s on your smartphone!</string>
<string name="recommend_text">I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s</string>
<string name="auth_check_server">Check Server</string>
- <string name="auth_host_url">Server address</string>
<string name="auth_username">Username</string>
<string name="auth_password">Password</string>
<string name="auth_register">New to %1$s?</string>
<string name="prefs_instant_upload">Kapabligi tujan alŝuton</string>
<string name="prefs_instant_upload_summary">Tuje alŝuti fotojn faritajn per fotilo</string>
<string name="prefs_help">Helpo</string>
- <string name="auth_host_url">Servila adreso</string>
<string name="auth_username">Uzantonomo</string>
<string name="auth_password">Pasvorto</string>
<string name="sync_string_files">Dosieroj</string>
<string name="prefs_feedback">Sugerencias</string>
<string name="prefs_imprint">Imprint</string>
<string name="auth_check_server">Verificar Servidor</string>
- <string name="auth_host_url">Dirección del servidor</string>
<string name="auth_username">Nombre de usuario</string>
<string name="auth_password">Contraseña</string>
<string name="auth_register">¿Sos nuevo para %1$s?</string>
<string name="recommend_subject">Prueba %1$s en tu smarthphone!</string>
<string name="recommend_text">Quiero invitarte a usar %1$s en tu smarthphone!⏎\nDescargalo aquí: %2$s</string>
<string name="auth_check_server">Compruebe el servidor.</string>
- <string name="auth_host_url">Dirección del servidor</string>
<string name="auth_username">Nombre de usuario</string>
<string name="auth_password">Contraseña</string>
<string name="auth_register">New to %1$s?</string>
<string name="recommend_subject">Proovi oma nutitelefonil rakendust %1$s!</string>
<string name="recommend_text">Soovin sind kutsuda kasutama oma nutitelefonil rakendust %1$s!\nLae alla siit: %2$s</string>
<string name="auth_check_server">Kontrolli serverit</string>
- <string name="auth_host_url">Serveri aadress</string>
<string name="auth_username">Kasutajanimi</string>
<string name="auth_password">Parool</string>
<string name="auth_register">Uus %1$s kasutaja?</string>
<string name="prefs_log_delete_history_button">Ezabatu historia</string>
<string name="prefs_help">Laguntza</string>
<string name="prefs_recommend">Lagun bati aholkatu</string>
+ <string name="prefs_feedback">Oharrak</string>
<string name="prefs_imprint">Imprint</string>
<string name="recommend_subject">Probatu %1$s zure telefono adimentsuan!</string>
<string name="recommend_text">Nik %1$s zure telefono adimentsuan erabitzera gonbidatu nahi zaitut!\nDeskargatu hemen: %2$s</string>
<string name="auth_check_server">Egiaztatu zerbitzaria</string>
- <string name="auth_host_url">Zerbitzariaren helbidea</string>
<string name="auth_username">Erabiltzaile izena</string>
<string name="auth_password">Pasahitza</string>
<string name="auth_register">Berria %1$s-n?</string>
<string name="prefs_help">راهنما</string>
<string name="prefs_feedback">باز خورد</string>
<string name="prefs_imprint">مهر زدن</string>
- <string name="auth_host_url">آدرس سرور</string>
<string name="auth_username">نام کاربری</string>
<string name="auth_password">رمز عبور</string>
<string name="sync_string_files">پروندهها</string>
<string name="recommend_subject">Kokeile %1$sia älypuhelimellasi!</string>
<string name="recommend_text">Ota %1$s käyttöösi älypuhelimessa!\nLataa tästä: %2$s</string>
<string name="auth_check_server">Tarkista palvelin</string>
- <string name="auth_host_url">Palvelimen osoite</string>
<string name="auth_username">Käyttäjätunnus</string>
<string name="auth_password">Salasana</string>
<string name="auth_register">Onko %1$s uusi tuttavuus sinulle?</string>
<string name="recommend_subject">Essayez %1$s sur votre smartphone !</string>
<string name="recommend_text">J\'aimerais vous inviter à utiliser %1$s sur votre smartphone !\nTéléchargez-le ici : %2$s</string>
<string name="auth_check_server">Vérifier le serveur</string>
- <string name="auth_host_url">Adresse du serveur</string>
<string name="auth_username">Nom d\'utilisateur</string>
<string name="auth_password">Mot de passe</string>
<string name="auth_register">Nouveau dans %1$s ?</string>
<string name="recommend_subject">Tente %1$s no seu teléfono intelixente!</string>
<string name="recommend_text">Quero convidalo a empregar %1$s no seu teléfono intelixente!⏎\nDescárgueo de aquí:%2$s</string>
<string name="auth_check_server">Comprobar o servidor</string>
- <string name="auth_host_url">Enderezo do servidor</string>
<string name="auth_username">Nome de usuario</string>
<string name="auth_password">Contrasinal</string>
<string name="auth_register">Novo en %1$s?</string>
<string name="prefs_instant_upload">הפעלת העלאות מהירות</string>
<string name="prefs_instant_upload_summary">העלאה מהירה של תמונות שמצולמות במצלמה שלך</string>
<string name="prefs_help">עזרה</string>
- <string name="auth_host_url">כתובת שרת</string>
<string name="auth_username">שם משתמש</string>
<string name="auth_password">ססמה</string>
<string name="sync_string_files">קבצים</string>
<string name="recommend_subject">Próbálja ki %1$s-t az okostelefonján!</string>
<string name="recommend_text">Kérem próbálja ki %1$s-t az okostelefonján!\nInnen tölthető le: %2$s</string>
<string name="auth_check_server">Szerver állapot ellenörzés</string>
- <string name="auth_host_url">A kiszolgáló címe</string>
<string name="auth_username">Felhasználói név</string>
<string name="auth_password">Jelszó</string>
<string name="auth_register">Új vagy a %1$s területen?</string>
<string name="actionbar_upload">Incargar</string>
<string name="actionbar_upload_files">Files</string>
<string name="actionbar_settings">Configurationes</string>
+ <string name="prefs_category_general">General</string>
<string name="prefs_category_more">Plus</string>
<string name="prefs_help">Adjuta</string>
<string name="auth_username">Nomine de usator</string>
<resources>
<string name="actionbar_upload">Unggah</string>
<string name="actionbar_upload_files">Berkas</string>
+ <string name="actionbar_mkdir">Buat folder</string>
<string name="actionbar_settings">pengaturan</string>
+ <string name="actionbar_see_details">Detail</string>
<string name="prefs_category_general">umum</string>
<string name="prefs_category_more">Lainnya</string>
+ <string name="prefs_accounts">Akun</string>
+ <string name="prefs_manage_accounts">Kolola Akun</string>
<string name="prefs_help">Bantuan</string>
<string name="prefs_imprint">Imprint</string>
- <string name="auth_host_url">alamat server</string>
<string name="auth_username">nama pengguna</string>
<string name="auth_password">kata kunci</string>
<string name="sync_string_files">Berkas</string>
+ <string name="setup_btn_connect">Sambungkan</string>
<string name="uploader_btn_upload_text">Unggah</string>
+ <string name="uploader_top_message">Pilih folder unggah</string>
+ <string name="uploader_wrn_no_account_title">Tidak ada akun yang ditemukan</string>
+ <string name="uploader_wrn_no_account_text">Belum ada akun %1$s pada perangkat Anda. Silahkan membuat akun terlebih dahulu.</string>
+ <string name="uploader_wrn_no_account_setup_btn_text">Pengaturan</string>
<string name="uploader_wrn_no_account_quit_btn_text">Keluar</string>
+ <string name="uploader_info_uploading">Mengunggah</string>
+ <string name="filedetails_select_file">Sentuh pada berkas untuk menampilkan informasi tambahan</string>
+ <string name="filedetails_size">Ukuran:</string>
+ <string name="filedetails_type">Tipe:</string>
+ <string name="filedetails_created">Dibuat:</string>
+ <string name="filedetails_modified">Diubah:</string>
<string name="filedetails_download">unduh</string>
+ <string name="filedetails_renamed_in_upload_msg">Berkas diubah namanya menjadi %1$s saat pengunggahan</string>
<string name="common_yes">Ya</string>
<string name="common_no">Tidak</string>
<string name="common_ok">Oke</string>
+ <string name="common_cancel_download">Batal mengunduh</string>
<string name="common_cancel_upload">Batal mengunggah</string>
<string name="common_cancel">batal</string>
+ <string name="common_save_exit">Simpan & Keluar</string>
<string name="common_error">kesalahan</string>
+ <string name="common_loading">Memuat ...</string>
+ <string name="common_error_unknown">Galat tidak diketahui</string>
+ <string name="about_title">Tentang</string>
<string name="change_password">Ubah sandi</string>
+ <string name="delete_account">Hapus akun</string>
+ <string name="create_account">Buat akun</string>
+ <string name="upload_chooser_title">Unggah dari...</string>
+ <string name="uploader_info_dirname">Nama folder</string>
+ <string name="uploader_upload_in_progress_ticker">Mengungggah...</string>
+ <string name="uploader_upload_in_progress_content">%1$d%% Mengunggah %2$s</string>
+ <string name="uploader_upload_succeeded_ticker">Berhasil mengunggah</string>
+ <string name="uploader_upload_succeeded_content_single">%1$s berhasil diunggah</string>
+ <string name="uploader_upload_failed_ticker">Gagal mengunggah</string>
+ <string name="uploader_upload_failed_content_single">Unggah %1$s tidak selesai</string>
+ <string name="downloader_download_in_progress_ticker">Mengunduh...</string>
+ <string name="downloader_download_in_progress_content">%1$d%% Mengunduh %2$s</string>
+ <string name="downloader_download_succeeded_ticker">Berhasil mengunduh</string>
+ <string name="downloader_download_succeeded_content">%1$s berhasil diunduh</string>
+ <string name="downloader_not_downloaded_yet">Belum diunduh</string>
+ <string name="common_choose_account">Pilih akun</string>
+ <string name="sync_conflicts_in_favourites_ticker">Konflik ditemukan</string>
+ <string name="foreign_files_move">Pindahkan semua</string>
+ <string name="foreign_files_success">Semua berkas sudah dipindahkan</string>
+ <string name="foreign_files_fail">Beberapa berkas tidak dapat dipindahkan</string>
+ <string name="foreign_files_local_text">Lokal: %1$s</string>
+ <string name="pincode_enter_pin_code">Silakan masukkan App PIN</string>
+ <string name="pincode_configure_your_pin">Masukkan App PIN</string>
+ <string name="pincode_reenter_your_pincode">Silakan masukkan ulang App PIN</string>
+ <string name="pincode_remove_your_pincode">Hapus App PIN</string>
+ <string name="pincode_mismatch">App PIN tidak sama</string>
+ <string name="pincode_wrong">App PIN salah</string>
+ <string name="pincode_removed">App PIN dihapus</string>
+ <string name="pincode_stored">App PIN disimpan</string>
+ <string name="media_notif_ticker">Pemutar musik %1$s</string>
+ <string name="media_state_playing">%1$s (dimainkan)</string>
+ <string name="media_state_loading">%1$s (sedang dimuat)</string>
+ <string name="media_err_nothing_to_play">Tidak ditemukan berkas media</string>
+ <string name="media_err_no_account">Tidak ada akun yang diberikan</string>
+ <string name="media_err_not_in_owncloud">Brkas tidak didalam akun yang sah</string>
+ <string name="media_err_unsupported">Kodek media tidak didukung</string>
+ <string name="media_err_io">Berkas media tidak dapat dibaca</string>
+ <string name="auth_no_net_conn_title">Tidak ada koneksi internet</string>
+ <string name="auth_nossl_plain_ok_title">Sambungan aman tidak tersedia</string>
+ <string name="auth_connection_established">Sambungan dibuat</string>
+ <string name="auth_not_configured_title">Konfigurasi server cacat</string>
+ <string name="auth_unknown_error_title">Terjadi kesalahan yang tidak diketahui!</string>
+ <string name="auth_secure_connection">Sambungan aman dibuat</string>
<string name="common_rename">Ubah nama</string>
<string name="common_remove">hilangkan</string>
+ <string name="confirmation_remove_alert">Apakah Anda yakin ingin menghapus %1$s ?</string>
+ <string name="remove_success_msg">Penghapusan berhasil</string>
+ <string name="remove_fail_msg">Penghapusan gagal</string>
+ <string name="rename_dialog_title">Masukkan nama baru</string>
+ <string name="sync_file_nothing_to_do_msg">Isi berkas sudah diselaraskan</string>
+ <string name="filedisplay_unexpected_bad_get_content">Masalah tidak terduga, silahkan pilih berkas dari aplikasi yang berbeda</string>
+ <string name="ssl_validator_btn_details_see">Detail</string>
<string name="ssl_validator_btn_details_hide">sembunyikan</string>
+ <string name="ssl_validator_label_signature">Tanda tangan:</string>
+ <string name="ssl_validator_label_signature_algorithm">Algoritma:</string>
+ <string name="conflict_title">Perbarui benturan</string>
+ <string name="conflict_overwrite">Tindih</string>
+ <string name="conflict_dont_upload">Jangan mengunggah</string>
</resources>
<string name="actionbar_settings">Stillingar</string>
<string name="prefs_category_more">Meira</string>
<string name="prefs_help">Hjálp</string>
- <string name="auth_host_url">Host nafn netþjóns</string>
<string name="auth_username">Notendanafn</string>
<string name="auth_password">Lykilorð</string>
<string name="sync_string_files">Skrár</string>
<string name="recommend_subject">Prova %1$s sul tuo smartphone!</string>
<string name="recommend_text">Vorrei invitarti ad usare %1$s sul tuo smartphone!⏎\nScarica qui: %2$s</string>
<string name="auth_check_server">Verifica server</string>
- <string name="auth_host_url">Indirizzo del server</string>
<string name="auth_username">Nome utente</string>
<string name="auth_password">Password</string>
<string name="auth_register">Prima volta su %1$s?</string>
<string name="recommend_subject">スマートフォンで %1$s を試してください！</string>
<string name="recommend_text">スマートフォンで %1$s を利用してみませんか！\nここからダウンロードしてください: %2$s</string>
<string name="auth_check_server">サーバーを確認する</string>
- <string name="auth_host_url">サーバアドレス</string>
<string name="auth_username">ユーザー名</string>
<string name="auth_password">パスワード</string>
<string name="auth_register">%1$sは初めてですか？</string>
<string name="prefs_help">დახმარება</string>
<string name="prefs_feedback">უკუკავშირი</string>
<string name="prefs_imprint">ბეჭედი</string>
- <string name="auth_host_url">სერვერის მისამართი</string>
<string name="auth_username">მომხმარებლის სახელი</string>
<string name="auth_password">პაროლი</string>
<string name="sync_string_files">ფაილები</string>
<string name="prefs_imprint">임프린트</string>
<string name="recommend_subject">%1$s 을 스마트폰에서 사용해보세요!</string>
<string name="auth_check_server">서버 확인</string>
- <string name="auth_host_url">서버 주소</string>
<string name="auth_username">사용자 이름</string>
<string name="auth_password">암호</string>
<string name="auth_register">%1$s의 새로운 사용자입니까?</string>
<string name="actionbar_upload">بارکردن</string>
<string name="actionbar_settings">دهستكاری</string>
<string name="prefs_help">یارمەتی</string>
- <string name="auth_host_url">ناونیشانی ڕاژه</string>
<string name="auth_username">ناوی بهکارهێنهر</string>
<string name="auth_password">وشەی تێپەربو</string>
<string name="uploader_btn_upload_text">بارکردن</string>
<string name="prefs_pincode">App PIN</string>
<string name="prefs_help">Hëllef</string>
<string name="prefs_feedback">Feedback</string>
- <string name="auth_host_url">Server Adress</string>
<string name="auth_username">Benotzernumm</string>
<string name="auth_password">Passwuert</string>
<string name="sync_string_files">Dateien</string>
<string name="recommend_subject">Išbandykite %1$s savo išmaniajame telefone!</string>
<string name="recommend_text">Siūlau pabandyti %1$s savo išmaniajame telefone!\nParsisiųskite štai čia: %2$s</string>
<string name="auth_check_server">Patikrinti Serverį</string>
- <string name="auth_host_url">Serverio adresas</string>
<string name="auth_username">Prisijungimo vardas</string>
<string name="auth_password">Slaptažodis</string>
<string name="sync_string_files">Failai</string>
<string name="prefs_instant_upload">Aktivēt tūlītējo augšupielādēšanu</string>
<string name="prefs_instant_upload_summary">Nekavējoties augšupielādēt kameras uzņemtos attēlus</string>
<string name="prefs_help">Palīdzība</string>
- <string name="auth_host_url">Servera adrese</string>
<string name="auth_username">Lietotājvārds</string>
<string name="auth_password">Parole</string>
<string name="sync_string_files">Datnes</string>
<string name="prefs_help">Помош</string>
<string name="prefs_recommend">Препорачај на пријател</string>
<string name="prefs_feedback">Повратен одговор</string>
- <string name="auth_host_url">Адреса на сервер</string>
<string name="auth_username">Корисничко име</string>
<string name="auth_password">Лозинка</string>
<string name="sync_string_files">Датотеки</string>
<string name="prefs_accounts">Akaun</string>
<string name="prefs_pincode">PIN App</string>
<string name="prefs_help">Bantuan</string>
- <string name="auth_host_url">Alamat pelayan</string>
<string name="auth_username">Nama pengguna</string>
<string name="auth_password">Kata laluan</string>
<string name="sync_string_files">Fail-fail</string>
<string name="prefs_accounts">Kontoer</string>
<string name="prefs_instant_upload_summary">Last opp bilder tatt med kamera øyeblikkelig</string>
<string name="prefs_help">Hjelp</string>
- <string name="auth_host_url">Server-adresse</string>
<string name="auth_username">Brukernavn</string>
<string name="auth_password">Passord</string>
<string name="sync_string_files">Filer</string>
<string name="recommend_subject">Probeer %1$s op uw smartphone!</string>
<string name="recommend_text">Uitnodiging om %1$s op uw smartphone uit te proberen!\nDownload hier: %2$s</string>
<string name="auth_check_server">Controleer server</string>
- <string name="auth_host_url">Server adres</string>
<string name="auth_username">Gebruikersnaam</string>
<string name="auth_password">Wachtwoord</string>
<string name="auth_register">Nieuw bij %1$s?</string>
<string name="prefs_instant_upload_summary">Last opp kamerabilete med ein gong du tek dei</string>
<string name="prefs_help">Hjelp</string>
<string name="prefs_imprint">Impressum</string>
- <string name="auth_host_url">Tenaradresse</string>
<string name="auth_username">Brukarnamn</string>
<string name="auth_password">Passord</string>
<string name="sync_string_files">Filer</string>
<string name="prefs_log_title">ਲਾਗ ਰੱਖਣਾ ਚਾਲੂ</string>
<string name="prefs_log_title_history">ਲਾਗ ਰੱਖਣ ਅਤੀਤ</string>
<string name="prefs_log_delete_history_button">ਅਤੀਤ ਹਟਆਓ</string>
- <string name="auth_host_url">ਸਰਵਰ ਐਡਰੈਸ</string>
<string name="auth_username">ਯੂਜ਼ਰ-ਨਾਂ</string>
<string name="auth_password">ਪਾਸਵਰ</string>
<string name="auth_register">%1$s ਲਈ ਨਵੇਂ ਹੋ?</string>
<string name="recommend_subject">Wypróbuj %1$s na swoim smartphonie!</string>
<string name="recommend_text">Chcę was zaprosić do korzystania z %1$ s na twoim smartfonie!\nPobierz tutaj: %2$s</string>
<string name="auth_check_server">Sprawdź serwer</string>
- <string name="auth_host_url">Adres Serwera</string>
<string name="auth_username">Nazwa użytkownika</string>
<string name="auth_password">Hasło</string>
<string name="auth_register">Nowe %1$s?</string>
<string name="sync_file_fail_msg">Nie można sprawdzić zdalnego pliku</string>
<string name="sync_file_nothing_to_do_msg">Zawartość pliku została już synchronizowana</string>
<string name="create_dir_fail_msg">Nie można utworzyć katalogu</string>
+ <string name="filename_forbidden_characters">Znaki zabronione: / \\ < > : \" | ? *</string>
<string name="wait_a_moment">Poczekaj chwilę</string>
<string name="filedisplay_unexpected_bad_get_content">Nieoczekiwany problem; spróbuj wybrać plik z innej aplikacji</string>
<string name="filedisplay_no_file_selected">Nie wybrano żadnych plików</string>
<string name="preview_image_description">Podgląd</string>
<string name="preview_image_error_unknown_format">Obraz nie może zostać wyświetlony</string>
<string name="error__upload__local_file_not_copied">%1$s nie może zostać skopiowany do lokalnego %2$s katalogu</string>
+ <string name="actionbar_failed_instant_upload">InstantUpload nie powiódł się</string>
<string name="failed_upload_headline_text">Błąd automatycznego przesyłania</string>
<string name="failed_upload_headline_hint">Podsumowanie wszystkich nieudanych transferów</string>
<string name="failed_upload_all_cb">zaznacz wszystkie</string>
<string name="recommend_subject">Tentar %1$s em seu smartfone!</string>
<string name="recommend_text">Gostaria de lhe convidar para usar %1$s em seu smartfone!\nBaixe aqui: %2$s</string>
<string name="auth_check_server">Verificar Servidor</string>
- <string name="auth_host_url">Endereço do servidor</string>
<string name="auth_username">Nome de usuário</string>
<string name="auth_password">Senha</string>
<string name="auth_register">Novo para %1$s?</string>
<string name="recommend_subject">Experimente %1$s no seu smartphone!</string>
<string name="recommend_text">Quero convidá-lo para experimentar %1$s no seu smartphone!\nDescarregue aqui: %2$s</string>
<string name="auth_check_server">Verificar Servidor</string>
- <string name="auth_host_url">Endereço do servidor</string>
<string name="auth_username">Nome de Utilizador</string>
<string name="auth_password">Palavra-passe</string>
<string name="auth_register">Novo em %1$s?</string>
<string name="prefs_manage_accounts">Administrare conturi</string>
<string name="prefs_instant_upload">Activează încărcarea instant</string>
<string name="prefs_help">Ajutor</string>
- <string name="auth_host_url">Adresa server-ului</string>
<string name="auth_username">Nume utilizator</string>
<string name="auth_password">Parolă</string>
<string name="sync_string_files">Fișiere</string>
<string name="prefs_instant_upload">Включить немедленную загрузку</string>
<string name="prefs_instant_upload_summary">Мгновенно загрузить фотографии, сделанные камерой</string>
<string name="prefs_help">Помощь</string>
- <string name="auth_host_url">URL</string>
<string name="auth_username">Имя пользователя</string>
<string name="auth_password">Пароль</string>
<string name="auth_register">Я новичок в %1$s</string>
<string name="recommend_subject">Попробуйте %1$s на вашем смартфоне!</string>
<string name="recommend_text">Хочу предложить вам пользоваться %1$s на вашем смартфоне!\nДля загрузки: %2$s</string>
<string name="auth_check_server">Проверить сервер</string>
- <string name="auth_host_url">Адрес сервера</string>
<string name="auth_username">Пользователь</string>
<string name="auth_password">Пароль</string>
<string name="auth_register">Впервые с %1$s?</string>
<string name="prefs_instant_upload">ක්ෂණික උඩුගත කිරීම් සක්රිය කරන්න</string>
<string name="prefs_instant_upload_summary">කැමරාවෙන් ගත් රූප ක්ෂණිකව උඩුගත කරන්න</string>
<string name="prefs_help">උදව්</string>
- <string name="auth_host_url">සේවාදායකයේ ලිපිනය</string>
<string name="auth_username">පරිශීලක නම</string>
<string name="auth_password">මුර පදය</string>
<string name="sync_string_files">ගොනු</string>
<string name="recommend_subject">Skúste %1$s na vašom telefóne!</string>
<string name="recommend_text">Chcem vás pozvať na používanie %1$s na vašom smartphone!\nNa stiahnutie tu: %2$s</string>
<string name="auth_check_server">Skontrolovať Server</string>
- <string name="auth_host_url">Adresa servera</string>
<string name="auth_username">Používateľské meno</string>
<string name="auth_password">Heslo</string>
<string name="auth_register">Ste nový v %1$s?</string>
<string name="recommend_subject">Preizkusi %1$s na pametnem telefonu!</string>
<string name="recommend_text">Želim ti predstaviti program %1$s za pametni telefon!\nPrejmeš ga lahko na: %2$s</string>
<string name="auth_check_server">Preveri strežnik</string>
- <string name="auth_host_url">Naslov strežnika</string>
<string name="auth_username">Uporabniško ime</string>
<string name="auth_password">Geslo</string>
<string name="auth_register">Ali ste novi uporabnik sistema %1$s?</string>
<string name="prefs_accounts">Налози</string>
<string name="prefs_instant_upload_summary">Тренутно отпремај фотографије сликане камером</string>
<string name="prefs_help">Помоћ</string>
- <string name="auth_host_url">Адреса сервера</string>
<string name="auth_username">Корисничко име</string>
<string name="auth_password">Лозинка</string>
<string name="sync_string_files">Фајлови</string>
<string name="recommend_subject">Försök %1$s på din smarttelefon!</string>
<string name="recommend_text">Jag vill bjuda in dig till att anända %1$s på din smarttelefon!\nLadda ner här: %2$s</string>
<string name="auth_check_server">Kontrollera Server</string>
- <string name="auth_host_url">Serveradress</string>
<string name="auth_username">Användarnamn</string>
<string name="auth_password">Lösenord</string>
<string name="auth_register">Ny på %1$s?</string>
<string name="prefs_instant_upload">உடனடி பதிவேற்றலை இயலுமைப்படுத்துக</string>
<string name="prefs_instant_upload_summary">கமராவினால் எடுக்கப்பட்ட படங்கள் உடனடியாக பதிவேற்றப்பட்டன</string>
<string name="prefs_help">உதவி</string>
- <string name="auth_host_url">சேவையக முகவரி</string>
<string name="auth_username">பயனாளர் பெயர்</string>
<string name="auth_password">கடவுச்சொல்</string>
<string name="sync_string_files">கோப்புகள்</string>
<string name="actionbar_settings">అమరికలు</string>
<string name="prefs_category_more">మరిన్ని</string>
<string name="prefs_help">సహాయం</string>
- <string name="auth_host_url">సేవకి చిరునామా</string>
<string name="auth_username">వాడుకరి పేరు</string>
<string name="auth_password">సంకేతపదం</string>
<string name="common_yes">అవును</string>
<string name="prefs_instant_upload">เปิดใช้งานระบบอัพโหลดได้ทันที</string>
<string name="prefs_instant_upload_summary">อัพโหลดรูปภาพจากกล้องขึ้นไปทันที</string>
<string name="prefs_help">ช่วยเหลือ</string>
- <string name="auth_host_url">ที่อยู่เซิร์ฟเวอร์</string>
<string name="auth_username">ชื่อผู้ใช้</string>
<string name="auth_password">รหัสผ่าน</string>
<string name="sync_string_files">ไฟล์</string>
<string name="recommend_subject">%1$s uygulamasını akıllı telefonunda dene!</string>
<string name="recommend_text">Sana, akıllı telefonunda kullanmak üzere %1$s daveti yapıyorum!\nBuradan indirebilirsin: %2$s</string>
<string name="auth_check_server">Sunucuyu kontrol et</string>
- <string name="auth_host_url">Sunucu Adresi</string>
<string name="auth_username">Kullanıcı Adi:</string>
<string name="auth_password">Şifre:</string>
<string name="auth_register">%1$s senin için yeni mi?</string>
<string name="prefs_accounts">ھېساباتلار</string>
<string name="prefs_help">ياردەم</string>
<string name="prefs_feedback">قايتۇرما ئىنكاس</string>
- <string name="auth_host_url">مۇلازىمېتىر ئادرىسى</string>
<string name="auth_username">ئىشلەتكۈچى ئاتى</string>
<string name="auth_password">ئىم</string>
<string name="sync_string_files">ھۆججەتلەر</string>
<string name="prefs_help">Допомога</string>
<string name="prefs_feedback">Зворотній зв\'язок</string>
<string name="prefs_imprint">Відбиток</string>
- <string name="auth_host_url">Адреса сервера</string>
<string name="auth_username">Ім\'я користувача</string>
<string name="auth_password">Пароль</string>
<string name="sync_string_files">Файли</string>
<string name="prefs_log_delete_history_button">Xóa lịch sử</string>
<string name="prefs_help">Giúp đỡ</string>
<string name="auth_check_server">Kiểm tra máy chủ</string>
- <string name="auth_host_url">Địa chỉ máy chủ</string>
<string name="auth_username">Tên người dùng</string>
<string name="auth_password">Mật khẩu</string>
<string name="auth_register">Lần đầu mới đến %1$s?</string>
<string name="prefs_feedback">反馈</string>
<string name="prefs_imprint">版本说明</string>
<string name="auth_check_server">检查服务器</string>
- <string name="auth_host_url">服务器地址</string>
<string name="auth_username">用户名</string>
<string name="auth_password">密码</string>
<string name="sync_string_files">文件</string>
<string name="prefs_feedback">反饋</string>
<string name="prefs_imprint">法律聲明</string>
<string name="auth_check_server">檢查伺服器</string>
- <string name="auth_host_url">伺服器位址</string>
<string name="auth_username">使用者名稱</string>
<string name="auth_password">密碼</string>
<string name="auth_register">新增到 %1$s?</string>
<string name="recommend_text">"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"</string>
<string name="auth_check_server">Check Server</string>
- <string name="auth_host_url">Server address</string>
+ <string name="auth_host_url">Server address https://…</string>
<string name="auth_username">Username</string>
<string name="auth_password">Password</string>
<string name="auth_register">New to %1$s?</string>
import java.util.Map;
import com.owncloud.android.R;
+import com.owncloud.android.utils.DisplayUtils;
import android.app.Notification;
import android.app.NotificationManager;
switch (type) {
case NOTIFICATION_SIMPLE:
- notification = new Notification(R.drawable.icon, data.getText(), System.currentTimeMillis());
+ notification = new Notification(DisplayUtils.getSeasonalIconId(), data.getText(), System.currentTimeMillis());
break;
case NOTIFICATION_PROGRESS:
notification = new Notification();
false);
return true;
case NOTIFICATION_SIMPLE:
- pair.mNotificaiton = new Notification(R.drawable.icon,
+ pair.mNotificaiton = new Notification(DisplayUtils.getSeasonalIconId(),
data.getText(), System.currentTimeMillis());
mNM.notify(notification_id, pair.mNotificaiton);
return true;
import com.owncloud.android.ui.activity.FileDisplayActivity;
import com.owncloud.android.ui.preview.PreviewImageActivity;
import com.owncloud.android.ui.preview.PreviewImageFragment;
+import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.Log_OC;
import android.accounts.Account;
private void notifyDownloadStart(DownloadFileOperation download) {
/// create status notification with a progress bar
mLastPercent = 0;
- mNotification = new Notification(R.drawable.icon, getString(R.string.downloader_download_in_progress_ticker), System.currentTimeMillis());
+ mNotification = new Notification(DisplayUtils.getSeasonalIconId(), getString(R.string.downloader_download_in_progress_ticker), System.currentTimeMillis());
mNotification.flags |= Notification.FLAG_ONGOING_EVENT;
mNotification.contentView = new RemoteViews(getApplicationContext().getPackageName(), R.layout.progressbar_layout);
mNotification.contentView.setProgressBar(R.id.status_progress, 100, 0, download.getSize() < 0);
mNotification.contentView.setTextViewText(R.id.status_text, String.format(getString(R.string.downloader_download_in_progress_content), 0, new File(download.getSavePath()).getName()));
- mNotification.contentView.setImageViewResource(R.id.status_icon, R.drawable.icon);
+ mNotification.contentView.setImageViewResource(R.id.status_icon, DisplayUtils.getSeasonalIconId());
/// includes a pending intent in the notification showing the details view of the file
Intent showDetailsIntent = null;
if (!downloadResult.isCancelled()) {
int tickerId = (downloadResult.isSuccess()) ? R.string.downloader_download_succeeded_ticker : R.string.downloader_download_failed_ticker;
int contentId = (downloadResult.isSuccess()) ? R.string.downloader_download_succeeded_content : R.string.downloader_download_failed_content;
- Notification finalNotification = new Notification(R.drawable.icon, getString(tickerId), System.currentTimeMillis());
+ Notification finalNotification = new Notification(DisplayUtils.getSeasonalIconId(), getString(tickerId), System.currentTimeMillis());
finalNotification.flags |= Notification.FLAG_AUTO_CANCEL;
boolean needsToUpdateCredentials = (downloadResult.getCode() == ResultCode.UNAUTHORIZED ||
// (downloadResult.isTemporalRedirection() && downloadResult.isIdPRedirection()
import com.owncloud.android.ui.activity.InstantUploadActivity;
import com.owncloud.android.ui.preview.PreviewImageActivity;
import com.owncloud.android.ui.preview.PreviewImageFragment;
+import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.Log_OC;
import android.accounts.Account;
private void notifyUploadStart(UploadFileOperation upload) {
// / create status notification with a progress bar
mLastPercent = 0;
- mNotification = new Notification(R.drawable.icon, getString(R.string.uploader_upload_in_progress_ticker),
+ mNotification = new Notification(DisplayUtils.getSeasonalIconId(), getString(R.string.uploader_upload_in_progress_ticker),
System.currentTimeMillis());
mNotification.flags |= Notification.FLAG_ONGOING_EVENT;
mDefaultNotificationContentView = mNotification.contentView;
mNotification.contentView.setProgressBar(R.id.status_progress, 100, 0, false);
mNotification.contentView.setTextViewText(R.id.status_text,
String.format(getString(R.string.uploader_upload_in_progress_content), 0, upload.getFileName()));
- mNotification.contentView.setImageViewResource(R.id.status_icon, R.drawable.icon);
+ mNotification.contentView.setImageViewResource(R.id.status_icon, DisplayUtils.getSeasonalIconId());
/// includes a pending intent in the notification showing the details view of the file
Intent showDetailsIntent = new Intent(this, FileDisplayActivity.class);
// / fail -> explicit failure notification
mNotificationManager.cancel(R.string.uploader_upload_in_progress_ticker);
- Notification finalNotification = new Notification(R.drawable.icon,
+ Notification finalNotification = new Notification(DisplayUtils.getSeasonalIconId(),
getString(R.string.uploader_upload_failed_ticker), System.currentTimeMillis());
finalNotification.flags |= Notification.FLAG_AUTO_CANCEL;
String content = null;
import com.owncloud.android.operations.UpdateOCVersionOperation;
import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;
+import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.Log_OC;
* Notifies the user about a failed synchronization through the status notification bar
*/
private void notifyFailedSynchronization() {
- Notification notification = new Notification(R.drawable.icon, getContext().getString(R.string.sync_fail_ticker), System.currentTimeMillis());
+ Notification notification = new Notification(DisplayUtils.getSeasonalIconId(), getContext().getString(R.string.sync_fail_ticker), System.currentTimeMillis());
notification.flags |= Notification.FLAG_AUTO_CANCEL;
boolean needsToUpdateCredentials = (mLastFailedResult != null &&
( mLastFailedResult.getCode() == ResultCode.UNAUTHORIZED ||
*/
private void notifyFailsInFavourites() {
if (mFailedResultsCounter > 0) {
- Notification notification = new Notification(R.drawable.icon, getContext().getString(R.string.sync_fail_in_favourites_ticker), System.currentTimeMillis());
+ Notification notification = new Notification(DisplayUtils.getSeasonalIconId(), getContext().getString(R.string.sync_fail_in_favourites_ticker), System.currentTimeMillis());
notification.flags |= Notification.FLAG_AUTO_CANCEL;
// TODO put something smart in the contentIntent below
notification.contentIntent = PendingIntent.getActivity(getContext().getApplicationContext(), (int)System.currentTimeMillis(), new Intent(), 0);
((NotificationManager) getContext().getSystemService(Context.NOTIFICATION_SERVICE)).notify(R.string.sync_fail_in_favourites_ticker, notification);
} else {
- Notification notification = new Notification(R.drawable.icon, getContext().getString(R.string.sync_conflicts_in_favourites_ticker), System.currentTimeMillis());
+ Notification notification = new Notification(DisplayUtils.getSeasonalIconId(), getContext().getString(R.string.sync_conflicts_in_favourites_ticker), System.currentTimeMillis());
notification.flags |= Notification.FLAG_AUTO_CANCEL;
// TODO put something smart in the contentIntent below
notification.contentIntent = PendingIntent.getActivity(getContext().getApplicationContext(), (int)System.currentTimeMillis(), new Intent(), 0);
* We won't consider a synchronization as failed when foreign files can not be copied to the ownCloud local directory.
*/
private void notifyForgottenLocalFiles() {
- Notification notification = new Notification(R.drawable.icon, getContext().getString(R.string.sync_foreign_files_forgotten_ticker), System.currentTimeMillis());
+ Notification notification = new Notification(DisplayUtils.getSeasonalIconId(), getContext().getString(R.string.sync_foreign_files_forgotten_ticker), System.currentTimeMillis());
notification.flags |= Notification.FLAG_AUTO_CANCEL;
/// includes a pending intent in the notification showing a more detailed explanation
import android.accounts.AccountManager;
import android.accounts.AccountManagerCallback;
import android.accounts.AccountManagerFuture;
-import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import com.owncloud.android.authentication.AuthenticatorActivity;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.oc_framework.accounts.OwnCloudAccount;
+import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.Log_OC;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
mPreviousAccount = AccountUtils.getCurrentOwnCloudAccount(this);
}
- ActionBar action_bar = getSupportActionBar();
- action_bar.setDisplayShowTitleEnabled(true);
- action_bar.setDisplayHomeAsUpEnabled(false);
+ ActionBar actionBar = getSupportActionBar();
+ actionBar.setIcon(DisplayUtils.getSeasonalIconId());
+ actionBar.setDisplayShowTitleEnabled(true);
+ actionBar.setDisplayHomeAsUpEnabled(false);
}
@Override
package com.owncloud.android.ui.activity;
+import com.actionbarsherlock.app.ActionBar;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.ui.dialog.ConflictsResolveDialog;
import com.owncloud.android.ui.dialog.ConflictsResolveDialog.Decision;
import com.owncloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionMadeListener;
+import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.Log_OC;
import android.content.Intent;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ ActionBar actionBar = getSupportActionBar();
+ actionBar.setIcon(DisplayUtils.getSeasonalIconId());
}
@Override
- public void ConflictDecisionMade(Decision decision) {
+ public void conflictDecisionMade(Decision decision) {
Intent i = new Intent(getApplicationContext(), FileUploader.class);
switch (decision) {
import com.owncloud.android.ui.preview.PreviewImageActivity;
import com.owncloud.android.ui.preview.PreviewMediaFragment;
import com.owncloud.android.ui.preview.PreviewVideoActivity;
+import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.Log_OC;
// Action bar setup
mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
getSupportActionBar().setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation
- setSupportProgressBarIndeterminateVisibility(mSyncInProgress); // always AFTER setContentView(...) ; to work around bug in its implementation
-
-
+ setSupportProgressBarIndeterminateVisibility(mSyncInProgress); // always AFTER setContentView(...) ; to work around bug in its implementation
Log_OC.d(TAG, "onCreate() end");
}
-
+
+ @Override
+ protected void onStart() {
+ super.onStart();
+ getSupportActionBar().setIcon(DisplayUtils.getSeasonalIconId());
+ }
@Override
protected void onDestroy() {
}
-// private void updateDisplayHomeAtSync(){
-// ActionBar actionBar = getSupportActionBar();
-// OCFile currentDir = getCurrentDir();
-// if (currentDir.getParentId() != DataStorageManager.ROOT_PARENT_ID) {
-// actionBar.setHomeButtonEnabled(!mSyncInProgress);
-// actionBar.setDisplayHomeAsUpEnabled(!mSyncInProgress);
-// }
-// else {
-// actionBar.setHomeButtonEnabled(true);
-// actionBar.setDisplayHomeAsUpEnabled(false);
-// }
-// }
-//
/**
* {@inheritDoc}
*/
import android.widget.ListView;
import android.widget.TextView;
+import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.owncloud.android.R;
+import com.owncloud.android.utils.DisplayUtils;
/**
} else {
listView.setVisibility(View.GONE);
}
+
+ ActionBar actionBar = getSupportActionBar();
+ actionBar.setIcon(DisplayUtils.getSeasonalIconId());
}
public class ExplanationListAdapterView extends ArrayAdapter<String> {
import com.actionbarsherlock.view.MenuItem;
import com.owncloud.android.R;
import com.owncloud.android.ui.adapter.LogListAdapter;
+import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.FileStorageUtils;
setContentView(R.layout.log_send_file);
setTitle("Log History");
ActionBar actionBar = getSherlock().getActionBar();
+ actionBar.setIcon(DisplayUtils.getSeasonalIconId());
actionBar.setDisplayHomeAsUpEnabled(true);
ListView listView = (ListView) findViewById(android.R.id.list);
Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton);
import java.util.Arrays;
+import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.owncloud.android.R;
+import com.owncloud.android.utils.DisplayUtils;
import android.app.AlertDialog;
import android.content.DialogInterface;
}
setTextListeners();
-
+ ActionBar actionBar = getSupportActionBar();
+ actionBar.setIcon(DisplayUtils.getSeasonalIconId());
}
*/
package com.owncloud.android.ui.activity;
-import java.util.Vector;
-
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import com.actionbarsherlock.view.MenuItem;
import com.owncloud.android.R;
import com.owncloud.android.db.DbHandler;
+import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.Log_OC;
-import com.owncloud.android.utils.OwnCloudSession;
/**
public class Preferences extends SherlockPreferenceActivity {
private static final String TAG = "OwnCloudPreferences";
- private final int mNewSession = 47;
- private final int mEditSession = 48;
private DbHandler mDbHandler;
- private Vector<OwnCloudSession> mSessions;
private CheckBoxPreference pCode;
//private CheckBoxPreference pLogging;
//private Preference pLoggingHistory;
private Preference pAboutApp;
- private int mSelectedMenuItem;
@SuppressWarnings("deprecation")
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mDbHandler = new DbHandler(getBaseContext());
- mSessions = new Vector<OwnCloudSession>();
addPreferencesFromResource(R.xml.preferences);
//populateAccountList();
ActionBar actionBar = getSherlock().getActionBar();
+ actionBar.setIcon(DisplayUtils.getSeasonalIconId());
actionBar.setDisplayHomeAsUpEnabled(true);
Preference p = findPreference("manage_account");
import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
import com.owncloud.android.ui.fragment.LocalFileListFragment;
import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
+import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.FileStorageUtils;
import com.owncloud.android.utils.Log_OC;
// Action bar setup
ActionBar actionBar = getSupportActionBar();
+ actionBar.setIcon(DisplayUtils.getSeasonalIconId());
actionBar.setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation
actionBar.setDisplayHomeAsUpEnabled(mCurrentDir != null && mCurrentDir.getName() != null);
actionBar.setDisplayShowTitleEnabled(false);
import com.actionbarsherlock.app.SherlockDialogFragment;
import com.owncloud.android.R;
+import com.owncloud.android.utils.DisplayUtils;
/**
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
Dialog dialog = builder.setView(webview)
- .setIcon(R.drawable.icon)
+ .setIcon(DisplayUtils.getSeasonalIconId())
//.setTitle(R.string.whats_new)
.setPositiveButton(R.string.common_ok,
new DialogInterface.OnClickListener() {
import com.actionbarsherlock.app.SherlockDialogFragment;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.owncloud.android.R;
+import com.owncloud.android.utils.DisplayUtils;
/**
public Dialog onCreateDialog(Bundle savedInstanceState) {
String remotepath = getArguments().getString("remotepath");
return new AlertDialog.Builder(getSherlockActivity())
- .setIcon(R.drawable.icon)
+ .setIcon(DisplayUtils.getSeasonalIconId())
.setTitle(R.string.conflict_title)
.setMessage(String.format(getString(R.string.conflict_message), remotepath))
.setPositiveButton(R.string.conflict_overwrite,
@Override
public void onClick(DialogInterface dialog, int which) {
if (mListener != null)
- mListener.ConflictDecisionMade(Decision.OVERWRITE);
+ mListener.conflictDecisionMade(Decision.OVERWRITE);
}
})
.setNeutralButton(R.string.conflict_keep_both,
@Override
public void onClick(DialogInterface dialog, int which) {
if (mListener != null)
- mListener.ConflictDecisionMade(Decision.KEEP_BOTH);
+ mListener.conflictDecisionMade(Decision.KEEP_BOTH);
}
})
.setNegativeButton(R.string.conflict_dont_upload,
@Override
public void onClick(DialogInterface dialog, int which) {
if (mListener != null)
- mListener.ConflictDecisionMade(Decision.CANCEL);
+ mListener.conflictDecisionMade(Decision.CANCEL);
}
})
.create();
@Override
public void onCancel(DialogInterface dialog) {
- mListener.ConflictDecisionMade(Decision.CANCEL);
+ mListener.conflictDecisionMade(Decision.CANCEL);
}
public interface OnConflictDecisionMadeListener {
- public void ConflictDecisionMade(Decision decision);
+ public void conflictDecisionMade(Decision decision);
}
}
import com.owncloud.android.ui.activity.FileDisplayActivity;
import com.owncloud.android.ui.dialog.LoadingDialog;
import com.owncloud.android.ui.fragment.FileFragment;
+import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.Log_OC;
setContentView(R.layout.preview_image_activity);
ActionBar actionBar = getSupportActionBar();
+ actionBar.setIcon(DisplayUtils.getSeasonalIconId());
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.hide();
package com.owncloud.android.utils;\r
\r
import java.util.Arrays;\r
+import java.util.Calendar;\r
import java.util.Date;\r
import java.util.HashMap;\r
import java.util.HashSet;\r
import java.util.Set;\r
\r
import com.owncloud.android.R;\r
-import com.owncloud.android.R.drawable;\r
\r
/**\r
* A helper class for some string operations.\r
Date date = new Date(milliseconds);\r
return date.toLocaleString();\r
}\r
+ \r
+ \r
+ public static int getSeasonalIconId() {\r
+ if (Calendar.getInstance().get(Calendar.DAY_OF_YEAR) >= 354) {\r
+ return R.drawable.winter_holidays_icon;\r
+ } else {\r
+ return R.drawable.icon;\r
+ }\r
+ }\r
}\r
projects / pub / Android / ownCloud.git / commitdiff
