mirror of
https://github.com/nextcloud/android.git
synced 2024-11-23 21:55:48 +03:00
Merge branch 'develop' into check_server_certificates_in_SSO_webview
This commit is contained in:
masensio
commit
101cbbe492
76 changed files with 254 additions and 55 deletions
|
|
@ -92,11 +92,15 @@
|
|||
<activity android:name=".ui.activity.PreferencesNewSessionewSession" >
|
||||
</activity>
|
||||
|
||||
<activity android:name=".ui.preview.PreviewImageActivity" />
|
||||
<activity
|
||||
android:name=".ui.preview.PreviewImageActivity"
|
||||
/>
|
||||
|
||||
<activity android:name=".ui.preview.PreviewVideoActivity"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/Theme.ownCloud.Fullscreen" >
|
||||
<activity
|
||||
android:name=".ui.preview.PreviewVideoActivity"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/Theme.ownCloud.Fullscreen"
|
||||
>
|
||||
</activity>
|
||||
|
||||
<service
|
||||
|
|
|
|||
|
|
@ -217,4 +217,5 @@
|
|||
<string name="share_link_file_error">حدث خطأ ما أثناء محاولة مشاركة هذا الملف أو المجلد</string>
|
||||
<string name="unshare_link_file_no_exist">غير قادر على إلغاء مشاركة هذا الملف أو المجلد.لا وجود له</string>
|
||||
<string name="unshare_link_file_error">حدث خطأ ما أثناء محاولة إلغاء مشاركة هذا الملف أو المجلد</string>
|
||||
<string name="activity_chooser_send_file_title">أرسل</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -75,4 +75,5 @@
|
|||
<string name="wait_a_moment">Изчакайте малко</string>
|
||||
<string name="filedisplay_no_file_selected">Не е избран файл</string>
|
||||
<string name="ssl_validator_header">Самоличността на сайта не може да бъде проверена</string>
|
||||
<string name="activity_chooser_send_file_title">Изпрати</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -35,4 +35,5 @@
|
|||
<string name="common_choose_account">একাউন্ট নির্বাচন</string>
|
||||
<string name="common_rename">পূনঃনামকরণ</string>
|
||||
<string name="common_remove">অপসারণ</string>
|
||||
<string name="activity_chooser_send_file_title">পাঠাও</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@
|
|||
<string name="share_link_file_error">S\'ha produït un error en intentar compartir aquest fitxer o carpeta</string>
|
||||
<string name="unshare_link_file_no_exist">No es pot deixar de compartir aquest fitxer o carpeta. No existeix.</string>
|
||||
<string name="unshare_link_file_error">S\'ha produït un error en intentar deixar de compartir aquest fitxer o carpeta</string>
|
||||
<string name="activity_chooser_send_file_title">Envia</string>
|
||||
<string name="copy_link">Copia l\'enllaç</string>
|
||||
<string name="clipboard_text_copied">S\'ha copiat al porta-retalls</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -238,6 +238,7 @@
|
|||
<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_no_exist">Nepodařilo se zrušit sdílení tohoto souboru nebo složky, protože neexistuje.</string>
|
||||
<string name="unshare_link_file_error">Při pokusu o zrušení sdílení tohoto souboru či složky nastala chyba</string>
|
||||
<string name="activity_chooser_send_file_title">Odeslat</string>
|
||||
<string name="copy_link">Zkopírovat odkaz</string>
|
||||
<string name="clipboard_text_copied">Zkopírováno do schránky</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -148,4 +148,5 @@
|
|||
<string name="conflict_overwrite">Trosysgrifio</string>
|
||||
<string name="conflict_dont_upload">Peidio llwytho i fyny</string>
|
||||
<string name="error__upload__local_file_not_copied">Methwyd copïo %1$s i blygell lleol %2$s</string>
|
||||
<string name="activity_chooser_send_file_title">Anfon</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -237,6 +237,7 @@
|
|||
<string name="share_link_file_no_exist">Kan ikke dele denne fil eller mappe. Find venligst ud af om den eksisterer</string>
|
||||
<string name="share_link_file_error">Der opstod en fejl ved deling af denne fil eller mappe</string>
|
||||
<string name="unshare_link_file_error">Der opstod en fejl ved stopning af deling af denne mappe.</string>
|
||||
<string name="activity_chooser_send_file_title">Send</string>
|
||||
<string name="copy_link">Kopier link</string>
|
||||
<string name="clipboard_text_copied">Kopieret til udklipsholder</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -213,5 +213,6 @@
|
|||
<string name="failed_upload_retry_do_nothing_text">Nicht durchgeführt - Nicht online für sofortigen Upload</string>
|
||||
<string name="failed_upload_failure_text">Fehlermeldung:</string>
|
||||
<string name="failed_upload_quota_exceeded_text">Bitte überprüfen Sie Ihre Serverkonfiguration. Vielleicht ist Ihr Nutzungslimit überschritten.</string>
|
||||
<string name="activity_chooser_send_file_title">Senden</string>
|
||||
<string name="clipboard_text_copied">In die Zwischenablage kopiert</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@
|
|||
<string name="share_link_file_error">Es ist ein Fehler beim Freigeben der Datei oder des Ordners aufgetreten.</string>
|
||||
<string name="unshare_link_file_no_exist">Das Entfernen der Freigabe für die Datei oder den Ordner ist nicht möglich. Diese existieren nicht.</string>
|
||||
<string name="unshare_link_file_error">Es ist ein Fehler beim Entfernen der Freigabe für diese Datei oder den Ordner aufgetreten.</string>
|
||||
<string name="activity_chooser_send_file_title">Senden</string>
|
||||
<string name="copy_link">Link kopieren</string>
|
||||
<string name="clipboard_text_copied">In die Zwischenablage kopiert</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@
|
|||
<string name="share_link_file_error">Es ist ein Fehler beim Freigeben der Datei oder des Ordners aufgetreten.</string>
|
||||
<string name="unshare_link_file_no_exist">Das Entfernen der Freigabe für die Datei oder den Ordner ist nicht möglich. Diese existieren nicht.</string>
|
||||
<string name="unshare_link_file_error">Es ist ein Fehler beim Entfernen der Freigabe für diese Datei oder den Ordner aufgetreten.</string>
|
||||
<string name="activity_chooser_send_file_title">Senden</string>
|
||||
<string name="copy_link">Link kopieren</string>
|
||||
<string name="clipboard_text_copied">In die Zwischenablage kopiert</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -237,5 +237,6 @@
|
|||
<string name="share_link_file_error">Ένα σφάλμα προέκυψε κατά την προσπάθεια διαμοιρασμού αυτού του αρχείου ή φακέλου</string>
|
||||
<string name="unshare_link_file_no_exist">Ήταν αδύνατη η ακύρωση διαμοιρασμού αυτού του αρχείου ή φακέλου. Δεν υπάρχει.</string>
|
||||
<string name="unshare_link_file_error">Ένα σφάλμα προέκυψε κατά τη διάρκεια ακύρωσης διαμοιρασμού αυτού του αρχείου ή φακέλου</string>
|
||||
<string name="activity_chooser_send_file_title">Αποστολή</string>
|
||||
<string name="clipboard_text_copied">Αντιγραφθηκε στο clipboard</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@
|
|||
<string name="share_link_file_error">An error occurred while trying to share this file or folder</string>
|
||||
<string name="unshare_link_file_no_exist">Unable to unshare this file or folder. It does not exist.</string>
|
||||
<string name="unshare_link_file_error">An error occurred while trying to unshare this file or folder</string>
|
||||
<string name="activity_chooser_send_file_title">Send</string>
|
||||
<string name="copy_link">Copy link</string>
|
||||
<string name="clipboard_text_copied">Copied to clipboard</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -141,5 +141,6 @@
|
|||
<string name="conflict_keep_both">Konservi ambaŭ</string>
|
||||
<string name="conflict_overwrite">Anstataŭigi</string>
|
||||
<string name="conflict_dont_upload">Ne alŝuti</string>
|
||||
<string name="activity_chooser_send_file_title">Sendi</string>
|
||||
<string name="clipboard_text_copied">Kopiita en la tondejon</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -231,5 +231,6 @@
|
|||
<string name="failed_upload_retry_do_nothing_text">No hacer nada, no estás conectado para subida instantánea</string>
|
||||
<string name="failed_upload_failure_text">Mensaje de error:</string>
|
||||
<string name="failed_upload_quota_exceeded_text">Por favor, revisá la configuración de servidor, posiblemente tu cuota se haya excedido.</string>
|
||||
<string name="activity_chooser_send_file_title">Mandar</string>
|
||||
<string name="clipboard_text_copied">Copiado al portapapeles</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -231,5 +231,6 @@
|
|||
<string name="failed_upload_retry_do_nothing_text">No hacer nada no está conectado para subida instantánea</string>
|
||||
<string name="failed_upload_failure_text">Mensaje de error:</string>
|
||||
<string name="failed_upload_quota_exceeded_text">Por favor revise su configuración de servidor, posiblemente su cuota se haya excedido.</string>
|
||||
<string name="activity_chooser_send_file_title">Enviar</string>
|
||||
<string name="clipboard_text_copied">Copiado al portapapeles</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
<string name="change_password">Cambiar contraseña</string>
|
||||
<string name="delete_account">Eliminar cuenta</string>
|
||||
<string name="create_account">Crear cuenta</string>
|
||||
<string name="upload_chooser_title">Subir</string>
|
||||
<string name="upload_chooser_title">Subir desde...</string>
|
||||
<string name="uploader_info_dirname">Nombre de directorio</string>
|
||||
<string name="uploader_upload_in_progress_ticker">Subiendo...</string>
|
||||
<string name="uploader_upload_in_progress_content">%1$d%% Subiendo %2$s</string>
|
||||
|
|
@ -217,7 +217,7 @@
|
|||
<string name="instant_upload_path">/SubidasInstantáneas</string>
|
||||
<string name="conflict_title">Conflicto en la actualización</string>
|
||||
<string name="conflict_message">El archivo remoto %s no está sincronizado con el archivo local. Si continúa, se reemplazará el contenido del archivo en el servidor.</string>
|
||||
<string name="conflict_keep_both">Mantener ambas</string>
|
||||
<string name="conflict_keep_both">Mantener ambos</string>
|
||||
<string name="conflict_overwrite">Sobrescribir</string>
|
||||
<string name="conflict_dont_upload">No subir</string>
|
||||
<string name="preview_image_description">Previsualización de imagen</string>
|
||||
|
|
@ -239,6 +239,7 @@
|
|||
<string name="share_link_file_error">Ocurrió un error al tratar de compartir este archivo o carpeta</string>
|
||||
<string name="unshare_link_file_no_exist">No se puede dejar de compartir este archivo o carpeta. No existe.</string>
|
||||
<string name="unshare_link_file_error">Ocurrió un error al tratar de ya no compartir este archivo o carpeta</string>
|
||||
<string name="activity_chooser_send_file_title">Enviar</string>
|
||||
<string name="copy_link">Copiar enlace</string>
|
||||
<string name="clipboard_text_copied">Copiado al portapapeles</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -237,5 +237,6 @@
|
|||
<string name="share_link_file_error">Faili või kausta jagamisel esines viga</string>
|
||||
<string name="unshare_link_file_no_exist">Antud faili või kausta jagamist pole võimalik tühistada</string>
|
||||
<string name="unshare_link_file_error">Faili või kausta jagamise tühistamisel esines viga</string>
|
||||
<string name="activity_chooser_send_file_title">Saada</string>
|
||||
<string name="clipboard_text_copied">Kopeeritud lõikepuhvrisse</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@
|
|||
<string name="share_link_file_error">Errore bat egon da fitxategaia edo karpeta partekatzerakoan</string>
|
||||
<string name="unshare_link_file_no_exist">Ezin izan da karpeta edo fitxategi honen partekatzeari utzi. Ez da existitzen.</string>
|
||||
<string name="unshare_link_file_error">Errore bat egon da fitxategaia edo karpeta partekatzeari uzterakoan</string>
|
||||
<string name="activity_chooser_send_file_title">Bidali</string>
|
||||
<string name="copy_link">Lotura kopiatu</string>
|
||||
<string name="clipboard_text_copied">Arbelera kopiatua</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -237,5 +237,6 @@
|
|||
<string name="share_link_file_error">در حین اشتراک گذاری این فایل یا پوشه خطایی رخ داده است</string>
|
||||
<string name="unshare_link_file_no_exist">حذف اشتراک گذاری این فایل یا پوشه ممکن نیست. لطفاً از وجود آن اطمینان حاصل نمایید</string>
|
||||
<string name="unshare_link_file_error">در حین حذف اشتراک گذاری این فایل یا پوشه خطایی رخ داده است</string>
|
||||
<string name="activity_chooser_send_file_title">ارسال</string>
|
||||
<string name="clipboard_text_copied">کپی به کلیپ بورد</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -202,6 +202,7 @@
|
|||
<string name="share_link_no_support_share_api">Valitettavasti jakamista ei ole otettu käyttöön palvelinasetuksissa. Ota yhteys ylläpitäjään.</string>
|
||||
<string name="share_link_file_no_exist">Valitettavasti tämän tiedoston tai kansion jakaminen ei onnistu. Varmista että se on olemassa</string>
|
||||
<string name="share_link_file_error">Virhe tiedoston tai kansion jakamista yrittäessä</string>
|
||||
<string name="activity_chooser_send_file_title">Lähetä</string>
|
||||
<string name="copy_link">Kopioi linkki</string>
|
||||
<string name="clipboard_text_copied">Kopioitu leikepöydälle</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@
|
|||
<string name="share_link_file_error">Une erreur est survenue lors de la tentative de partage de ce fichier ou répertoire</string>
|
||||
<string name="unshare_link_file_no_exist">Impossible d’annuler le partage de ce fichier ou répertoire : il n’existe pas.</string>
|
||||
<string name="unshare_link_file_error">Une erreur est survenue lors de la tentative d’annulation du partage de ce fichier ou répertoire</string>
|
||||
<string name="activity_chooser_send_file_title">Envoyer</string>
|
||||
<string name="copy_link">Copier le lien</string>
|
||||
<string name="clipboard_text_copied">Copié dans le presse-papiers</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@
|
|||
<string name="share_link_file_error">Produciuse un erro ao tentar compartir este ficheiro ou cartafol.</string>
|
||||
<string name="unshare_link_file_no_exist">Non foi posíbel compartir este ficheiro ou cartafol xa que non existe.</string>
|
||||
<string name="unshare_link_file_error">Produciuse un erro ao tentar deixar de compartir este ficheiro ou cartafol</string>
|
||||
<string name="activity_chooser_send_file_title">Enviar</string>
|
||||
<string name="copy_link">Copiar a ligazón</string>
|
||||
<string name="clipboard_text_copied">Copiado no portapapeis.</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -171,4 +171,5 @@
|
|||
<string name="failed_upload_load_more_images">טעינת תמונות נוספות</string>
|
||||
<string name="failed_upload_failure_text">הודעת התקלה:</string>
|
||||
<string name="failed_upload_quota_exceeded_text">נא לבדוק את תצורת שרת שלך, יתכן שחרגת מהמיכסה שלך.</string>
|
||||
<string name="activity_chooser_send_file_title">שליחה</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -9,4 +9,5 @@
|
|||
<string name="auth_password">पासवर्ड</string>
|
||||
<string name="uploader_btn_upload_text">अपलोड </string>
|
||||
<string name="common_error">त्रुटि</string>
|
||||
<string name="activity_chooser_send_file_title">भेजें</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -238,5 +238,6 @@
|
|||
<string name="share_link_file_error">Hiba lépett fel a mappa megosztásakor</string>
|
||||
<string name="unshare_link_file_no_exist">Nem lehet a megosztást megszüntetni. A mappa vagy fájl nem létezik.</string>
|
||||
<string name="unshare_link_file_error">Hiba lépett fel a mappa megosztásának visszavonásakor</string>
|
||||
<string name="activity_chooser_send_file_title">Küldjük el</string>
|
||||
<string name="clipboard_text_copied">Bemásolva a vágólapra</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -17,4 +17,5 @@
|
|||
<string name="common_error">Error</string>
|
||||
<string name="common_error_unknown">Error Incognite</string>
|
||||
<string name="change_password">Cambiar contrasigno</string>
|
||||
<string name="activity_chooser_send_file_title">Invia</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -227,4 +227,5 @@
|
|||
<string name="failed_upload_retry_do_nothing_text">Tidak melakukan apapun, Anda tidak sedang online</string>
|
||||
<string name="failed_upload_failure_text">Pesan Kegagalan:</string>
|
||||
<string name="failed_upload_quota_exceeded_text">Silakan periksa konfigurasi server Anda, kemungkinan kuota terlampaui.</string>
|
||||
<string name="activity_chooser_send_file_title">Kirim</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -19,4 +19,5 @@
|
|||
<string name="change_password">Breyta lykilorði</string>
|
||||
<string name="common_rename">Endurskýra</string>
|
||||
<string name="common_remove">Fjarlægja</string>
|
||||
<string name="activity_chooser_send_file_title">Senda</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@
|
|||
<string name="share_link_file_error">Si è verificato un errore durante il tentativo di condivisione del file o della cartella</string>
|
||||
<string name="unshare_link_file_no_exist">Impossibile rimuovere dalla condivisione il file o la cartella. Non esiste.</string>
|
||||
<string name="unshare_link_file_error">Si è verificato un errore durante il tentativo di rimuovere la condivisione del file o della cartella</string>
|
||||
<string name="activity_chooser_send_file_title">Invia</string>
|
||||
<string name="copy_link">Copia collegamento</string>
|
||||
<string name="clipboard_text_copied">Copiato negli appunti</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -238,6 +238,7 @@
|
|||
<string name="share_link_file_error">このファイルまたはフォルダーを共有する際にエラーが発生しました</string>
|
||||
<string name="unshare_link_file_no_exist">このファイルもしくはフォルダは存在しないため、共有を解除できません。</string>
|
||||
<string name="unshare_link_file_error">このファイルまたはフォルダーの共有を解除する際にエラーが発生しました</string>
|
||||
<string name="activity_chooser_send_file_title">送信</string>
|
||||
<string name="copy_link">リンクをコピー</string>
|
||||
<string name="clipboard_text_copied">クリップボードにコピー</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -152,5 +152,6 @@
|
|||
<string name="conflict_overwrite">გადააწერე</string>
|
||||
<string name="conflict_dont_upload">არ ატვირთო</string>
|
||||
<string name="error__upload__local_file_not_copied">%1$s–ის კოპირება ვერ მოხერხდა %2$s ლოკალურ დირექტორიაში</string>
|
||||
<string name="activity_chooser_send_file_title">გაგზავნა</string>
|
||||
<string name="clipboard_text_copied">კოპირებულია კლიპბორდში</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -45,4 +45,5 @@
|
|||
<string name="pincode_stored">App PIN បានយកមកវិញ</string>
|
||||
<string name="auth_no_net_conn_title">គ្មានបណ្តាញតភ្ជាប់ទេ</string>
|
||||
<string name="common_remove">ដកចេញ</string>
|
||||
<string name="activity_chooser_send_file_title">ផ្ញើ</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -231,5 +231,7 @@
|
|||
<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="activity_chooser_send_file_title">보내기</string>
|
||||
<string name="copy_link">링크 복사</string>
|
||||
<string name="clipboard_text_copied">클립보드로 복사됨</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -83,4 +83,5 @@
|
|||
<string name="conflict_dont_upload">Net eroplueden</string>
|
||||
<string name="failed_upload_all_cb">all auswielen</string>
|
||||
<string name="failed_upload_failure_text">Fehler Message:</string>
|
||||
<string name="activity_chooser_send_file_title">Schécken</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -217,6 +217,7 @@
|
|||
<string name="failed_upload_failure_text">Klaidos pranešimas:</string>
|
||||
<string name="failed_upload_quota_exceeded_text">Patikrinkite savo serverio nustatymus, tikėtina jog viršijote savo limitą.</string>
|
||||
<string name="share_link_no_support_share_api">Deja, bendrinimas neįjungtas Jūsų serveryje. Prašome susisiekti su administratoriumi.</string>
|
||||
<string name="activity_chooser_send_file_title">Siųsti</string>
|
||||
<string name="copy_link">Kopijuoti nuorodą</string>
|
||||
<string name="clipboard_text_copied">Nukopijuota į talpyklę</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -140,4 +140,5 @@
|
|||
<string name="conflict_keep_both">Paturēt abas</string>
|
||||
<string name="conflict_overwrite">Pārrakstīt</string>
|
||||
<string name="conflict_dont_upload">Neaugšupielādēt</string>
|
||||
<string name="activity_chooser_send_file_title">Sūtīt</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -102,4 +102,5 @@
|
|||
<string name="conflict_keep_both">Задржи ги и двете</string>
|
||||
<string name="conflict_overwrite">Препиши</string>
|
||||
<string name="failed_upload_all_cb">избери се</string>
|
||||
<string name="activity_chooser_send_file_title">Прати</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@
|
|||
<string name="share_link_file_error">Det skjedde en feil under deling av denne filen eller mappen</string>
|
||||
<string name="unshare_link_file_no_exist">Klarte ikke å avslutte delingen av denne filen eller mappen. Den eksisterer ikke.</string>
|
||||
<string name="unshare_link_file_error">En feil oppstod ved avslutting av delingen av denne filen eller mappen</string>
|
||||
<string name="activity_chooser_send_file_title">Send</string>
|
||||
<string name="copy_link">Kopier lenke</string>
|
||||
<string name="clipboard_text_copied">Kopiert til utklippstavlen</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@
|
|||
<string name="share_link_file_error">Er trad een fout op bij uw poging dit bestand of deze map te delen</string>
|
||||
<string name="unshare_link_file_no_exist">Kan delen van dit bestand of deze map niet beëindigen. Het object bestaat niet.</string>
|
||||
<string name="unshare_link_file_error">Er trad een fout op bij uw poging het delen van dit bestand of deze map te beëindigen</string>
|
||||
<string name="activity_chooser_send_file_title">Versturen</string>
|
||||
<string name="copy_link">Link kopiëren</string>
|
||||
<string name="clipboard_text_copied">Gekopieerd naar het klembord</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -83,4 +83,5 @@
|
|||
<string name="ssl_validator_question">Vil du stola på dette sertifikatet uansett?</string>
|
||||
<string name="ssl_validator_not_saved">Klarte ikkje å lagra sertifikatet</string>
|
||||
<string name="instant_upload_on_wifi">Berre last opp bilete over WiFi</string>
|
||||
<string name="activity_chooser_send_file_title">Send</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -122,4 +122,5 @@
|
|||
<string name="conflict_dont_upload">ਅੱਪਲੋਡ ਨਾ ਕਰੋ</string>
|
||||
<string name="preview_image_description">ਚਿੱਤਰ ਝਲਕ</string>
|
||||
<string name="failed_upload_all_cb">ਸਭ ਚੁਣੋ</string>
|
||||
<string name="activity_chooser_send_file_title">ਭੇਜੋ</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@
|
|||
<string name="share_link_file_error">Wystąpił błąd podczas udostępniania tego pliku lub folderu.</string>
|
||||
<string name="unshare_link_file_no_exist">Nie można anulować udostępniania tego pliku lub folderu. Jeśli nie istnieje.</string>
|
||||
<string name="unshare_link_file_error">Wystąpił błąd podczas anulowania udostępniania tego pliku lub folderu.</string>
|
||||
<string name="activity_chooser_send_file_title">Wyślij</string>
|
||||
<string name="copy_link">Skopiuj link</string>
|
||||
<string name="clipboard_text_copied">Skopiuj do schowka</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@
|
|||
<string name="share_link_file_error">Ocorreu um erro durante a tentativa de compartilhar esse arquivo ou pasta</string>
|
||||
<string name="unshare_link_file_no_exist">Incapaz de descompartilhar este arquivo ou pasta. Ela não existe.</string>
|
||||
<string name="unshare_link_file_error">Ocorreu um erro ao tentar descompartilhar este arquivo ou pasta</string>
|
||||
<string name="activity_chooser_send_file_title">Enviar</string>
|
||||
<string name="copy_link">Copiar o link</string>
|
||||
<string name="clipboard_text_copied">Copiado para área de transferência</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -238,5 +238,6 @@
|
|||
<string name="share_link_file_error">Ocorreu um erro enquanto tentava partilhar este ficheiro ou pasta</string>
|
||||
<string name="unshare_link_file_no_exist">Não é possível retirar a partilha deste ficheiro ou pasta. Não existe.</string>
|
||||
<string name="unshare_link_file_error">Ocorreu um erro enquanto retirava a partilha deste ficheiro ou pasta</string>
|
||||
<string name="activity_chooser_send_file_title">Enviar</string>
|
||||
<string name="clipboard_text_copied">Copiado para a área de transferência</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -80,4 +80,5 @@
|
|||
<string name="create_dir_fail_msg">Directorul nu a putut fi creat</string>
|
||||
<string name="wait_a_moment">Așteaptă un moment</string>
|
||||
<string name="filedisplay_no_file_selected">Nu a fost selectat nici un fișier</string>
|
||||
<string name="activity_chooser_send_file_title">Expediază</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -237,5 +237,6 @@
|
|||
<string name="share_link_file_no_exist">Невозможно предоставить доступ к этому файлу или каталогу. Убедитесь, что он существует</string>
|
||||
<string name="share_link_file_error">Ошибка предоставления общего доступа к этому файлу или каталогу</string>
|
||||
<string name="unshare_link_file_error">Ошибка удаления общего доступа к этому файлу или каталогу</string>
|
||||
<string name="activity_chooser_send_file_title">Отправить</string>
|
||||
<string name="clipboard_text_copied">Скопировано в буфер обмена</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@
|
|||
<string name="share_link_file_error">Pri pokuse o zdieľanie tohto súboru alebo priečinka došlo k chybe</string>
|
||||
<string name="unshare_link_file_no_exist">Nie je možné zrušiť zdieľanie tohoto súboru alebo priečinka. Súbor alebo priečinok neexistuje.</string>
|
||||
<string name="unshare_link_file_error">Pri pokuse zrušiť zdieľanie tohto súboru alebo priečinka došlo k chybe</string>
|
||||
<string name="activity_chooser_send_file_title">Odoslať</string>
|
||||
<string name="copy_link">Kopíruj odkaz</string>
|
||||
<string name="clipboard_text_copied">Skopírované do \"clipboard\"</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -238,6 +238,7 @@
|
|||
<string name="share_link_file_error">Prišlo je do napake med poskusom omogočanja souporabe te datoteke ali mape</string>
|
||||
<string name="unshare_link_file_no_exist">Ni mogoče prekiniti souporabe te datoteke ali mape, ker ne obstaja.</string>
|
||||
<string name="unshare_link_file_error">Prišlo je do napake med poskusom odstranjevanja souporabe te datoteke ali mape</string>
|
||||
<string name="activity_chooser_send_file_title">Pošlji</string>
|
||||
<string name="copy_link">Kopiraj povezavo</string>
|
||||
<string name="clipboard_text_copied">Kopirano v odložišče</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -52,4 +52,5 @@
|
|||
<string name="auth_secure_connection">Lidhja e Sigurt vendos</string>
|
||||
<string name="common_rename">Riemërto</string>
|
||||
<string name="common_remove">Hiq</string>
|
||||
<string name="activity_chooser_send_file_title">Dërgo</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -51,4 +51,5 @@
|
|||
<string name="ssl_validator_label_validity_to">Za:</string>
|
||||
<string name="ssl_validator_label_signature">Potpis:</string>
|
||||
<string name="conflict_keep_both">Zadrži oboje</string>
|
||||
<string name="activity_chooser_send_file_title">Pošalji</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -110,4 +110,5 @@
|
|||
<string name="ssl_validator_label_signature_algorithm">Алгоритам:</string>
|
||||
<string name="instant_upload_on_wifi">Отпремај слике само путем бежичне мреже</string>
|
||||
<string name="conflict_title">Ажурирај сукоб</string>
|
||||
<string name="activity_chooser_send_file_title">Пошаљи</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -230,5 +230,6 @@
|
|||
<string name="failed_upload_retry_do_nothing_text">Du är inte ansluten, direktuppladdning ej möjligt</string>
|
||||
<string name="failed_upload_failure_text">Felmeddelande:</string>
|
||||
<string name="failed_upload_quota_exceeded_text">Vänligen kontrollera dina serverkonfiguration. Din kvot kan ha överskridits.</string>
|
||||
<string name="activity_chooser_send_file_title">Skicka</string>
|
||||
<string name="clipboard_text_copied">Kopierat till urklipp</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -10,4 +10,5 @@
|
|||
<string name="common_no">కాదు</string>
|
||||
<string name="common_cancel">రద్దుచేయి</string>
|
||||
<string name="common_error">పొరపాటు</string>
|
||||
<string name="activity_chooser_send_file_title">పంపించు</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -153,4 +153,5 @@
|
|||
<string name="conflict_overwrite">เขียนทับ</string>
|
||||
<string name="conflict_dont_upload">ไม่ต้องอัพโหลด</string>
|
||||
<string name="error__upload__local_file_not_copied">%1$s ไม่สามารถถูกคัดลอกไปที่ %2$s ไดเรกทอรีท้องถิ่น</string>
|
||||
<string name="activity_chooser_send_file_title">ส่ง</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@
|
|||
<string name="share_link_file_error">Bu dosya veya klasörü paylaşmaya çalışılırken bir hata oluştu</string>
|
||||
<string name="unshare_link_file_no_exist">Bu dosya veya klasörün paylaşımı kaldırılamadı. Mevcut değil.</string>
|
||||
<string name="unshare_link_file_error">Bu dosya veya klasör paylaşımı kaldırılmaya çalışılırken bir hata oluştu</string>
|
||||
<string name="activity_chooser_send_file_title">Gönder</string>
|
||||
<string name="copy_link">Bağlantıyı kopyala</string>
|
||||
<string name="clipboard_text_copied">Panoya kopyalandı</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -37,4 +37,5 @@
|
|||
<string name="common_choose_account">ھېسابات تاللاڭ</string>
|
||||
<string name="common_rename">ئات ئۆزگەرت</string>
|
||||
<string name="common_remove">چىقىرىۋەت</string>
|
||||
<string name="activity_chooser_send_file_title">يوللا</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -157,5 +157,6 @@
|
|||
<string name="conflict_overwrite">Замінити</string>
|
||||
<string name="conflict_dont_upload">Не завантажувати</string>
|
||||
<string name="error__upload__local_file_not_copied">%1$s неможливо скопіювати в локальний каталог %2$s</string>
|
||||
<string name="activity_chooser_send_file_title">Надіслати</string>
|
||||
<string name="clipboard_text_copied">Скопійовано в буфер обміну</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -238,4 +238,5 @@
|
|||
<string name="share_link_file_error">Một lỗi đã xảy ra khi thử chia sẻ file hoặc thư mục này</string>
|
||||
<string name="unshare_link_file_no_exist">Không thể gỡ chia sẻ file hoặc thư mục. Nó không tồn tại.</string>
|
||||
<string name="unshare_link_file_error">Một lỗi đã xảy ra khi thử gỡ chia sẻ file hoặc thư mục này</string>
|
||||
<string name="activity_chooser_send_file_title">Gởi</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -220,5 +220,6 @@
|
|||
<string name="share_link_file_no_exist">无法共享该文件或目录，请确定该文件或目录存在</string>
|
||||
<string name="share_link_file_error">共享文件或目录出错</string>
|
||||
<string name="unshare_link_file_error">解除文件或目录共享时出错</string>
|
||||
<string name="activity_chooser_send_file_title">发送</string>
|
||||
<string name="clipboard_text_copied">复制到剪贴板</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -29,4 +29,5 @@
|
|||
<string name="common_error">錯誤</string>
|
||||
<string name="uploader_info_dirname">目錄名稱</string>
|
||||
<string name="common_choose_account">選擇帳戶</string>
|
||||
<string name="activity_chooser_send_file_title">傳送</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<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="activity_chooser_send_file_title">寄出</string>
|
||||
<string name="copy_link">複製連結</string>
|
||||
<string name="clipboard_text_copied">複製至剪貼簿中</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -21,6 +21,10 @@
|
|||
<string name="auth_method_oauth2">off</string>
|
||||
<string name="auth_method_saml_web_sso">on</string>
|
||||
|
||||
<!-- Flags to enable/disable some features -->
|
||||
<string name = "send_files_to_other_apps">on</string>
|
||||
|
||||
|
||||
<!-- Colors -->
|
||||
<color name="login_background_color">#FFFFFF</color>
|
||||
<color name="login_logo_background_color">#FFFFFF</color>
|
||||
|
|
|
|||
|
|
@ -255,6 +255,8 @@
|
|||
<string name="unshare_link_file_no_exist">Unable to unshare this file or folder. It does not exist.</string>
|
||||
<string name="unshare_link_file_error">An error occurred while trying to unshare this file or folder</string>
|
||||
|
||||
<string name="activity_chooser_send_file_title">Send</string>
|
||||
|
||||
<string name="copy_link">Copy link</string>
|
||||
<string name="clipboard_text_copied">Copied to clipboard</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -26,10 +26,7 @@ import java.security.cert.X509Certificate;
|
|||
|
||||
import com.owncloud.android.lib.common.network.NetworkUtils;
|
||||
import com.actionbarsherlock.app.SherlockFragmentActivity;
|
||||
import com.owncloud.android.R;
|
||||
import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
|
||||
import com.owncloud.android.ui.dialog.SslUntrustedCertDialogABSTRACT;
|
||||
import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;
|
||||
import com.owncloud.android.utils.Log_OC;
|
||||
|
||||
import android.content.Context;
|
||||
|
|
|
|||
|
|
@ -166,4 +166,23 @@ public class FileOperationsHelper {
|
|||
|
||||
}
|
||||
}
|
||||
|
||||
public void sendDownloadedFile(OCFile file, FileActivity callerActivity) {
|
||||
if (file != null) {
|
||||
Intent sendIntent = new Intent(android.content.Intent.ACTION_SEND);
|
||||
// set MimeType
|
||||
sendIntent.setType(file.getMimetype());
|
||||
sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + file.getStoragePath()));
|
||||
sendIntent.putExtra(Intent.ACTION_SEND, true); // Send Action
|
||||
|
||||
// Show dialog, without the own app
|
||||
String[] packagesToExclude = new String[] { callerActivity.getPackageName() };
|
||||
DialogFragment chooserDialog = ShareLinkToDialog.newInstance(sendIntent, packagesToExclude, file);
|
||||
chooserDialog.show(callerActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);
|
||||
|
||||
} else {
|
||||
Log_OC.wtf(TAG, "Trying to send a NULL OCFile");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ import com.owncloud.android.R;
|
|||
import com.owncloud.android.authentication.AuthenticatorActivity;
|
||||
import com.owncloud.android.datamodel.FileDataStorageManager;
|
||||
import com.owncloud.android.datamodel.OCFile;
|
||||
import com.owncloud.android.lib.common.accounts.AccountUtils.Constants;
|
||||
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
|
||||
import com.owncloud.android.operations.SynchronizeFolderOperation;
|
||||
import com.owncloud.android.operations.UpdateOCVersionOperation;
|
||||
|
|
@ -41,7 +40,6 @@ import com.owncloud.android.utils.Log_OC;
|
|||
|
||||
|
||||
import android.accounts.Account;
|
||||
import android.accounts.AccountManager;
|
||||
import android.accounts.AccountsException;
|
||||
import android.app.Notification;
|
||||
import android.app.NotificationManager;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ import com.owncloud.android.R;
|
|||
import android.app.Activity;
|
||||
import android.content.ClipData;
|
||||
import android.content.Intent;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.text.ClipboardManager;
|
||||
import android.widget.Toast;
|
||||
|
|
|
|||
|
|
@ -120,6 +120,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
private static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW";
|
||||
private static final String KEY_SYNC_IN_PROGRESS = "SYNC_IN_PROGRESS";
|
||||
//private static final String KEY_REFRESH_SHARES_IN_PROGRESS = "SHARES_IN_PROGRESS";
|
||||
private static final String KEY_WAITING_TO_SEND = "WAITING_TO_SEND";
|
||||
|
||||
public static final int DIALOG_SHORT_WAIT = 0;
|
||||
private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 1;
|
||||
|
|
@ -143,6 +144,8 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
|
||||
private String DIALOG_UNTRUSTED_CERT;
|
||||
|
||||
private OCFile mWaitingToSend;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
Log_OC.d(TAG, "onCreate() start");
|
||||
|
|
@ -173,11 +176,13 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW);
|
||||
mSyncInProgress = savedInstanceState.getBoolean(KEY_SYNC_IN_PROGRESS);
|
||||
//mRefreshSharesInProgress = savedInstanceState.getBoolean(KEY_REFRESH_SHARES_IN_PROGRESS);
|
||||
mWaitingToSend = (OCFile) savedInstanceState.getParcelable(FileDisplayActivity.KEY_WAITING_TO_SEND);
|
||||
|
||||
} else {
|
||||
mWaitingToPreview = null;
|
||||
mSyncInProgress = false;
|
||||
//mRefreshSharesInProgress = false;
|
||||
mWaitingToSend = null;
|
||||
}
|
||||
|
||||
/// USER INTERFACE
|
||||
|
|
@ -220,7 +225,6 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
unbindService(mUploadConnection);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Called when the ownCloud {@link Account} associated to the Activity was just updated.
|
||||
*/
|
||||
|
|
@ -668,6 +672,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
outState.putParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview);
|
||||
outState.putBoolean(FileDisplayActivity.KEY_SYNC_IN_PROGRESS, mSyncInProgress);
|
||||
//outState.putBoolean(FileDisplayActivity.KEY_REFRESH_SHARES_IN_PROGRESS, mRefreshSharesInProgress);
|
||||
outState.putParcelable(FileDisplayActivity.KEY_WAITING_TO_SEND, mWaitingToSend);
|
||||
|
||||
Log_OC.d(TAG, "onSaveInstanceState() end");
|
||||
}
|
||||
|
|
@ -1011,6 +1016,13 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
refreshSecondFragment(intent.getAction(), downloadedRemotePath, intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false));
|
||||
}
|
||||
|
||||
if (mWaitingToSend != null) {
|
||||
mWaitingToSend = getStorageManager().getFileByPath(mWaitingToSend.getRemotePath()); // Update the file to send
|
||||
if (mWaitingToSend.isDown()) {
|
||||
sendDownloadedFile();
|
||||
}
|
||||
}
|
||||
|
||||
removeStickyBroadcast(intent);
|
||||
}
|
||||
|
||||
|
|
@ -1619,4 +1631,34 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
|
||||
}
|
||||
|
||||
/**
|
||||
* Requests the download of the received {@link OCFile} , updates the UI
|
||||
* to monitor the download progress and prepares the activity to send the file
|
||||
* when the download finishes.
|
||||
*
|
||||
* @param file {@link OCFile} to download and preview.
|
||||
*/
|
||||
@Override
|
||||
public void startDownloadForSending(OCFile file) {
|
||||
mWaitingToSend = file;
|
||||
requestForDownload(mWaitingToSend);
|
||||
boolean hasSecondFragment = (getSecondFragment()!= null);
|
||||
updateFragmentsVisibility(hasSecondFragment);
|
||||
}
|
||||
|
||||
private void requestForDownload(OCFile file) {
|
||||
Account account = getAccount();
|
||||
if (!mDownloaderBinder.isDownloading(account, file)) {
|
||||
Intent i = new Intent(this, FileDownloader.class);
|
||||
i.putExtra(FileDownloader.EXTRA_ACCOUNT, account);
|
||||
i.putExtra(FileDownloader.EXTRA_FILE, file);
|
||||
startService(i);
|
||||
}
|
||||
}
|
||||
|
||||
private void sendDownloadedFile(){
|
||||
getFileOperationsHelper().sendDownloadedFile(mWaitingToSend, this);
|
||||
mWaitingToSend = null;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -97,35 +97,59 @@ public class ShareLinkToDialog extends SherlockDialogFragment {
|
|||
}
|
||||
}
|
||||
|
||||
// add activity for copy to clipboard
|
||||
Intent copyToClipboardIntent = new Intent(getSherlockActivity(), CopyToClipboardActivity.class);
|
||||
List<ResolveInfo> copyToClipboard = pm.queryIntentActivities(copyToClipboardIntent, 0);
|
||||
if (!copyToClipboard.isEmpty()) {
|
||||
activities.add(copyToClipboard.get(0));
|
||||
boolean sendAction = mIntent.getBooleanExtra(Intent.ACTION_SEND, false);
|
||||
|
||||
if (!sendAction) {
|
||||
// add activity for copy to clipboard
|
||||
Intent copyToClipboardIntent = new Intent(getSherlockActivity(), CopyToClipboardActivity.class);
|
||||
List<ResolveInfo> copyToClipboard = pm.queryIntentActivities(copyToClipboardIntent, 0);
|
||||
if (!copyToClipboard.isEmpty()) {
|
||||
activities.add(copyToClipboard.get(0));
|
||||
}
|
||||
}
|
||||
|
||||
Collections.sort(activities, new ResolveInfo.DisplayNameComparator(pm));
|
||||
mAdapter = new ActivityAdapter(getSherlockActivity(), pm, activities);
|
||||
|
||||
return new AlertDialog.Builder(getSherlockActivity())
|
||||
.setTitle(R.string.activity_chooser_title)
|
||||
.setAdapter(mAdapter, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
// Add the information of the chosen activity to the intent to send
|
||||
ResolveInfo chosen = mAdapter.getItem(which);
|
||||
ActivityInfo actInfo = chosen.activityInfo;
|
||||
ComponentName name=new ComponentName(actInfo.applicationInfo.packageName, actInfo.name);
|
||||
mIntent.setComponent(name);
|
||||
return createSelector(sendAction);
|
||||
|
||||
// Create a new share resource
|
||||
FileOperationsHelper foh = new FileOperationsHelper();
|
||||
foh.shareFileWithLinkToApp(mFile, mIntent, (FileActivity)getSherlockActivity());
|
||||
}
|
||||
})
|
||||
.create();
|
||||
}
|
||||
|
||||
private AlertDialog createSelector(final boolean sendAction) {
|
||||
|
||||
int titleId;
|
||||
if (sendAction) {
|
||||
titleId = R.string.activity_chooser_send_file_title;
|
||||
} else {
|
||||
titleId = R.string.activity_chooser_title;
|
||||
}
|
||||
|
||||
return new AlertDialog.Builder(getSherlockActivity())
|
||||
.setTitle(titleId)
|
||||
.setAdapter(mAdapter, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
// Add the information of the chosen activity to the intent to send
|
||||
ResolveInfo chosen = mAdapter.getItem(which);
|
||||
ActivityInfo actInfo = chosen.activityInfo;
|
||||
ComponentName name=new ComponentName(actInfo.applicationInfo.packageName, actInfo.name);
|
||||
mIntent.setComponent(name);
|
||||
|
||||
if (sendAction) {
|
||||
dialog.dismiss(); // explicitly added for Android 2.x devices
|
||||
|
||||
// Send the file
|
||||
((FileActivity)getSherlockActivity()).startActivity(mIntent);
|
||||
|
||||
} else {
|
||||
// Create a new share resource
|
||||
FileOperationsHelper foh = new FileOperationsHelper();
|
||||
foh.shareFileWithLinkToApp(mFile, mIntent, (FileActivity)getSherlockActivity());
|
||||
}
|
||||
}
|
||||
})
|
||||
.create();
|
||||
}
|
||||
|
||||
class ActivityAdapter extends ArrayAdapter<ResolveInfo> {
|
||||
|
||||
|
|
|
|||
|
|
@ -252,6 +252,20 @@ public class FileDetailFragment extends FileFragment implements
|
|||
item.setVisible(false);
|
||||
item.setEnabled(false);
|
||||
}
|
||||
|
||||
// Send file
|
||||
item = menu.findItem(R.id.action_send_file);
|
||||
boolean sendEnabled = getString(R.string.send_files_to_other_apps).equalsIgnoreCase("on");
|
||||
if (item != null) {
|
||||
if (sendEnabled) {
|
||||
item.setVisible(true);
|
||||
item.setEnabled(true);
|
||||
} else {
|
||||
item.setVisible(false);
|
||||
item.setEnabled(false);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -376,6 +390,18 @@ public class FileDetailFragment extends FileFragment implements
|
|||
synchronizeFile();
|
||||
return true;
|
||||
}
|
||||
case R.id.action_send_file: {
|
||||
FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity();
|
||||
// Obtain the file
|
||||
if (!getFile().isDown()) { // Download the file
|
||||
Log_OC.d(TAG, getFile().getRemotePath() + " : File must be downloaded");
|
||||
activity.startDownloadForSending(getFile());
|
||||
|
||||
} else {
|
||||
activity.getFileOperationsHelper().sendDownloadedFile(getFile(), activity);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,8 +44,6 @@ import com.owncloud.android.utils.Log_OC;
|
|||
|
||||
import android.accounts.Account;
|
||||
import android.app.Activity;
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.view.ContextMenu;
|
||||
|
|
@ -265,6 +263,12 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
|
|||
toHide.add(R.id.action_unshare_file);
|
||||
}
|
||||
|
||||
// Send file
|
||||
boolean sendEnabled = getString(R.string.send_files_to_other_apps).equalsIgnoreCase("on");
|
||||
if (!sendEnabled) {
|
||||
toHide.add(R.id.action_send_file);
|
||||
}
|
||||
|
||||
for (int i : toHide) {
|
||||
item = menu.findItem(i);
|
||||
if (item != null) {
|
||||
|
|
@ -362,11 +366,16 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
|
|||
return true;
|
||||
}
|
||||
case R.id.action_send_file: {
|
||||
Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
|
||||
// set MimeType
|
||||
sharingIntent.setType(mTargetFile.getMimetype());
|
||||
sharingIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://"+mTargetFile.getStoragePath()));
|
||||
startActivity(Intent.createChooser(sharingIntent, "Share via"));
|
||||
// Obtain the file
|
||||
if (!mTargetFile.isDown()) { // Download the file
|
||||
Log_OC.d(TAG, mTargetFile.getRemotePath() + " : File must be downloaded");
|
||||
mContainerActivity.startDownloadForSending(mTargetFile);
|
||||
|
||||
} else {
|
||||
|
||||
FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity();
|
||||
activity.getFileOperationsHelper().sendDownloadedFile(mTargetFile, activity);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
default:
|
||||
|
|
@ -474,6 +483,8 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
|
|||
*/
|
||||
public void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading);
|
||||
|
||||
void startDownloadForSending(OCFile file);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -245,7 +245,6 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
|
|||
super.onDestroy();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
boolean returnValue = false;
|
||||
|
|
|
|||
|
|
@ -250,6 +250,12 @@ public class PreviewImageFragment extends FileFragment implements OnRemoteOper
|
|||
toHide.add(R.id.action_unshare_file);
|
||||
}
|
||||
|
||||
// Send file
|
||||
boolean sendEnabled = getString(R.string.send_files_to_other_apps).equalsIgnoreCase("on");
|
||||
if (!sendEnabled) {
|
||||
toHide.add(R.id.action_send_file);
|
||||
}
|
||||
|
||||
for (int i : toHide) {
|
||||
item = menu.findItem(i);
|
||||
if (item != null) {
|
||||
|
|
@ -311,7 +317,8 @@ public class PreviewImageFragment extends FileFragment implements OnRemoteOper
|
|||
return true;
|
||||
}
|
||||
case R.id.action_send_file: {
|
||||
shareFile();
|
||||
FileActivity act = (FileActivity)getSherlockActivity();
|
||||
act.getFileOperationsHelper().sendDownloadedFile(getFile(), act);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -320,15 +327,6 @@ public class PreviewImageFragment extends FileFragment implements OnRemoteOper
|
|||
}
|
||||
}
|
||||
|
||||
private void shareFile(){
|
||||
Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
|
||||
// set MimeType
|
||||
sharingIntent.setType(getFile().getMimetype());
|
||||
sharingIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://"+getFile().getStoragePath()));
|
||||
startActivity(Intent.createChooser(sharingIntent, "Share via"));
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void seeDetails() {
|
||||
((FileFragment.ContainerActivity)getActivity()).showDetails(getFile());
|
||||
|
|
|
|||
|
|
@ -295,6 +295,12 @@ public class PreviewMediaFragment extends FileFragment implements
|
|||
toHide.add(R.id.action_unshare_file);
|
||||
}
|
||||
|
||||
// Send file
|
||||
boolean sendEnabled = getString(R.string.send_files_to_other_apps).equalsIgnoreCase("on");
|
||||
if (!sendEnabled) {
|
||||
toHide.add(R.id.action_send_file);
|
||||
}
|
||||
|
||||
for (int i : toHide) {
|
||||
item = menu.findItem(i);
|
||||
if (item != null) {
|
||||
|
|
@ -351,6 +357,9 @@ public class PreviewMediaFragment extends FileFragment implements
|
|||
seeDetails();
|
||||
return true;
|
||||
}
|
||||
case R.id.action_send_file: {
|
||||
sendFile();
|
||||
}
|
||||
|
||||
default:
|
||||
return false;
|
||||
|
|
@ -380,6 +389,12 @@ public class PreviewMediaFragment extends FileFragment implements
|
|||
|
||||
}
|
||||
|
||||
private void sendFile() {
|
||||
stopPreview(false);
|
||||
FileActivity activity = (FileActivity)((FileFragment.ContainerActivity)getActivity());
|
||||
activity.getFileOperationsHelper().sendDownloadedFile(getFile(), activity);
|
||||
|
||||
}
|
||||
|
||||
private void seeDetails() {
|
||||
stopPreview(false);
|
||||
|
|
|
|||
|
|
@ -188,7 +188,6 @@ public class PreviewVideoActivity extends FileActivity implements OnCompletionLi
|
|||
return true;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void onAccountSet(boolean stateWasRecovered) {
|
||||
super.onAccountSet(stateWasRecovered);
|
||||
|
|
|
|||
Loading…
Reference in a new issue