From: masensio Date: Mon, 24 Feb 2014 12:16:57 +0000 (+0100) Subject: Merge branch 'master' into develop X-Git-Tag: oc-android-1.5.5~35 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/271078a4039f3c674462f929bc97528901e41e64?hp=10e856c2e8e56e43647153faaee6e9e7ab4a3bcd Merge branch 'master' into develop --- diff --git a/owncloud-android-library b/owncloud-android-library index b3ac14f5..cd4414a7 160000 --- a/owncloud-android-library +++ b/owncloud-android-library @@ -1 +1 @@ -Subproject commit b3ac14f575da5100eecff00de744d9330b668f66 +Subproject commit cd4414a7bda686c84e1ca75dd10bcbf9b3f57f83 diff --git a/res/menu/file_actions_menu.xml b/res/menu/file_actions_menu.xml index 1e78a367..986ce3ed 100644 --- a/res/menu/file_actions_menu.xml +++ b/res/menu/file_actions_menu.xml @@ -29,5 +29,6 @@ + diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 499d68a1..81dcaa2d 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -2,24 +2,42 @@ %1$s تطبيق أندرويد الإصدار %1$s + تحديث الحساب رفع محتويات من تطبيقات أخرى الملفات + فتح باستخدام إنشاء دليل - تعديلات + إعدادات تفاصيل + أرسل عام المزيد حسابات + ادارة الحسابات + تفعيل الرفع الفوري + رفع الصور الماخوذة عن طريق الكاميرا تلقائياً + تفعيل الدخول + يستخدم هذا لتسجيل المشاكل + تاريخ الدخول + هذا يعرض السجلات المسجلة + حذف التاريخ المساعدة + توصية الى صديق + ملاحظات الدمغة. + جرب %1$s على جهازك الذكي + انا احب ان ادعوك ان تستخدم %1$s على جهازك الذكي\nيمكنك التحميل من هنا : %2$s + تحقق من الخادم + عنوان الخادم https://… إسم المستخدم - كلمات السر + كلمة السر جديد لـ %1$s ؟ الملفات اتصال إرفع - لم يتم العثور أي حساب + اختر مجلد الرفع: + لم يتم العثور على أي حساب لا يوجد جسابات للـ %1$s في جهازك. يرجى إعداد حساب أولاَ. إعداد خروج @@ -27,19 +45,24 @@ لم يتم استلام أي محتويات. %1$s غير مسموح له بالوصول للمحتوى المشترك يتم الرفع + لا يوجد ملفات في هذا المجلد.\nيمكن انشاء ملف جديد عن طريق خيارات قائمة \"رفع\". اضغظ على الملف ليتم عرض خيارات أكثر - الحجم - النوع - عُدل + الحجم: + النوع: + انشئ: + عُدل: انزال تحديث ملف تم تغيير اسم الملف إلى %1$s أثناء الرفع + شارك الرابط + الغاء مشاركة الرابط نعم لا تم إلغاء تحميل إلغاء رفع الملفات الغاء + احفظ & خروج خطأ تحميل ... حدث خطأ غير معروف. @@ -48,8 +71,8 @@ حذف الحساب حساب جديد رفع من - اسم المسار - يتم الرفع + اسم المجلد + يتم الرفع ... %1$d%% رفع %2$s تم الرفع بنجاح تم رفع %1$s بنجاح @@ -57,54 +80,127 @@ رفع %1$s قد لا يكون كاملاً يتم التحميل %1$d%% تنزيل %2$s + تم التحميل بنجاح تم تحميل %1$s بنجاح فشل التحميل تحميل %1$s قد لا يكون كاملاَ لم يتم تحميلها بعد اختر حساب + فشل في المزامنة تعذر إكمال التزامن لـ %1$s كلمة السر غير صالحة لـ %1$s + يوجد تعارض جهات الاتصال لـ %1$d لا يمكن مزامنتها ( %2$d تعارض) + اعتبارا من الاصدار 1.3.16, الملفات المرفعة من هذا الجهاز سوف تنسخ الى مجلد محلي %1$s للوقاية من فقد البيانات عند مزامنة ملف واحد مع عدة حسابات.\n\nبسبب هذا التغيير, جميع الملف(ـات) في الاصدار السابق من هذا البرنامج تم نسخها الى هذا المجلد %2$s. مع ذلك , هناك خطا يمنع من اتمام هذه العملية اثناء مزامنة الحساب. بالامكان ان تترك الملف(ـات) كما هي و تحذف الرابط الى %3$s, او يمكنك نقل الملفات الى مجلد %1$s وحفظ الرابط الى %4$s.\n\nالملفات المدرجة ادناه هي الملف(ـات) المحلية و الملف(ـات) البعيدة في %5$s كاتوا على صلة + لا يوجد مجلد %1$s بعد الان نقل الكل تم نقل جميع الملفات بعض الملفات لا يمكن نقلها + محلي:%1$s لا يوجد مساحة كافية لنسخ الملفات المحددة لمجلد %1$s . هل ترغب بنقلهم للمجلد بدلاَ من ذلك؟ فضلا, ادخل كلمة السر %1$s مشغل الموسيقى %1$s (عرض) %1$s (تحميل) تم الانتهاء من تشغيل %1$s + لا يوجد ملف وسائط + لم يتم تقديم اي حساب + الملف ليس في حساب فعال + ترميز غير مدعوم + لا يمكن قراءة ملف الوسائط + لم يتم فك ترميز ملف الوسائط بشكل صحيح + انتهت المهلة أثناء محاولة العرض + لا يمكن عرض ملف الوسائط مع عارض الوسائط المستعمل + خطا امني اثناء محاولة عرض %1$s + خطا في المدخلات اثناء محاولة عرض %1$s + خطا غير متوقع اثناء محاولة عرض %1$s + محاولة الدخول ... لا يتوفر اتصال الاتصال الآمن غير متاح يتم إنشاء الاتصال - حدث خطأ غير معروف + اختبار الاتصال ... + اعدادات الخاد تالفة + الحساب لنفس المستخدم والخادم موجود مسبقا على الجهاز + المستخدم المدخل لا يتوافق مع المستخدم الموجود في الحساب + حدث خطأ غير معروف! + فشل في العثور على المضيف + الخادم اخذ الكثير من الوقت للرد + رابط تالف + لم يتم التعرف على اصدار الخادم لا يمكن إنشاء اتصال تم إنشاء اتصال آمن + خطا في الاسم او كلمة المرور + فشل في التحقق + تم رفض الوصول من قبل الخادم المرخص + حالة غير متوقعة: الرجاء, ادخال عنوان الخادم مرة اخرى + مدة التحقق انتهت , يرجى اعادة التحقق + يرجى ادخال كلمة المرور الحالية + مدة الجلسة انتهت , يرجى اعادة الاتصال + يتم الاتصال بالخادم للتحقق + الخادم لا يدعم طريقة التحقق هذه + %1$s لا يدعم الحسابات المتعددة + اجعل الملف محدث إعادة تسميه الغى هل تود حقاَ إزالة %1$s ؟ هل ترغب في إزالة %1$s و جهات الاتصال التابعة له؟ + محلي فقط المحتويات المحلية فقط حذف من الخادم يتم الحذف بنجاح لقد فشل الحذف أدخل اسما جديدا + لايمكن اعادة تسمية النسخ المحلي ,حاول باسم آخر + اعادة التسمية لم تكتمل + محتويات الملفات متزامنة سابقا + لم يتمكن من انشاء المجلد + رموز ممنوعة: / \\ < > : \" | ? * فضلاً, انتظر + خطا غير متوقع : الرجاء اختيار الملف من برنامج آخر لم يتم اختيار أي ملف + ارسل الرابط الى ... + تسجيل الدخول باستخدام oAuth2 + الاتصال مع خادم oAuth2 + تعذر التحقق من هوية الموقع + شهادة الخادم غير موثوقة + شهادة الخادم منتهية + تاريخ صلاحية شهادة الخادم في المستقبل + هل تريد ان تثق في هذه الشهادة على اي حال ؟ + لم يتمكن من حفظ الشهادة تفاصيل إخفاء الاسم الشائع: منظمة: الوحدة التنظيمية: البلد: + حالة: المكان: من: إلى: التوقيع: الخوارزمية: + صورة PNG 389 KB 12:23:45 + رفع الصور من خلال الواي فاي فقط + تعارض في التحديث + عدم الرفع معاينة الصورة هذه الصورة لا يمكن أن تظهر + %1$s لم يتمكن من النسخ الى %2$s في المجلد المحلي + فشل في محاولة الرفع الفوري + فشل في الرفع الفوري + ملخص لكل الاخطاء في عملية الرفع الفوري تحديد الكل + اعادة كل المختارات + حذف كل المختارات من قائمة انتظار الرفع + اعادة المحاولة لرفع الصورة: + تحميل المزيد من الصور + رسالة خطا: + الرجاء التاكد من اعدادات الخادم, من الممكن انك تعديت الحد في quota + عذرا , المشاركة غير مفعلة في الخادم. الرجاء التواصل مع المدير + لم يتمكن من مشاركة الملف او المجلد. يرجى التاكد من وجوده + حدث خطأ ما أثناء محاولة مشاركة هذا الملف أو المجلد + غير قادر على إلغاء مشاركة هذا الملف أو المجلد.لا وجود له + حدث خطأ ما أثناء محاولة إلغاء مشاركة هذا الملف أو المجلد diff --git a/res/values-bg-rBG/strings.xml b/res/values-bg-rBG/strings.xml index 335b1b4c..96ac0c10 100644 --- a/res/values-bg-rBG/strings.xml +++ b/res/values-bg-rBG/strings.xml @@ -5,6 +5,7 @@ Файлове Нова директория Настройки + Изпрати Общи Още Профили diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index 2454ad33..56641d35 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -4,6 +4,7 @@ ফাইল ডিরেক্টরি তৈরী কর নিয়ামকসমূহ + পাঠাও সাধারণ বেশী একাউন্ট diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index c29514dd..4f45a3c3 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -10,6 +10,7 @@ Crea una carpeta Configuració Detalls + Envia General Més Comptes @@ -56,6 +57,7 @@ Actualitza el fitxer L\'arxiu s\'ha canviat de nom a %1$s durant la càrrega Enllaç de compartició + Deixa de compartir l\'enllaç Sí No D\'acord @@ -180,6 +182,7 @@ Espereu S\'ha produït un problema inesperat; proveu una altra aplicació per seleccionar el fitxer No heu seleccionat cap fitxer + Envia l\'enllaç a... Accés amb oAuth2 Connectant amb el servidor oAuth2... No s\'ha pogut verificar la identitat del lloc web @@ -231,4 +234,9 @@ no facis res, no estàs en lína per la pujada instantània Missatge d\'Error: Comproveu la configuració del servidor, potser heu excedit la quota. + La compartició no es troba disponible al vostre servidor. Contacteu amb l\'administrador. + No es pot compartir aquest fitxer o carpeta. Assegureu-vos que existeix + S\'ha produït un error en intentar compartir aquest fitxer o carpeta + No es pot deixar de compartir aquest fitxer o carpeta. No existeix. + S\'ha produït un error en intentar deixar de compartir aquest fitxer o carpeta diff --git a/res/values-cs-rCZ/strings.xml b/res/values-cs-rCZ/strings.xml index 03bc06a3..ebe05d7b 100644 --- a/res/values-cs-rCZ/strings.xml +++ b/res/values-cs-rCZ/strings.xml @@ -10,6 +10,7 @@ Vytvořit adresář Nastavení Podrobnosti + Odeslat Obecné Více Účty diff --git a/res/values-cy-rGB/strings.xml b/res/values-cy-rGB/strings.xml index de4ffef9..0536a987 100644 --- a/res/values-cy-rGB/strings.xml +++ b/res/values-cy-rGB/strings.xml @@ -5,6 +5,7 @@ Ffeiliau Creu cyfeiriadur Gosodiadau + Anfon Cyffredinol Cyfrifon Rheoli Cyfrifon diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 71a7bff0..487c82d2 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -10,6 +10,7 @@ Opret mappe Indstillinger Detaljer + Send Generel Mere Konti diff --git a/res/values-de-rAT/strings.xml b/res/values-de-rAT/strings.xml index c757504a..4a150b43 100644 --- a/res/values-de-rAT/strings.xml +++ b/res/values-de-rAT/strings.xml @@ -1,2 +1,8 @@ - + + Einstellungen + Allgemein + Passwort + Herunterladen + Abbrechen + diff --git a/res/values-de-rCH/strings.xml b/res/values-de-rCH/strings.xml index d995da1c..8d9eac4e 100644 --- a/res/values-de-rCH/strings.xml +++ b/res/values-de-rCH/strings.xml @@ -10,6 +10,7 @@ Ordner anlegen Einstellungen Details + Senden Allgemein Mehr Konten diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml index ca43de3d..f71ca9bb 100644 --- a/res/values-de-rDE/strings.xml +++ b/res/values-de-rDE/strings.xml @@ -10,6 +10,7 @@ Ordner anlegen Einstellungen Details + Senden Allgemein Mehr Konten @@ -236,5 +237,6 @@ Entschuldigung, Freigaben sind auf Ihrem Server nicht aktiviert. Bitte kontaktieren Sie Ihren Administrator. Die Freigabe der Datei oder des Ordners ist nicht möglich. Bitte stellen Sie sicher, dass diese existiert. Es ist ein Fehler beim Freigeben der Datei oder des Ordners aufgetreten. + Das Entfernen der Freigabe für die Datei oder den Ordner ist nicht möglich. Diese existieren nicht. Es ist ein Fehler beim Entfernen der Freigabe für diese Datei oder den Ordner aufgetreten. diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 17b92e99..1f622062 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -10,6 +10,7 @@ Ordner anlegen Einstellungen Details + Senden Allgemein Mehr Konten @@ -236,5 +237,6 @@ Entschuldigung, Freigaben sind auf Deinem Server nicht aktiviert. Bitte kontaktiere Deinen Administrator. Die Freigabe der Datei oder des Ordners ist nicht möglich. Bitte stelle sicher, dass diese existiert. Es ist ein Fehler beim Freigeben der Datei oder des Ordners aufgetreten. + Das Entfernen der Freigabe für die Datei oder den Ordner ist nicht möglich. Diese existieren nicht. Es ist ein Fehler beim Entfernen der Freigabe für diese Datei oder den Ordner aufgetreten. diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index da7c29de..4fefb214 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -10,6 +10,7 @@ Δημιουργία καταλόγου Ρυθμίσεις Λεπτομέρειες + Αποστολή Γενικά Περισσότερα Λογαριασμοί diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index e4b215ae..c9aa109e 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -10,6 +10,7 @@ Create directory Settings Details + Send General More Accounts diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml index cf19b74a..fd3481ac 100644 --- a/res/values-eo/strings.xml +++ b/res/values-eo/strings.xml @@ -6,6 +6,7 @@ Krei dosierujon Agordo Detaloj + Sendi Ĝeneralo Pli Kontoj diff --git a/res/values-es-rAR/strings.xml b/res/values-es-rAR/strings.xml index 4bc8c767..d59f80f1 100644 --- a/res/values-es-rAR/strings.xml +++ b/res/values-es-rAR/strings.xml @@ -10,6 +10,7 @@ Crear directorio Configuración Detalles + Mandar General Más Cuentas diff --git a/res/values-es-rMX/strings.xml b/res/values-es-rMX/strings.xml index b674ceaa..4769347e 100644 --- a/res/values-es-rMX/strings.xml +++ b/res/values-es-rMX/strings.xml @@ -10,6 +10,7 @@ Crear directorio Ajustes Detalles + Enviar General Más Cuentas diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 1e19c569..82da673f 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -10,6 +10,7 @@ Crear directorio Configuración Detalles + Enviar General Más Cuentas @@ -236,5 +237,6 @@ Compartir archivos no está activado en su servidor. Sírvase contactar a su administrador de sistema. No es posible compartir este archivo o carpeta. Asegúrese de que existe. Ocurrió un error al tratar de compartir este archivo o carpeta + No se puede dejar de compartir este archivo o carpeta. No existe. Ocurrió un error al tratar de ya no compartir este archivo o carpeta diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index eba96630..dd22e86c 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -10,6 +10,7 @@ Loo kaust Seaded Üksikasjad + Saada Üldine Rohkem Kontod @@ -56,6 +57,7 @@ Värskenda faili Fail nimetati üleslaadimise käigus ümber %1$ Jaga linki + Tühista lingi jagamine Jah Ei OK @@ -232,6 +234,8 @@ ära tee midagi, sa pole võrku ühendatud koheseks üleslaadimiseks Veateade: Palun kontrolli oma serveri seadeid, võib-olla on mahulimiit ületatud. + Antud faili või kausta ei saa jagada. Tee kindlaks, et see on olemas Faili või kausta jagamisel esines viga + Antud faili või kausta jagamist pole võimalik tühistada Faili või kausta jagamise tühistamisel esines viga diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 6f476d9c..cd67b22d 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -10,6 +10,7 @@ Sortu karpeta Ezarpenak Xehetasunak + Bidali Orokorra Gehiago Kontuak diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index d37ecfe4..8e00ecdb 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -10,6 +10,7 @@ ایجاد پوشه تنظیمات جزئیات + ارسال عمومی بیش‌تر حساب‌ها diff --git a/res/values-fi-rFI/strings.xml b/res/values-fi-rFI/strings.xml index e81641dd..71b5e610 100644 --- a/res/values-fi-rFI/strings.xml +++ b/res/values-fi-rFI/strings.xml @@ -10,6 +10,7 @@ Luo kansio Asetukset Tiedot + Lähetä Yleiset Enemmän Tilit @@ -159,6 +160,7 @@ Odota hetki Odottamaton ongelma; kokeile valita tiedosto toisella sovelluksella Tiedostoa ei valittu + Lähetä linkki… Kirjaudu oAuth2:lla Yhdistetään oAuth2-palvelimeen… Sivuston identiteetin vahvistaminen ei onnistunut @@ -197,4 +199,7 @@ yritä uudelleen kaikkia valittuja Lataa lisää kuvia Virheviesti: + Valitettavasti jakamista ei ole otettu käyttöön palvelinasetuksissa. Ota yhteys ylläpitäjään. + Valitettavasti tämän tiedoston tai kansion jakaminen ei onnistu. Varmista että se on olemassa + Virhe tiedoston tai kansion jakamista yrittäessä diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 8234d45d..b16bda44 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -3,13 +3,14 @@ %1$s Android App version %1$s Actualiser le compte - Charger + Téléverser Contenu d\'une autre application Fichiers Ouvrir avec Créer un répertoire Paramètres Détails + Envoyer Général Plus Comptes @@ -56,6 +57,7 @@ Actualiser le fichier Le fichier a été renommé en %s pendant le téléversement Partager le lien + Ne plus partager ce lien Oui Non OK @@ -180,6 +182,7 @@ Veuillez patienter Problème inattendu ; veuillez essayer une autre app pour la sélection du fichier Aucun fichier sélectionné + Envoyer un lien à… Connexion avec aAuth2. Connexion au serveur aAuth2... L\'identité du site ne peut être vérifiée @@ -231,4 +234,9 @@ Ne rien faire vous n\'êtes pas connecté pour le téléchargement instantané Message d\'échec: Veuillez vérifier la configuration de votre serveur, peut-être que votre quota est dépassé. + Désolé, la fonctionnalité de partage n’est pas activée sur ce serveur. Veuillez contacter votre administrateur. + Impossible de partager ce fichier ou répertoire. Vérifiez qu’il est bien présent + Une erreur est survenue lors de la tentative de partage de ce fichier ou répertoire + Impossible d’annuler le partage de ce fichier ou répertoire : il n’existe pas. + Une erreur est survenue lors de la tentative d’annulation du partage de ce fichier ou répertoire diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 8820c201..764f44ae 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -10,6 +10,7 @@ Crear un directorio Preferencias Detalles + Enviar Xeral Máis Contas @@ -236,5 +237,6 @@ O seu servidor non ten activada a opción de compartir. Póñase en contacto co administrador. Non foi posíbel compartir este ficheiro ou cartafol. Asegurese de que existe. Produciuse un erro ao tentar compartir este ficheiro ou cartafol. + Non foi posíbel compartir este ficheiro ou cartafol xa que non existe. Produciuse un erro ao tentar deixar de compartir este ficheiro ou cartafol diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml index 36de5a7f..db3a562e 100644 --- a/res/values-he/strings.xml +++ b/res/values-he/strings.xml @@ -6,6 +6,7 @@ יצירת תיקייה הגדרות פרטים + שליחה כללי יותר חשבונות diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index da6fb71d..fa29e956 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -2,6 +2,7 @@ अपलोड सेटिंग्स + भेजें सामान्य सहयोग प्रयोक्ता का नाम diff --git a/res/values-hu-rHU/strings.xml b/res/values-hu-rHU/strings.xml index b341bb8a..e56e28c1 100644 --- a/res/values-hu-rHU/strings.xml +++ b/res/values-hu-rHU/strings.xml @@ -10,6 +10,7 @@ Mappa létrehozása Beállítások Részletek + Küldjük el Általános Több Fiókok @@ -56,6 +57,7 @@ File frissítése A feltöltés során az állmányt erre neveztük át: %1$s Megosztás hivatkozással + Megosztás visszavonása Igen Nem OK @@ -180,6 +182,7 @@ Egy pillanat... Váratlan hiba; válassza ki a fájlt más programból Egy fájl sincs kiválasztva + Hivatkozás küldése ... Bejelentkezés oAuth2-vel Kapcsolódás az oAuth2 szerverhez... A kiszolgálót nem sikerült azonosítani @@ -231,4 +234,9 @@ nem vagyunk online üzemmódban az azonnali feltöltéshez Hibaüzenet Kérjük ellenőrizd a szerver konfigurációt, mert lehet, hogy a kvótát túllépted. + Bocsánat, a megosztás nincs engedélyezve. A rendszergazda segíthet ezt tisztázni. + A mappa nem osztható meg. Lehet, hogy nem is létezik. + Hiba lépett fel a mappa megosztásakor + Nem lehet a megosztást megszüntetni. A mappa vagy fájl nem létezik. + Hiba lépett fel a mappa megosztásának visszavonásakor diff --git a/res/values-ia/strings.xml b/res/values-ia/strings.xml index ecfaa300..91ca2c0c 100644 --- a/res/values-ia/strings.xml +++ b/res/values-ia/strings.xml @@ -3,6 +3,7 @@ Incargar Files Configurationes + Invia General Plus Adjuta diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml index e190c5c1..9007c61a 100644 --- a/res/values-id/strings.xml +++ b/res/values-id/strings.xml @@ -10,6 +10,7 @@ Buat folder pengaturan Rincian + Kirim umum Lainnya Akun diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index e7d228b9..4109fe7d 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -3,6 +3,7 @@ Senda inn Skrár Stillingar + Senda Meira Hjálp Notendanafn diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 578ea5f8..c97901cf 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -10,6 +10,7 @@ Crea cartella Impostazioni Dettagli + Invia Generale Altro Account @@ -236,5 +237,6 @@ Spiacenti, la condivisione non è abilitata sul server. Contatta il tuo amministratore. Impossibile condividere il file o la cartella. Assicurati che esista. Si è verificato un errore durante il tentativo di condivisione del file o della cartella + Impossibile rimuovere dalla condivisione il file o la cartella. Non esiste. Si è verificato un errore durante il tentativo di rimuovere la condivisione del file o della cartella diff --git a/res/values-ja-rJP/strings.xml b/res/values-ja-rJP/strings.xml index 2c195477..b6ff5d0d 100644 --- a/res/values-ja-rJP/strings.xml +++ b/res/values-ja-rJP/strings.xml @@ -10,6 +10,7 @@ ディレクトリを作成 設定 詳細 + 送信 一般 もっと見る アカウント @@ -56,6 +57,7 @@ ファイルを同期 アップロード中にファイル名を %1$s に変更しました URLで共有 + 未共有のリンク はい いいえ OK @@ -180,6 +182,7 @@ しばらくお待ちください 予期せぬ問題;他のアプリでファイルを選択してみてください。 ファイルは選択されていません + リンクを送信… oAuth2でログイン oAuth2サーバーに接続中... サイトの識別子を確認できませんでした @@ -231,4 +234,8 @@ オンラインでなく、インスタントアップロードのために何もしません 失敗メッセージ: サーバー設定を確認してください。クォータサイズを超えている可能性があります。 + すみませんが、サーバーで共有が有効になっていません。管理者に連絡してください。 + このファイルまたはフォルダーは共有できません。存在しているか確認してください。 + このファイルまたはフォルダーを共有する際にエラーが発生しました + このファイルまたはフォルダーの共有を解除する際にエラーが発生しました diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 0ff4bee3..11212fac 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -5,6 +5,7 @@ ფაილები დირექტორიის შექმნა პარამეტრები + გაგზავნა ზოგადი უფრო მეტი ანგარიში diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 112c57f8..abfad3f4 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -10,6 +10,7 @@ 디렉터리 만들기 설정 세부내용 + 보내기 일반 더 중요함 계정 diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml index 7b6579d8..7448ad3e 100644 --- a/res/values-lb/strings.xml +++ b/res/values-lb/strings.xml @@ -7,6 +7,7 @@ Dossier erstellen Astellungen Detailer + Schécken Allgemeng Méi Accounten diff --git a/res/values-lt-rLT/strings.xml b/res/values-lt-rLT/strings.xml index 063cc849..cef42972 100644 --- a/res/values-lt-rLT/strings.xml +++ b/res/values-lt-rLT/strings.xml @@ -10,6 +10,7 @@ Kurti aplanką Nustatymai Informacija + Siųsti Bendras Daugiau Paskyros diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index e52b10f1..2276e2f2 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -5,6 +5,7 @@ Datnes Izveidot direktoriju Iestatījumi + Sūtīt Vispārīgi Vairāk Konti diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index 10fa36af..98bb94d2 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -6,6 +6,7 @@ Создади папка Параметри Детали: + Прати Општо Повеќе Сметки diff --git a/res/values-nb-rNO/strings.xml b/res/values-nb-rNO/strings.xml index b1d1899a..ebe4d6f7 100644 --- a/res/values-nb-rNO/strings.xml +++ b/res/values-nb-rNO/strings.xml @@ -10,6 +10,7 @@ Opprett katalog Innstillinger Detaljer + Send Generelt Mer Kontoer diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 4cfbcebb..e94a285e 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -10,6 +10,7 @@ Creëer map Instellingen Details + Versturen Algemeen Meer Accounts @@ -236,5 +237,6 @@ Sorry, delen is niet mogelijk op uw server. Neem contact op met uw beheerder. Kan dit bestand of deze map niet delen. Controleer of dit object wel bestaat. Er trad een fout op bij uw poging dit bestand of deze map te delen + Kan delen van dit bestand of deze map niet beëindigen. Het object bestaat niet. Er trad een fout op bij uw poging het delen van dit bestand of deze map te beëindigen diff --git a/res/values-nn-rNO/strings.xml b/res/values-nn-rNO/strings.xml index 0d76c8ec..6dc6d202 100644 --- a/res/values-nn-rNO/strings.xml +++ b/res/values-nn-rNO/strings.xml @@ -5,6 +5,7 @@ Filer Opprett mappe Innstillingar + Send Generelt Meir Kontoar diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index d3a28367..c7203fbd 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -10,6 +10,7 @@ ਡਾਇਰੈਕਟਰੀ ਬਣਾਓ ਸੈਟਿੰਗ ਵੇਰਵ + ਭੇਜੋ ਆਮ ਅਕਾਊਂਟ ਲਾਗ ਰੱਖਣਾ ਚਾਲੂ diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 3d0e63d6..7453aa31 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -10,6 +10,7 @@ Nowy katalog Ustawienia Szczegóły + Wyślij Ogólne Więcej Konta @@ -236,5 +237,6 @@ Przepraszamy, udostępnianie jest wyłączone na twoim serwerze. Skontaktuj się z twoim administratorem. Brak możliwości udostępnienia tego pliku lub folderu. Upewnij się, że istnieje. Wystąpił błąd podczas udostępniania tego pliku lub folderu. + Nie można anulować udostępniania tego pliku lub folderu. Jeśli nie istnieje. Wystąpił błąd podczas anulowania udostępniania tego pliku lub folderu. diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 93d654de..f9570b55 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -10,6 +10,7 @@ Criar pasta Ajustes Detalhes + Enviar Geral Mais Contas @@ -236,5 +237,6 @@ Desculpe, compartilhamento não está habilitado para seu servidor. Por favor faça contato com o seu administrador. Incapaz de compartilhar esse arquivo ou pasta. Por favor, certifique-se que existe Ocorreu um erro durante a tentativa de compartilhar esse arquivo ou pasta + Incapaz de descompartilhar este arquivo ou pasta. Ela não existe. Ocorreu um erro ao tentar descompartilhar este arquivo ou pasta diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 0005cb4b..26d9c13c 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -10,6 +10,7 @@ Criar pasta Definições Detalhes + Enviar Geral Mais Contas diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 05692777..d86618bd 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -5,6 +5,7 @@ Fișiere Creare director Setări + Expediază General Mai mult Conturi diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 1964f738..a3f09f2d 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -10,6 +10,7 @@ Создать каталог Настройки Подробно + Отправить Основные Больше Учётные записи diff --git a/res/values-sk-rSK/strings.xml b/res/values-sk-rSK/strings.xml index 0b173702..a1b454c4 100644 --- a/res/values-sk-rSK/strings.xml +++ b/res/values-sk-rSK/strings.xml @@ -10,6 +10,7 @@ Vytvor priečinok Nastavenia Podrobnosti + Odoslať Všeobecné Viac Účty diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index d61395ab..fce4a206 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -10,6 +10,7 @@ Ustvari mapo Nastavitve Podrobnosti + Pošlji Splošno Več Računi @@ -233,7 +234,9 @@ ne pošlji takoj, saj je povezava v omrežje ni dejavna Sporočilo o napaki: Preverite nastavitve strežnika. Morda je presežena vrednost količinske omejitve. + Souporaba je na strežniku onemogočena. Možnost lahko spreminjajo le uporabniki s skrbniškimi dovoljenji. Ni mogoče omogočiti souporabe te datoteke ali mape. Prepričajte se, da obstaja ... Prišlo je do napake med poskusom omogočanja souporabe te datoteke ali mape + Ni mogoče prekiniti souporabe te datoteke ali mape, ker ne obstaja. Prišlo je do napake med poskusom odstranjevanja souporabe te datoteke ali mape diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index c460e82b..101fefd6 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -4,6 +4,7 @@ Skedarët Krijo kartelë Parametrat + Dërgo Përgjithshme Më tepër Llogarit diff --git a/res/values-sr-rSP/strings.xml b/res/values-sr-rSP/strings.xml index eefd16d8..6a3a54e3 100644 --- a/res/values-sr-rSP/strings.xml +++ b/res/values-sr-rSP/strings.xml @@ -5,6 +5,7 @@ Novi folder Podešavanja Detaljnije + Pošalji Opšte Nalozi Upravljaj nalozima diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 83ce42df..74b8961d 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -5,6 +5,7 @@ Датотеке Направи фасциклу Поставке + Пошаљи Опште Више Налози diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 79c98877..c4a092bb 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -10,6 +10,7 @@ Skapa mapp Inställningar Detaljer + Skicka Allmänt Mer Konton diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index ca33f4ea..f7f028cc 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -1,6 +1,7 @@ అమరికలు + పంపించు మరిన్ని సహాయం వాడుకరి పేరు diff --git a/res/values-th-rTH/strings.xml b/res/values-th-rTH/strings.xml index 77451fac..609e4950 100644 --- a/res/values-th-rTH/strings.xml +++ b/res/values-th-rTH/strings.xml @@ -6,6 +6,7 @@ สร้างไดเร็กทอรี่ ตั้งค่า รายละเอียด + ส่ง ทั่วไป มาก บัญชี @@ -44,6 +45,7 @@ ยกเลิก บันทึก & ออก ข้อผิดพลาด + ข้อผิดพลาดที่ไม่ทราบสาเหตุ เกี่ยวกับเรา เปลี่ยนรหัสผ่าน ลบบัญชี diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 0e920b4f..72d9ecdf 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -10,6 +10,7 @@ Dizin oluştur Ayarlar Detaylar + Gönder Genel Daha fazla Hesaplar @@ -236,5 +237,6 @@ Üzgünüz, paylaşım sunucunuzda etkin değil. Lütfen yöneticinizle iletişime geçin. Bu dosya veya klasör paylaşılamıyor. Lütfen mevcut olup olmadığını denetleyin Bu dosya veya klasörü paylaşmaya çalışılırken bir hata oluştu + Bu dosya veya klasörün paylaşımı kaldırılamadı. Mevcut değil. Bu dosya veya klasör paylaşımı kaldırılmaya çalışılırken bir hata oluştu diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml index 16a441ad..d7ac644b 100644 --- a/res/values-ug/strings.xml +++ b/res/values-ug/strings.xml @@ -4,6 +4,7 @@ ھۆججەتلەر مۇندەرىجە قۇر تەڭشەكلەر + يوللا ئادەتتىكى تېخىمۇ كۆپ ھېساباتلار diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index d0f4dfd7..6df91490 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -6,6 +6,7 @@ Створити теку Налаштування Деталі + Надіслати Основне Більше Облікові записи diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 0f1c0eee..4b53d5f4 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -10,6 +10,7 @@ Tạo thư mục Cài đặt Chi tiết + Gởi Tổng hợp hơn Tài khoản @@ -56,6 +57,7 @@ Cập nhật lại tập tin Tập tin đã bị đổi tên thành %1$s trong quá trình tải lên Chia sẻ liên kết + Liên kết không chia sẻ Yes Không Chấp nhận @@ -180,6 +182,7 @@ Chờ một lúc Vấn đề bất ngờ ; hãy thử ứng dụng khác để chọn tập tin Không có tập tin nào được chọn + Gửi liên kết đến... Đăng nhập bằng oAuth2. Đang kết nối đến máy chủ oAuth2... Không thể xác minh danh tính của site @@ -231,4 +234,9 @@ không thực hiện thao tác gì nêu bạn không có kết nối mạng dành cho tải lên nhanh Thông điệp lỗi: Vui lòng kiểm tra cấu hình máy chủ của bạn, có thể hạn ngạch dữ liệu đã quá hạn. + Thật tiếc, chia sẻ đã bị vô hiệu trên server của bạn. Vui lòng liên hệ người quản trị. + Không thể chia sẻ file hoặc thư mục này. Hãy chắc chắn rằng nó tồn tại + Một lỗi đã xảy ra khi thử chia sẻ file hoặc thư mục này + Không thể gỡ chia sẻ file hoặc thư mục. Nó không tồn tại. + Một lỗi đã xảy ra khi thử gỡ chia sẻ file hoặc thư mục này diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 3b4f8ebb..9c55b8db 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -10,6 +10,7 @@ 创建目录 设置 详细信息 + 发送 常规 更多 账号 diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index c1195647..199c193b 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -4,6 +4,7 @@ 文件 建立目錄 設定 + 傳送 一般 帳號 幫助 diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 51fd70b1..5f155249 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -10,6 +10,7 @@ 建立目錄 設定 詳細資料 + 寄出 一般 更多 帳號 diff --git a/res/values/strings.xml b/res/values/strings.xml index 6b58ea8d..b59e987c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11,7 +11,7 @@ Create directory Settings Details - + Send General More Accounts diff --git a/res/values/styles.xml b/res/values/styles.xml index 034ca5cb..c65cbadd 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -59,7 +59,7 @@ - diff --git a/src/com/owncloud/android/authentication/AccountAuthenticator.java b/src/com/owncloud/android/authentication/AccountAuthenticator.java index 49a93552..5c03fe12 100644 --- a/src/com/owncloud/android/authentication/AccountAuthenticator.java +++ b/src/com/owncloud/android/authentication/AccountAuthenticator.java @@ -28,7 +28,7 @@ import android.os.Bundle; import android.os.Handler; import android.widget.Toast; -import com.owncloud.android.lib.accounts.AccountTypeUtils; +import com.owncloud.android.lib.common.accounts.AccountTypeUtils; import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/authentication/AccountUtils.java b/src/com/owncloud/android/authentication/AccountUtils.java index 5f0441c5..10c87963 100644 --- a/src/com/owncloud/android/authentication/AccountUtils.java +++ b/src/com/owncloud/android/authentication/AccountUtils.java @@ -19,8 +19,8 @@ package com.owncloud.android.authentication; import com.owncloud.android.MainApp; -import com.owncloud.android.lib.accounts.AccountTypeUtils; -import com.owncloud.android.lib.utils.OwnCloudVersion; +import com.owncloud.android.lib.common.accounts.AccountTypeUtils; +import com.owncloud.android.lib.resources.status.OwnCloudVersion; import android.accounts.Account; import android.accounts.AccountManager; diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java index 61e31b44..b59ac6e7 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -53,25 +53,25 @@ import com.actionbarsherlock.app.SherlockDialogFragment; import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener; -import com.owncloud.android.lib.accounts.AccountTypeUtils; -import com.owncloud.android.lib.accounts.OwnCloudAccount; -import com.owncloud.android.lib.network.OwnCloudClientFactory; -import com.owncloud.android.lib.network.OwnCloudClient; +import com.owncloud.android.lib.common.accounts.AccountTypeUtils; +import com.owncloud.android.lib.common.accounts.AccountUtils.Constants; +import com.owncloud.android.lib.common.OwnCloudClientFactory; +import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.operations.OAuth2GetAccessToken; -import com.owncloud.android.lib.operations.common.OnRemoteOperationListener; -import com.owncloud.android.lib.operations.remote.OwnCloudServerCheckOperation; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; -import com.owncloud.android.lib.operations.remote.ExistenceCheckRemoteOperation; -import com.owncloud.android.lib.operations.remote.GetUserNameRemoteOperation; +import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; +import com.owncloud.android.lib.resources.status.GetRemoteStatusOperation; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation; +import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation; import com.owncloud.android.ui.dialog.SamlWebViewDialog; import com.owncloud.android.ui.dialog.SslValidatorDialog; import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener; import com.owncloud.android.utils.Log_OC; -import com.owncloud.android.lib.utils.OwnCloudVersion; +import com.owncloud.android.lib.resources.status.OwnCloudVersion; /** * This Activity is used to add an ownCloud account to the App @@ -106,7 +106,7 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList private static final String KEY_AUTH_STATUS_TEXT = "AUTH_STATUS_TEXT"; private static final String KEY_AUTH_STATUS_ICON = "AUTH_STATUS_ICON"; private static final String KEY_REFRESH_BUTTON_ENABLED = "KEY_REFRESH_BUTTON_ENABLED"; - private static final String KEY_IS_SHARED_SUPPORTED = "KEY_IS_SHARE_SUPPORTED"; + //private static final String KEY_IS_SHARED_SUPPORTED = "KEY_IS_SHARE_SUPPORTED"; private static final String AUTH_ON = "on"; private static final String AUTH_OFF = "off"; @@ -133,7 +133,7 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList private final Handler mHandler = new Handler(); private Thread mOperationThread; - private OwnCloudServerCheckOperation mOcServerChkOperation; + private GetRemoteStatusOperation mOcServerChkOperation; private ExistenceCheckRemoteOperation mAuthCheckOperation; private RemoteOperationResult mLastSslUntrustedServerResult; @@ -237,16 +237,16 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList /// retrieve extras from intent mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT); - if (mAccount != null) { - String ocVersion = mAccountMgr.getUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_VERSION); - String ocVersionString = mAccountMgr.getUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_VERSION_STRING); + if (mAccount != null) { + String ocVersion = mAccountMgr.getUserData(mAccount, Constants.KEY_OC_VERSION); + String ocVersionString = mAccountMgr.getUserData(mAccount, Constants.KEY_OC_VERSION_STRING); if (ocVersion != null) { mDiscoveredVersion = new OwnCloudVersion(ocVersion, ocVersionString); } - mHostBaseUrl = normalizeUrl(mAccountMgr.getUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_BASE_URL)); + mHostBaseUrl = normalizeUrl(mAccountMgr.getUserData(mAccount, Constants.KEY_OC_BASE_URL)); mHostUrlInput.setText(mHostBaseUrl); String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@')); - mUsernameInput.setText(userName); + mUsernameInput.setText(userName); } initAuthorizationMethod(); // checks intent and setup.xml to determine mCurrentAuthorizationMethod @@ -398,8 +398,8 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList if (mAuthTokenType == null) { if (mAccount != null) { /// same authentication method than the one used to create the account to update - oAuthRequired = (mAccountMgr.getUserData(mAccount, OwnCloudAccount.Constants.KEY_SUPPORTS_OAUTH2) != null); - samlWebSsoRequired = (mAccountMgr.getUserData(mAccount, OwnCloudAccount.Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null); + oAuthRequired = (mAccountMgr.getUserData(mAccount, Constants.KEY_SUPPORTS_OAUTH2) != null); + samlWebSsoRequired = (mAccountMgr.getUserData(mAccount, Constants.KEY_SUPPORTS_SAML_WEB_SSO) != null); } else { /// use the one set in setup.xml @@ -596,7 +596,7 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList mServerStatusText = R.string.auth_testing_connection; mServerStatusIcon = R.drawable.progress_small; showServerStatus(); - mOcServerChkOperation = new OwnCloudServerCheckOperation(uri, this); + mOcServerChkOperation = new GetRemoteStatusOperation(uri, this); OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(uri), this, true); mOperationThread = mOcServerChkOperation.execute(client, this, mHandler); } else { @@ -786,8 +786,8 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList @Override public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) { - if (operation instanceof OwnCloudServerCheckOperation) { - onOcServerCheckFinish((OwnCloudServerCheckOperation) operation, result); + if (operation instanceof GetRemoteStatusOperation) { + onOcServerCheckFinish((GetRemoteStatusOperation) operation, result); } else if (operation instanceof OAuth2GetAccessToken) { onGetOAuthAccessTokenFinish((OAuth2GetAccessToken)operation, result); @@ -799,14 +799,14 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList } else { onAuthorizationCheckFinish((ExistenceCheckRemoteOperation)operation, result); } - } else if (operation instanceof GetUserNameRemoteOperation) { - onGetUserNameFinish((GetUserNameRemoteOperation) operation, result); + } else if (operation instanceof GetRemoteUserNameOperation) { + onGetUserNameFinish((GetRemoteUserNameOperation) operation, result); } } - private void onGetUserNameFinish(GetUserNameRemoteOperation operation, RemoteOperationResult result) { + private void onGetUserNameFinish(GetRemoteUserNameOperation operation, RemoteOperationResult result) { if (result.isSuccess()) { boolean success = false; String username = operation.getUserName(); @@ -873,7 +873,7 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList * @param operation Server check performed. * @param result Result of the check. */ - private void onOcServerCheckFinish(OwnCloudServerCheckOperation operation, RemoteOperationResult result) { + private void onOcServerCheckFinish(GetRemoteStatusOperation operation, RemoteOperationResult result) { if (operation.equals(mOcServerChkOperation)) { /// save result state mServerIsChecked = true; @@ -1292,14 +1292,15 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList if (isOAuth || isSaml) { mAccountMgr.setAuthToken(mAccount, mAuthTokenType, mAuthToken); } - /// add user data to the new account; TODO probably can be done in the last parameter addAccountExplicitly, or in KEY_USERDATA - mAccountMgr.setUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_VERSION, mDiscoveredVersion.getVersion()); - mAccountMgr.setUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_VERSION_STRING, mDiscoveredVersion.getVersionString()); - mAccountMgr.setUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_BASE_URL, mHostBaseUrl); + /// add user data to the new account; TODO probably can be done in the last parameter addAccountExplicitly, or in KEY_USERDATA + mAccountMgr.setUserData(mAccount, Constants.KEY_OC_VERSION, mDiscoveredVersion.getVersion()); + mAccountMgr.setUserData(mAccount, Constants.KEY_OC_VERSION_STRING, mDiscoveredVersion.getVersionString()); + mAccountMgr.setUserData(mAccount, Constants.KEY_OC_BASE_URL, mHostBaseUrl); + if (isSaml) { - mAccountMgr.setUserData(mAccount, OwnCloudAccount.Constants.KEY_SUPPORTS_SAML_WEB_SSO, "TRUE"); + mAccountMgr.setUserData(mAccount, Constants.KEY_SUPPORTS_SAML_WEB_SSO, "TRUE"); } else if (isOAuth) { - mAccountMgr.setUserData(mAccount, OwnCloudAccount.Constants.KEY_SUPPORTS_OAUTH2, "TRUE"); + mAccountMgr.setUserData(mAccount, Constants.KEY_SUPPORTS_OAUTH2, "TRUE"); } setAccountAuthenticatorResult(intent.getExtras()); @@ -1610,7 +1611,7 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList if (sessionCookie != null && sessionCookie.length() > 0) { mAuthToken = sessionCookie; - GetUserNameRemoteOperation getUserOperation = new GetUserNameRemoteOperation(); + GetRemoteUserNameOperation getUserOperation = new GetRemoteUserNameOperation(); OwnCloudClient client = OwnCloudClientFactory.createOwnCloudClient(Uri.parse(mHostBaseUrl), getApplicationContext(), true); client.setSsoSessionCookie(mAuthToken); getUserOperation.execute(client, this, mHandler); diff --git a/src/com/owncloud/android/authentication/OwnCloudAccount.java b/src/com/owncloud/android/authentication/OwnCloudAccount.java new file mode 100644 index 00000000..51a9900b --- /dev/null +++ b/src/com/owncloud/android/authentication/OwnCloudAccount.java @@ -0,0 +1,75 @@ +/* ownCloud Android client application + * Copyright (C) 2014 ownCloud Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package com.owncloud.android.authentication; + +import android.accounts.Account; +import android.os.Parcel; +import android.os.Parcelable; + +/** + * Account with extra information specific for ownCloud accounts. + * + * TODO integrate in the main app + * + * @author David A. Velasco + */ +public class OwnCloudAccount extends Account { + + private String mAuthTokenType; + + public OwnCloudAccount(String name, String type, String authTokenType) { + super(name, type); + // TODO validate authTokentype as supported + mAuthTokenType = authTokenType; + } + + /** + * Reconstruct from parcel + * + * @param source The source parcel + */ + public OwnCloudAccount(Parcel source) { + super(source); + mAuthTokenType = source.readString(); + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + super.writeToParcel(dest, flags); + dest.writeString(mAuthTokenType); + } + + + public String getAuthTokenType() { + return mAuthTokenType; + } + + + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + @Override + public OwnCloudAccount createFromParcel(Parcel source) { + return new OwnCloudAccount(source); + } + + @Override + public OwnCloudAccount [] newArray(int size) { + return new OwnCloudAccount[size]; + } + }; + +} diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java index e18a15b1..5abdd892 100644 --- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java +++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -27,9 +27,9 @@ import java.util.Vector; import com.owncloud.android.MainApp; import com.owncloud.android.db.ProviderMeta.ProviderTableMeta; -import com.owncloud.android.lib.operations.common.OCShare; -import com.owncloud.android.lib.operations.common.ShareType; -import com.owncloud.android.lib.utils.FileUtils; +import com.owncloud.android.lib.resources.shares.OCShare; +import com.owncloud.android.lib.resources.shares.ShareType; +import com.owncloud.android.lib.resources.files.FileUtils; import com.owncloud.android.utils.FileStorageUtils; import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java index c14d84dc..8843897c 100644 --- a/src/com/owncloud/android/files/FileOperationsHelper.java +++ b/src/com/owncloud/android/files/FileOperationsHelper.java @@ -28,9 +28,10 @@ import android.widget.Toast; import com.owncloud.android.R; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.lib.accounts.OwnCloudAccount; -import com.owncloud.android.lib.network.webdav.WebdavUtils; -import com.owncloud.android.lib.utils.OwnCloudVersion; + +import com.owncloud.android.lib.common.accounts.AccountUtils.Constants; +import com.owncloud.android.lib.common.network.WebdavUtils; +import com.owncloud.android.lib.resources.status.OwnCloudVersion; import com.owncloud.android.services.OperationsService; import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.dialog.ShareLinkToDialog; @@ -136,8 +137,9 @@ public class FileOperationsHelper { public boolean isSharedSupported(FileActivity callerActivity) { if (callerActivity.getAccount() != null) { AccountManager accountManager = AccountManager.get(callerActivity); - String version = accountManager.getUserData(callerActivity.getAccount(), OwnCloudAccount.Constants.KEY_OC_VERSION); - String versionString = accountManager.getUserData(callerActivity.getAccount(), OwnCloudAccount.Constants.KEY_OC_VERSION_STRING); + + String version = accountManager.getUserData(callerActivity.getAccount(), Constants.KEY_OC_VERSION); + String versionString = accountManager.getUserData(callerActivity.getAccount(), Constants.KEY_OC_VERSION_STRING); return (new OwnCloudVersion(version, versionString)).isSharedSupported(); //return Boolean.parseBoolean(accountManager.getUserData(callerActivity.getAccount(), OwnCloudAccount.Constants.KEY_SUPPORTS_SHARE_API)); } diff --git a/src/com/owncloud/android/files/OwnCloudFileObserver.java b/src/com/owncloud/android/files/OwnCloudFileObserver.java index ade4c61c..d5a42b5e 100644 --- a/src/com/owncloud/android/files/OwnCloudFileObserver.java +++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java @@ -22,9 +22,9 @@ import java.io.File; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.operations.SynchronizeFileOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.ui.activity.ConflictsResolveActivity; import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index 67bd796e..e59e37d9 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -33,13 +33,13 @@ import com.owncloud.android.authentication.AuthenticatorActivity; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.lib.network.OnDatatransferProgressListener; -import com.owncloud.android.lib.network.OwnCloudClientFactory; -import com.owncloud.android.lib.network.OwnCloudClient; +import com.owncloud.android.lib.common.network.OnDatatransferProgressListener; +import com.owncloud.android.lib.common.OwnCloudClientFactory; +import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.operations.DownloadFileOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; -import com.owncloud.android.lib.utils.FileUtils; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.resources.files.FileUtils; import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.activity.FileDisplayActivity; import com.owncloud.android.ui.preview.PreviewImageActivity; diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index 0cffa28d..2f963562 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -34,19 +34,19 @@ import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.db.DbHandler; import com.owncloud.android.operations.CreateFolderOperation; -import com.owncloud.android.lib.operations.common.RemoteFile; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; +import com.owncloud.android.lib.resources.files.RemoteFile; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.operations.UploadFileOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; -import com.owncloud.android.lib.operations.remote.ExistenceCheckRemoteOperation; -import com.owncloud.android.lib.operations.remote.ReadRemoteFileOperation; -import com.owncloud.android.lib.utils.FileUtils; -import com.owncloud.android.lib.utils.OwnCloudVersion; -import com.owncloud.android.lib.network.OnDatatransferProgressListener; -import com.owncloud.android.lib.accounts.OwnCloudAccount; -import com.owncloud.android.lib.network.OwnCloudClientFactory; -import com.owncloud.android.lib.network.OwnCloudClient; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation; +import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation; +import com.owncloud.android.lib.resources.files.FileUtils; +import com.owncloud.android.lib.resources.status.OwnCloudVersion; +import com.owncloud.android.lib.common.accounts.AccountUtils.Constants; +import com.owncloud.android.lib.common.network.OnDatatransferProgressListener; +import com.owncloud.android.lib.common.OwnCloudClientFactory; +import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.ui.activity.FailedUploadActivity; import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.activity.FileDisplayActivity; @@ -254,9 +254,10 @@ public class FileUploader extends Service implements OnDatatransferProgressListe } AccountManager aMgr = AccountManager.get(this); - String version = aMgr.getUserData(account, OwnCloudAccount.Constants.KEY_OC_VERSION); - String versionString = aMgr.getUserData(account, OwnCloudAccount.Constants.KEY_OC_VERSION_STRING); + String version = aMgr.getUserData(account, Constants.KEY_OC_VERSION); + String versionString = aMgr.getUserData(account, Constants.KEY_OC_VERSION_STRING); OwnCloudVersion ocv = new OwnCloudVersion(version, versionString); + boolean chunked = FileUploader.chunkedUploadIsSupported(ocv); AbstractList requestedUploads = new Vector(); String uploadKey = null; diff --git a/src/com/owncloud/android/operations/CreateFolderOperation.java b/src/com/owncloud/android/operations/CreateFolderOperation.java index 9ba118e6..19e9ddc4 100644 --- a/src/com/owncloud/android/operations/CreateFolderOperation.java +++ b/src/com/owncloud/android/operations/CreateFolderOperation.java @@ -19,11 +19,11 @@ package com.owncloud.android.operations; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.remote.CreateRemoteFolderOperation; -import com.owncloud.android.lib.operations.common.OnRemoteOperationListener; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.resources.files.CreateRemoteFolderOperation; +import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.utils.FileStorageUtils; import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/operations/CreateShareOperation.java b/src/com/owncloud/android/operations/CreateShareOperation.java index 7b646533..7277b3a7 100644 --- a/src/com/owncloud/android/operations/CreateShareOperation.java +++ b/src/com/owncloud/android/operations/CreateShareOperation.java @@ -28,12 +28,12 @@ import android.content.Intent; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.OCShare; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.ShareType; -import com.owncloud.android.lib.operations.remote.CreateShareRemoteOperation; -import com.owncloud.android.lib.utils.FileUtils; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.resources.shares.OCShare; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.resources.shares.ShareType; +import com.owncloud.android.lib.resources.shares.CreateRemoteShareOperation; +import com.owncloud.android.lib.resources.files.FileUtils; import com.owncloud.android.operations.common.SyncOperation; import com.owncloud.android.utils.Log_OC; @@ -83,7 +83,7 @@ public class CreateShareOperation extends SyncOperation { @Override protected RemoteOperationResult run(OwnCloudClient client) { - CreateShareRemoteOperation operation = new CreateShareRemoteOperation(mPath, mShareType, mShareWith, mPublicUpload, mPassword, mPermissions); + CreateRemoteShareOperation operation = new CreateRemoteShareOperation(mPath, mShareType, mShareWith, mPublicUpload, mPassword, mPermissions); RemoteOperationResult result = operation.execute(client); if (result.isSuccess()) { diff --git a/src/com/owncloud/android/operations/DownloadFileOperation.java b/src/com/owncloud/android/operations/DownloadFileOperation.java index 04011c10..c672d572 100644 --- a/src/com/owncloud/android/operations/DownloadFileOperation.java +++ b/src/com/owncloud/android/operations/DownloadFileOperation.java @@ -23,11 +23,11 @@ import java.util.Iterator; import java.util.Set; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.lib.network.OnDatatransferProgressListener; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.remote.DownloadRemoteFileOperation; +import com.owncloud.android.lib.common.network.OnDatatransferProgressListener; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation; import com.owncloud.android.utils.FileStorageUtils; import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/operations/GetSharesForFileOperation.java b/src/com/owncloud/android/operations/GetSharesForFileOperation.java index fd2dab74..3ffb0a59 100644 --- a/src/com/owncloud/android/operations/GetSharesForFileOperation.java +++ b/src/com/owncloud/android/operations/GetSharesForFileOperation.java @@ -20,10 +20,10 @@ package com.owncloud.android.operations; import java.util.ArrayList; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.OCShare; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.remote.GetSharesForFileRemoteOperation; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.resources.shares.OCShare; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.resources.shares.GetRemoteSharesForFileOperation; import com.owncloud.android.operations.common.SyncOperation; import com.owncloud.android.utils.Log_OC; @@ -58,7 +58,7 @@ public class GetSharesForFileOperation extends SyncOperation { @Override protected RemoteOperationResult run(OwnCloudClient client) { - GetSharesForFileRemoteOperation operation = new GetSharesForFileRemoteOperation(mPath, mReshares, mSubfiles); + GetRemoteSharesForFileOperation operation = new GetRemoteSharesForFileOperation(mPath, mReshares, mSubfiles); RemoteOperationResult result = operation.execute(client); if (result.isSuccess()) { diff --git a/src/com/owncloud/android/operations/GetSharesOperation.java b/src/com/owncloud/android/operations/GetSharesOperation.java index eb221598..c9cce406 100644 --- a/src/com/owncloud/android/operations/GetSharesOperation.java +++ b/src/com/owncloud/android/operations/GetSharesOperation.java @@ -19,10 +19,10 @@ package com.owncloud.android.operations; import java.util.ArrayList; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.OCShare; -import com.owncloud.android.lib.operations.remote.GetRemoteSharesOperation; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.resources.shares.OCShare; +import com.owncloud.android.lib.resources.shares.GetRemoteSharesOperation; import com.owncloud.android.operations.common.SyncOperation; import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java index 45238ba2..e2d72c5c 100644 --- a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java +++ b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java @@ -9,10 +9,10 @@ import org.json.JSONException; import org.json.JSONObject; import com.owncloud.android.authentication.OAuth2Constants; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/operations/RemoveFileOperation.java b/src/com/owncloud/android/operations/RemoveFileOperation.java index 5cd668cc..ff673cad 100644 --- a/src/com/owncloud/android/operations/RemoveFileOperation.java +++ b/src/com/owncloud/android/operations/RemoveFileOperation.java @@ -19,11 +19,11 @@ package com.owncloud.android.operations; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; -import com.owncloud.android.lib.operations.remote.RemoveRemoteFileOperation; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.resources.files.RemoveRemoteFileOperation; /** diff --git a/src/com/owncloud/android/operations/RenameFileOperation.java b/src/com/owncloud/android/operations/RenameFileOperation.java index d77020c6..a007af2b 100644 --- a/src/com/owncloud/android/operations/RenameFileOperation.java +++ b/src/com/owncloud/android/operations/RenameFileOperation.java @@ -22,11 +22,11 @@ import java.io.IOException; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; -import com.owncloud.android.lib.operations.remote.RenameRemoteFileOperation; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.resources.files.RenameRemoteFileOperation; import com.owncloud.android.utils.FileStorageUtils; import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java index 2b948857..7189167d 100644 --- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java @@ -22,12 +22,12 @@ import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader; import com.owncloud.android.files.services.FileUploader; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.RemoteFile; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; -import com.owncloud.android.lib.operations.remote.ReadRemoteFileOperation; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.resources.files.RemoteFile; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation; import com.owncloud.android.utils.FileStorageUtils; import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java index 97641c62..5d957071 100644 --- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java @@ -37,16 +37,18 @@ import android.content.Intent; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.OCShare; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; -import com.owncloud.android.lib.operations.remote.GetSharesForFileRemoteOperation; -import com.owncloud.android.lib.operations.remote.ReadRemoteFileOperation; -import com.owncloud.android.lib.operations.remote.ReadRemoteFolderOperation; -import com.owncloud.android.lib.operations.common.RemoteFile; -import com.owncloud.android.lib.utils.FileUtils; + +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.resources.shares.OCShare; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.resources.shares.GetRemoteSharesForFileOperation; +import com.owncloud.android.lib.resources.files.FileUtils; +import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation; +import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation; +import com.owncloud.android.lib.resources.files.RemoteFile; + import com.owncloud.android.syncadapter.FileSyncAdapter; import com.owncloud.android.utils.FileStorageUtils; import com.owncloud.android.utils.Log_OC; @@ -487,7 +489,7 @@ public class SynchronizeFolderOperation extends RemoteOperation { RemoteOperationResult result = null; // remote request - GetSharesForFileRemoteOperation operation = new GetSharesForFileRemoteOperation(mLocalFolder.getRemotePath(), false, true); + GetRemoteSharesForFileOperation operation = new GetRemoteSharesForFileOperation(mLocalFolder.getRemotePath(), false, true); result = operation.execute(client); if (result.isSuccess()) { diff --git a/src/com/owncloud/android/operations/UnshareLinkOperation.java b/src/com/owncloud/android/operations/UnshareLinkOperation.java index 2471e53c..77ca8227 100644 --- a/src/com/owncloud/android/operations/UnshareLinkOperation.java +++ b/src/com/owncloud/android/operations/UnshareLinkOperation.java @@ -20,13 +20,15 @@ package com.owncloud.android.operations; import android.content.Context; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.OCShare; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.ShareType; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; -import com.owncloud.android.lib.operations.remote.ExistenceCheckRemoteOperation; -import com.owncloud.android.lib.operations.remote.RemoveRemoteShareOperation; + +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation; +import com.owncloud.android.lib.resources.shares.OCShare; +import com.owncloud.android.lib.resources.shares.RemoveRemoteShareOperation; +import com.owncloud.android.lib.resources.shares.ShareType; + import com.owncloud.android.operations.common.SyncOperation; import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java index 7fb123af..c878ede4 100644 --- a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java +++ b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java @@ -23,12 +23,12 @@ import org.json.JSONException; import org.json.JSONObject; import com.owncloud.android.authentication.AccountUtils; -import com.owncloud.android.lib.accounts.OwnCloudAccount; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; -import com.owncloud.android.lib.utils.OwnCloudVersion; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.accounts.AccountUtils.Constants; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.resources.status.OwnCloudVersion; import com.owncloud.android.utils.Log_OC; import android.accounts.Account; @@ -60,7 +60,7 @@ public class UpdateOCVersionOperation extends RemoteOperation { @Override protected RemoteOperationResult run(OwnCloudClient client) { AccountManager accountMngr = AccountManager.get(mContext); - String statUrl = accountMngr.getUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_BASE_URL); + String statUrl = accountMngr.getUserData(mAccount, Constants.KEY_OC_BASE_URL); statUrl += AccountUtils.STATUS_PATH; RemoteOperationResult result = null; GetMethod get = null; @@ -76,13 +76,15 @@ public class UpdateOCVersionOperation extends RemoteOperation { if (response != null) { JSONObject json = new JSONObject(response); if (json != null && json.getString("version") != null) { + String version = json.getString("version"); String versionstring = json.getString("versionstring"); mOwnCloudVersion = new OwnCloudVersion(version, versionstring); if (mOwnCloudVersion.isVersionValid()) { - accountMngr.setUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_VERSION, mOwnCloudVersion.getVersion()); - accountMngr.setUserData(mAccount, OwnCloudAccount.Constants.KEY_OC_VERSION_STRING, mOwnCloudVersion.getVersionString()); + accountMngr.setUserData(mAccount, Constants.KEY_OC_VERSION, mOwnCloudVersion.getVersion()); + accountMngr.setUserData(mAccount, Constants.KEY_OC_VERSION_STRING, mOwnCloudVersion.getVersionString()); Log_OC.d(TAG, "Got new OC version " + mOwnCloudVersion.toString()); + result = new RemoteOperationResult(ResultCode.OK); } else { diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java index faa8154b..85e84b76 100644 --- a/src/com/owncloud/android/operations/UploadFileOperation.java +++ b/src/com/owncloud/android/operations/UploadFileOperation.java @@ -33,16 +33,16 @@ import org.apache.commons.httpclient.methods.RequestEntity; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileUploader; -import com.owncloud.android.lib.network.ProgressiveDataTransferer; -import com.owncloud.android.lib.network.OnDatatransferProgressListener; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.OperationCancelledException; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; -import com.owncloud.android.lib.operations.remote.ChunkedUploadRemoteFileOperation; -import com.owncloud.android.lib.operations.remote.ExistenceCheckRemoteOperation; -import com.owncloud.android.lib.operations.remote.UploadRemoteFileOperation; +import com.owncloud.android.lib.common.network.ProgressiveDataTransferer; +import com.owncloud.android.lib.common.network.OnDatatransferProgressListener; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.operations.OperationCancelledException; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.resources.files.ChunkedUploadRemoteFileOperation; +import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation; +import com.owncloud.android.lib.resources.files.UploadRemoteFileOperation; import com.owncloud.android.utils.FileStorageUtils; import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/operations/common/SyncOperation.java b/src/com/owncloud/android/operations/common/SyncOperation.java index 7a8e356a..e16530d8 100644 --- a/src/com/owncloud/android/operations/common/SyncOperation.java +++ b/src/com/owncloud/android/operations/common/SyncOperation.java @@ -18,10 +18,10 @@ package com.owncloud.android.operations.common; import com.owncloud.android.datamodel.FileDataStorageManager; -import com.owncloud.android.lib.network.OwnCloudClient; -import com.owncloud.android.lib.operations.common.OnRemoteOperationListener; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; import android.app.Activity; import android.content.Context; diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java index 36c03538..2c7b520d 100644 --- a/src/com/owncloud/android/providers/FileContentProvider.java +++ b/src/com/owncloud/android/providers/FileContentProvider.java @@ -25,7 +25,7 @@ import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.db.ProviderMeta; import com.owncloud.android.db.ProviderMeta.ProviderTableMeta; -import com.owncloud.android.lib.operations.common.ShareType; +import com.owncloud.android.lib.resources.shares.ShareType; import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java index 200d7a3b..80caea71 100644 --- a/src/com/owncloud/android/services/OperationsService.java +++ b/src/com/owncloud/android/services/OperationsService.java @@ -24,16 +24,15 @@ import java.util.Map; import java.util.concurrent.ConcurrentLinkedQueue; import com.owncloud.android.datamodel.FileDataStorageManager; - -import com.owncloud.android.lib.network.OwnCloudClientFactory; -import com.owncloud.android.lib.network.OwnCloudClient; +import com.owncloud.android.lib.common.OwnCloudClientFactory; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.resources.shares.ShareType; +import com.owncloud.android.operations.common.SyncOperation; import com.owncloud.android.operations.CreateShareOperation; import com.owncloud.android.operations.UnshareLinkOperation; -import com.owncloud.android.operations.common.SyncOperation; -import com.owncloud.android.lib.operations.common.OnRemoteOperationListener; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.ShareType; import com.owncloud.android.utils.Log_OC; import android.accounts.Account; diff --git a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java index 6dcf531c..a9defc0b 100644 --- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java @@ -25,10 +25,10 @@ import org.apache.http.HttpResponse; import org.apache.http.client.ClientProtocolException; import com.owncloud.android.datamodel.FileDataStorageManager; -import com.owncloud.android.lib.accounts.AccountUtils; -import com.owncloud.android.lib.accounts.AccountUtils.AccountNotFoundException; -import com.owncloud.android.lib.network.OwnCloudClientFactory; -import com.owncloud.android.lib.network.OwnCloudClient; +import com.owncloud.android.lib.common.accounts.AccountUtils; +import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException; +import com.owncloud.android.lib.common.OwnCloudClientFactory; +import com.owncloud.android.lib.common.OwnCloudClient; import android.accounts.Account; diff --git a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java index f80824fe..3ba1676a 100644 --- a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java @@ -25,7 +25,7 @@ import org.apache.http.client.methods.HttpPut; import org.apache.http.entity.ByteArrayEntity; import com.owncloud.android.authentication.AccountUtils; -import com.owncloud.android.lib.accounts.OwnCloudAccount; +import com.owncloud.android.lib.common.accounts.AccountUtils.Constants; import android.accounts.Account; @@ -92,7 +92,7 @@ public class ContactSyncAdapter extends AbstractOwnCloudSyncAdapter { AccountManager am = getAccountManager(); @SuppressWarnings("deprecation") String uri = am.getUserData(getAccount(), - OwnCloudAccount.Constants.KEY_OC_URL).replace( + Constants.KEY_OC_URL).replace( AccountUtils.WEBDAV_PATH_2_0, AccountUtils.CARDDAV_PATH_2_0); uri += "/addressbooks/" + getAccount().name.substring(0, diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java index 87177c43..349f1370 100644 --- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java +++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java @@ -30,11 +30,11 @@ 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.accounts.OwnCloudAccount; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; +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; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity; import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java index 9f8bcfdd..e1c7b47a 100644 --- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java +++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java @@ -48,7 +48,7 @@ import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; import com.owncloud.android.authentication.AuthenticatorActivity; import com.owncloud.android.authentication.AccountUtils; -import com.owncloud.android.lib.accounts.OwnCloudAccount; +import com.owncloud.android.lib.common.accounts.AccountUtils.Constants; import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.Log_OC; import com.owncloud.android.MainApp; @@ -212,7 +212,7 @@ public class AccountSelectActivity extends SherlockListActivity implements h.put("VER", "ownCloud version: " + am.getUserData(a, - OwnCloudAccount.Constants.KEY_OC_VERSION)); + Constants.KEY_OC_VERSION)); ll.add(h); } diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java index dc3ad0db..42b90aec 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -42,10 +42,10 @@ import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.FileOperationsHelper; -import com.owncloud.android.lib.operations.common.OnRemoteOperationListener; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.operations.CreateShareOperation; import com.owncloud.android.operations.UnshareLinkOperation; diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index e6963522..d5429dac 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -67,9 +67,9 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; import com.owncloud.android.operations.CreateFolderOperation; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.operations.CreateShareOperation; import com.owncloud.android.operations.RemoveFileOperation; import com.owncloud.android.operations.RenameFileOperation; diff --git a/src/com/owncloud/android/ui/dialog/EditNameDialog.java b/src/com/owncloud/android/ui/dialog/EditNameDialog.java index 14a74c59..0ab7e4da 100644 --- a/src/com/owncloud/android/ui/dialog/EditNameDialog.java +++ b/src/com/owncloud/android/ui/dialog/EditNameDialog.java @@ -31,7 +31,7 @@ import android.widget.Toast; import com.actionbarsherlock.app.SherlockDialogFragment; import com.owncloud.android.R; -import com.owncloud.android.lib.utils.FileUtils; +import com.owncloud.android.lib.resources.files.FileUtils; /** diff --git a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java index a90a7adb..17526062 100644 --- a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java +++ b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java @@ -38,7 +38,7 @@ import com.actionbarsherlock.app.SherlockDialogFragment; import com.owncloud.android.R; import com.owncloud.android.authentication.SsoWebViewClient; import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener; -import com.owncloud.android.lib.network.OwnCloudClient; +import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.utils.Log_OC; diff --git a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java index dd4046b5..920e696b 100644 --- a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java +++ b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java @@ -39,9 +39,9 @@ import android.view.Window; import android.widget.Button; import android.widget.TextView; -import com.owncloud.android.lib.network.CertificateCombinedException; -import com.owncloud.android.lib.network.NetworkUtils; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; +import com.owncloud.android.lib.common.network.CertificateCombinedException; +import com.owncloud.android.lib.common.network.NetworkUtils; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.utils.Log_OC; /** diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java index fb5b6a92..af29cffb 100644 --- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -50,11 +50,11 @@ import com.owncloud.android.files.services.FileObserverService; import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; -import com.owncloud.android.lib.network.OnDatatransferProgressListener; -import com.owncloud.android.lib.operations.common.OnRemoteOperationListener; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.common.network.OnDatatransferProgressListener; +import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.operations.RemoveFileOperation; import com.owncloud.android.operations.RenameFileOperation; import com.owncloud.android.operations.SynchronizeFileOperation; diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java index 66530645..87fd6869 100644 --- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -27,8 +27,8 @@ import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; -import com.owncloud.android.lib.operations.common.OnRemoteOperationListener; -import com.owncloud.android.lib.operations.common.RemoteOperation; +import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; +import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.operations.RemoveFileOperation; import com.owncloud.android.operations.RenameFileOperation; import com.owncloud.android.operations.SynchronizeFileOperation; @@ -42,9 +42,10 @@ import com.owncloud.android.ui.preview.PreviewImageFragment; import com.owncloud.android.ui.preview.PreviewMediaFragment; 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; @@ -221,6 +222,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName toHide.add(R.id.action_cancel_upload); toHide.add(R.id.action_sync_file); toHide.add(R.id.action_see_details); + toHide.add(R.id.action_share_file); if ( mContainerActivity.getFileDownloaderBinder().isDownloading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile) || mContainerActivity.getFileUploaderBinder().isUploading(AccountUtils.getCurrentOwnCloudAccount(getActivity()), targetFile) ) { toDisable.add(R.id.action_rename_file); @@ -359,6 +361,14 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName ((FileFragment.ContainerActivity)getActivity()).showDetails(mTargetFile); 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")); + return true; + } default: return super.onContextItemSelected(item); } diff --git a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java index 8ca2be33..c8fd2d29 100644 --- a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java +++ b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java @@ -37,7 +37,7 @@ import android.widget.ImageButton; import android.widget.ProgressBar; import android.widget.TextView; -import com.owncloud.android.lib.network.OnDatatransferProgressListener; +import com.owncloud.android.lib.common.network.OnDatatransferProgressListener; /** diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java index 548a27b3..ece3991c 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java @@ -45,10 +45,10 @@ import com.owncloud.android.files.services.FileDownloader; import com.owncloud.android.files.services.FileUploader; import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; import com.owncloud.android.files.services.FileUploader.FileUploaderBinder; -import com.owncloud.android.lib.operations.common.OnRemoteOperationListener; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; -import com.owncloud.android.lib.operations.common.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.operations.CreateShareOperation; import com.owncloud.android.operations.UnshareLinkOperation; import com.owncloud.android.ui.activity.FileActivity; diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java index 4785a134..1582b6af 100644 --- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -52,10 +52,10 @@ import com.actionbarsherlock.view.MenuItem; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.lib.network.webdav.WebdavUtils; -import com.owncloud.android.lib.operations.common.OnRemoteOperationListener; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; +import com.owncloud.android.lib.common.network.WebdavUtils; +import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.operations.RemoveFileOperation; import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.fragment.ConfirmationDialogFragment; @@ -310,11 +310,23 @@ public class PreviewImageFragment extends FileFragment implements OnRemoteOper seeDetails(); return true; } + case R.id.action_send_file: { + shareFile(); + return true; + } default: return false; } } + + 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")); + } diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java index 4c52280e..83f937a3 100644 --- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -57,10 +57,10 @@ import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.media.MediaControlView; import com.owncloud.android.media.MediaService; import com.owncloud.android.media.MediaServiceBinder; -import com.owncloud.android.lib.network.webdav.WebdavUtils; -import com.owncloud.android.lib.operations.common.OnRemoteOperationListener; -import com.owncloud.android.lib.operations.common.RemoteOperation; -import com.owncloud.android.lib.operations.common.RemoteOperationResult; +import com.owncloud.android.lib.common.network.WebdavUtils; +import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; +import com.owncloud.android.lib.common.operations.RemoteOperation; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.operations.RemoveFileOperation; import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.activity.FileDisplayActivity; diff --git a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java index 5e5999b4..ba2c1eb7 100644 --- a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java @@ -36,8 +36,8 @@ import android.os.Bundle; import android.widget.MediaController; import android.widget.VideoView; -import com.owncloud.android.lib.accounts.AccountUtils; -import com.owncloud.android.lib.accounts.AccountUtils.AccountNotFoundException; +import com.owncloud.android.lib.common.accounts.AccountUtils; +import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException; /** * Activity implementing a basic video player. diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java index 639caef7..e8e8f48b 100644 --- a/src/com/owncloud/android/utils/FileStorageUtils.java +++ b/src/com/owncloud/android/utils/FileStorageUtils.java @@ -22,7 +22,7 @@ import java.io.File; import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.lib.operations.common.RemoteFile; +import com.owncloud.android.lib.resources.files.RemoteFile; import android.annotation.SuppressLint; import android.content.Context; diff --git a/tests/src/com/owncloud/android/test/AccountUtilsTest.java b/tests/src/com/owncloud/android/test/AccountUtilsTest.java index 150034bd..ae13bbff 100644 --- a/tests/src/com/owncloud/android/test/AccountUtilsTest.java +++ b/tests/src/com/owncloud/android/test/AccountUtilsTest.java @@ -19,7 +19,7 @@ package com.owncloud.android.test; import com.owncloud.android.lib.accounts.AccountUtils; -import com.owncloud.android.lib.utils.OwnCloudVersion; +import com.owncloud.android.lib.resources.status.OwnCloudVersion; import android.test.AndroidTestCase;