From c4331a10fa23ebb3cb429304ff85716cb7e33125 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Fri, 12 May 2017 08:47:01 +0200 Subject: [PATCH 01/41] re-use second fragment if available --- .../ui/activity/FileDisplayActivity.java | 22 +++++++++---------- .../ui/preview/PreviewMediaFragment.java | 21 +++++------------- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java index 8f2b796ccc..8a1100c9f3 100644 --- a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -83,12 +83,12 @@ import com.owncloud.android.services.observer.FileObserverService; import com.owncloud.android.syncadapter.FileSyncAdapter; import com.owncloud.android.ui.dialog.SortingOrderDialogFragment; import com.owncloud.android.ui.events.TokenPushEvent; -import com.owncloud.android.ui.fragment.contactsbackup.ContactListFragment; import com.owncloud.android.ui.fragment.ExtendedListFragment; import com.owncloud.android.ui.fragment.FileDetailFragment; import com.owncloud.android.ui.fragment.FileFragment; import com.owncloud.android.ui.fragment.OCFileListFragment; import com.owncloud.android.ui.fragment.TaskRetainerFragment; +import com.owncloud.android.ui.fragment.contactsbackup.ContactListFragment; import com.owncloud.android.ui.helpers.UriUploader; import com.owncloud.android.ui.preview.PreviewImageActivity; import com.owncloud.android.ui.preview.PreviewImageFragment; @@ -428,7 +428,12 @@ public class FileDisplayActivity extends HookActivity /// Second fragment OCFile file = getFile(); - Fragment secondFragment = chooseInitialSecondFragment(file); + + Fragment secondFragment = getSecondFragment(); + if (secondFragment == null) { + secondFragment = chooseInitialSecondFragment(file); + } + if (secondFragment != null) { setSecondFragment(secondFragment); updateFragmentsVisibility(true); @@ -467,13 +472,9 @@ public class FileDisplayActivity extends HookActivity Fragment secondFragment = null; if (file != null && !file.isFolder()) { if (file.isDown() && PreviewMediaFragment.canBePreviewed(file)) { - int startPlaybackPosition = - getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0); - boolean autoplay = - getIntent().getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true); - secondFragment = new PreviewMediaFragment(file, getAccount(), - startPlaybackPosition, autoplay); - + int startPlaybackPosition = getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0); + boolean autoplay = getIntent().getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true); + secondFragment = new PreviewMediaFragment(file, getAccount(), startPlaybackPosition, autoplay); } else if (file.isDown() && PreviewTextFragment.canBePreviewed(file)) { secondFragment = null; } else { @@ -547,8 +548,7 @@ public class FileDisplayActivity extends HookActivity } public FileFragment getSecondFragment() { - Fragment second = getSupportFragmentManager().findFragmentByTag( - FileDisplayActivity.TAG_SECOND_FRAGMENT); + Fragment second = getSupportFragmentManager().findFragmentByTag(FileDisplayActivity.TAG_SECOND_FRAGMENT); if (second != null) { return (FileFragment) second; } diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java index 7022a34c66..2a6f9d5f03 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -234,14 +234,11 @@ public class PreviewMediaFragment extends FileFragment implements if (!file.isDown()) { throw new IllegalStateException("There is no local file to preview"); } - - } - else { - file = (OCFile) savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_FILE); + } else { + file = savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_FILE); setFile(file); mAccount = savedInstanceState.getParcelable(PreviewMediaFragment.EXTRA_ACCOUNT); - mSavedPlaybackPosition = - savedInstanceState.getInt(PreviewMediaFragment.EXTRA_PLAY_POSITION); + mSavedPlaybackPosition = savedInstanceState.getInt(PreviewMediaFragment.EXTRA_PLAY_POSITION); mAutoplay = savedInstanceState.getBoolean(PreviewMediaFragment.EXTRA_PLAYING); } @@ -251,15 +248,12 @@ public class PreviewMediaFragment extends FileFragment implements mVideoPreview.setVisibility(View.VISIBLE); mImagePreview.setVisibility(View.GONE); prepareVideo(); - - } - else { + } else { mVideoPreview.setVisibility(View.GONE); mImagePreview.setVisibility(View.VISIBLE); extractAndSetCoverArt(file); } } - } /** @@ -307,11 +301,8 @@ public class PreviewMediaFragment extends FileFragment implements } else { if (mMediaServiceBinder != null) { - outState.putInt( - PreviewMediaFragment.EXTRA_PLAY_POSITION, - mMediaServiceBinder.getCurrentPosition()); - outState.putBoolean( - PreviewMediaFragment.EXTRA_PLAYING, mMediaServiceBinder.isPlaying()); + outState.putInt(PreviewMediaFragment.EXTRA_PLAY_POSITION, mMediaServiceBinder.getCurrentPosition()); + outState.putBoolean(PreviewMediaFragment.EXTRA_PLAYING, mMediaServiceBinder.isPlaying()); } } } From 3351cd4541664d13bbdd479bcc4b54d028c4251c Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Mon, 15 May 2017 07:38:19 +0200 Subject: [PATCH 02/41] add string.empty --- src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 7225f12cf8..7d771ae758 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -664,5 +664,7 @@ Logout Privacy + + From c6c1713ec23170c145935e28bd6df6738564f4d4 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Mon, 15 May 2017 07:39:00 +0200 Subject: [PATCH 03/41] beautify it --- src/main/res/values/strings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 7d771ae758..00f4ba57bb 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -664,7 +664,6 @@ Logout Privacy - - + From 4e80906cd9b3dace7b91d4a0b376c512b4e20fa3 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Mon, 15 May 2017 07:40:14 +0200 Subject: [PATCH 04/41] fix typo --- src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 00f4ba57bb..c4933ce94a 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -419,7 +419,7 @@ ERROR: Failed during migration ERROR: Failed to updating index - Data folder exists already. Choose one of the folowing: + Data folder exists already. Choose one of the following: Replace Use From 6f3c3b557905e545a7ccb72829509ddc28010364 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Mon, 15 May 2017 10:27:43 +0200 Subject: [PATCH 05/41] remove all "string empty" --- build.gradle | 4 ++-- src/main/res/values-af-rZA/strings.xml | 1 - src/main/res/values-ak/strings.xml | 1 - src/main/res/values-am-rET/strings.xml | 1 - src/main/res/values-ar/strings.xml | 1 - src/main/res/values-az/strings.xml | 1 - src/main/res/values-bal/strings.xml | 1 - src/main/res/values-be/strings.xml | 1 - src/main/res/values-bn-rBD/strings.xml | 1 - src/main/res/values-bn-rIN/strings.xml | 1 - src/main/res/values-br/strings.xml | 1 - src/main/res/values-bs/strings.xml | 1 - src/main/res/values-cy-rGB/strings.xml | 1 - src/main/res/values-de-rAT/strings.xml | 1 - src/main/res/values-en-rNZ/strings.xml | 1 - src/main/res/values-en-rUS/strings.xml | 1 - src/main/res/values-eo/strings.xml | 1 - src/main/res/values-es-rAR/strings.xml | 1 - src/main/res/values-es-rBO/strings.xml | 1 - src/main/res/values-es-rCL/strings.xml | 1 - src/main/res/values-es-rCO/strings.xml | 1 - src/main/res/values-es-rCR/strings.xml | 1 - src/main/res/values-es-rEC/strings.xml | 1 - src/main/res/values-es-rES/strings.xml | 1 - src/main/res/values-es-rPE/strings.xml | 1 - src/main/res/values-es-rPY/strings.xml | 1 - src/main/res/values-es-rUS/strings.xml | 1 - src/main/res/values-es-rUY/strings.xml | 1 - src/main/res/values-et-rEE/strings.xml | 1 - src/main/res/values-fa/strings.xml | 1 - src/main/res/values-fr-rCA/strings.xml | 1 - src/main/res/values-fy-rNL/strings.xml | 1 - src/main/res/values-gl/strings.xml | 1 - src/main/res/values-gu/strings.xml | 1 - src/main/res/values-hi-rIN/strings.xml | 1 - src/main/res/values-hi/strings.xml | 1 - src/main/res/values-hr/strings.xml | 1 - src/main/res/values-hy/strings.xml | 1 - src/main/res/values-ia/strings.xml | 1 - src/main/res/values-io/strings.xml | 1 - src/main/res/values-jv/strings.xml | 1 - src/main/res/values-ka-rGE/strings.xml | 1 - src/main/res/values-km/strings.xml | 1 - src/main/res/values-kn/strings.xml | 1 - src/main/res/values-ku-rIQ/strings.xml | 1 - src/main/res/values-la/strings.xml | 1 - src/main/res/values-lb/strings.xml | 1 - src/main/res/values-lo/strings.xml | 1 - src/main/res/values-lt-rLT/strings.xml | 1 - src/main/res/values-mg/strings.xml | 1 - src/main/res/values-mk/strings.xml | 1 - src/main/res/values-ml-rIN/strings.xml | 1 - src/main/res/values-ml/strings.xml | 1 - src/main/res/values-mn/strings.xml | 1 - src/main/res/values-mr/strings.xml | 1 - src/main/res/values-ms-rMY/strings.xml | 1 - src/main/res/values-mt-rMT/strings.xml | 1 - src/main/res/values-my/strings.xml | 1 - src/main/res/values-ne/strings.xml | 1 - src/main/res/values-nn-rNO/strings.xml | 1 - src/main/res/values-oc/strings.xml | 1 - src/main/res/values-or-rIN/strings.xml | 1 - src/main/res/values-pa/strings.xml | 1 - src/main/res/values-rm/strings.xml | 1 - src/main/res/values-si-rLK/strings.xml | 1 - src/main/res/values-sk/strings.xml | 1 - src/main/res/values-sr-rSP/strings.xml | 1 - src/main/res/values-sr/strings.xml | 1 - src/main/res/values-su/strings.xml | 1 - src/main/res/values-sw-rKE/strings.xml | 1 - src/main/res/values-ta-rIN/strings.xml | 1 - src/main/res/values-ta-rLK/strings.xml | 1 - src/main/res/values-te/strings.xml | 1 - src/main/res/values-tg-rTJ/strings.xml | 1 - src/main/res/values-th-rTH/strings.xml | 1 - src/main/res/values-ug/strings.xml | 1 - src/main/res/values-uk/strings.xml | 1 - src/main/res/values-ur-rPK/strings.xml | 1 - src/main/res/values-ur/strings.xml | 1 - src/main/res/values-uz/strings.xml | 1 - src/main/res/values-vi/strings.xml | 1 - src/main/res/values-yo/strings.xml | 1 - src/main/res/values-zh-rHK/strings.xml | 1 - 83 files changed, 2 insertions(+), 84 deletions(-) diff --git a/build.gradle b/build.gradle index 728cf968d0..11a843779b 100644 --- a/build.gradle +++ b/build.gradle @@ -195,7 +195,7 @@ dependencies { compile 'com.googlecode.ez-vcard:ez-vcard:0.10.2' // uncomment for gplay, modified - //compile 'com.google.android.gms:play-services:10.2.4' + compile 'com.google.android.gms:play-services:10.2.4' compile 'org.parceler:parceler-api:1.1.6' annotationProcessor 'org.parceler:parceler:1.1.6' @@ -239,4 +239,4 @@ tasks.withType(Test) { } // uncomment for gplay, modified (must be at the bottom) -//apply plugin: 'com.google.gms.google-services' \ No newline at end of file +apply plugin: 'com.google.gms.google-services' \ No newline at end of file diff --git a/src/main/res/values-af-rZA/strings.xml b/src/main/res/values-af-rZA/strings.xml index 07457cb1cb..c3eb90990b 100644 --- a/src/main/res/values-af-rZA/strings.xml +++ b/src/main/res/values-af-rZA/strings.xml @@ -18,7 +18,6 @@ Kanseleer Fout Stuur - Kies Stel verval datum Beskerm met Wagwoord diff --git a/src/main/res/values-ak/strings.xml b/src/main/res/values-ak/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-ak/strings.xml +++ b/src/main/res/values-ak/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-am-rET/strings.xml b/src/main/res/values-am-rET/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-am-rET/strings.xml +++ b/src/main/res/values-am-rET/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index 451198d6f0..848f998dae 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -264,7 +264,6 @@ حدث خطأ أثناء إنتظار الخادم، لم يكن من الممكن القيام بالعملية حدث خطأ أثناء إنتظار الخادم، لم يكن من الممكن القيام بالعملية تعذر إكمال العملية، الخادم غير متوفر - حسابات سجل كلمة مرور خاطئة diff --git a/src/main/res/values-az/strings.xml b/src/main/res/values-az/strings.xml index d894f71fd2..987e9dc5dd 100644 --- a/src/main/res/values-az/strings.xml +++ b/src/main/res/values-az/strings.xml @@ -226,7 +226,6 @@ inzibatçınızla əlaqə saxlayasınız. Serveri gözlədiyimiz müddətdə səhv baş verdi, əməliyyat bitə bilməz Serveri gözlədiyimiz müddətdə səhv baş verdi, əməliyyat bitə bilməz Əməliyyat bitə bilməz, serverə çatmaq mümkün deyil - Sizin yetkiniz yoxdur %s faylın adını dəyişmək bu faylı silmək üçün diff --git a/src/main/res/values-bal/strings.xml b/src/main/res/values-bal/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-bal/strings.xml +++ b/src/main/res/values-bal/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-be/strings.xml b/src/main/res/values-be/strings.xml index a3e277cf6e..a91336b08e 100644 --- a/src/main/res/values-be/strings.xml +++ b/src/main/res/values-be/strings.xml @@ -12,6 +12,5 @@ Не Добра Памылка - Выбар diff --git a/src/main/res/values-bn-rBD/strings.xml b/src/main/res/values-bn-rBD/strings.xml index 43e2e4b3f8..518f311697 100644 --- a/src/main/res/values-bn-rBD/strings.xml +++ b/src/main/res/values-bn-rBD/strings.xml @@ -205,7 +205,6 @@ সার্ভারের জন্য অপেক্ষা করার সময় একটি ভ্রান্তি ঘটলো, কাজটি করা যেতনা সার্ভারের জন্য অপেক্ষা করার সময় একটি ভ্রান্তি ঘটলো, কাজটি করা যেতনা কাজটি সম্পন্ন করা গেলনা, সার্ভার সংযোগ পাওয়া যাচ্ছেনা - আপনার %s অনুমতি নেই ফাইলটি পূনঃনামকরণ করতে ফাইলটি মুছে ফেলতে diff --git a/src/main/res/values-bn-rIN/strings.xml b/src/main/res/values-bn-rIN/strings.xml index a009ed8d06..097d22d5a1 100644 --- a/src/main/res/values-bn-rIN/strings.xml +++ b/src/main/res/values-bn-rIN/strings.xml @@ -21,6 +21,5 @@ ফোল্ডারের নাম পুনঃনামকরণ সরান - অনুসন্ধান diff --git a/src/main/res/values-br/strings.xml b/src/main/res/values-br/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-br/strings.xml +++ b/src/main/res/values-br/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-bs/strings.xml b/src/main/res/values-bs/strings.xml index 61fb77a82c..9a4c43b435 100644 --- a/src/main/res/values-bs/strings.xml +++ b/src/main/res/values-bs/strings.xml @@ -33,7 +33,6 @@ Nepoznata greška Preimenuj Pošalji - Potrebna autentifikacija Pogrešna lozinka Izaberite diff --git a/src/main/res/values-cy-rGB/strings.xml b/src/main/res/values-cy-rGB/strings.xml index 50591bdcb5..89ac3cc1d2 100644 --- a/src/main/res/values-cy-rGB/strings.xml +++ b/src/main/res/values-cy-rGB/strings.xml @@ -113,7 +113,6 @@ /LlwythoSyth Cadw\'r ddau Anfon - Cyfrifon Dewisiwch Manylion diff --git a/src/main/res/values-de-rAT/strings.xml b/src/main/res/values-de-rAT/strings.xml index 9d50da6413..a24ff3d3da 100644 --- a/src/main/res/values-de-rAT/strings.xml +++ b/src/main/res/values-de-rAT/strings.xml @@ -90,7 +90,6 @@ Umbenennen Details Senden - Konten Auswählen Details diff --git a/src/main/res/values-en-rNZ/strings.xml b/src/main/res/values-en-rNZ/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-en-rNZ/strings.xml +++ b/src/main/res/values-en-rNZ/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-en-rUS/strings.xml b/src/main/res/values-en-rUS/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-en-rUS/strings.xml +++ b/src/main/res/values-en-rUS/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-eo/strings.xml b/src/main/res/values-eo/strings.xml index 060329fc74..4c808bd1ab 100644 --- a/src/main/res/values-eo/strings.xml +++ b/src/main/res/values-eo/strings.xml @@ -207,7 +207,6 @@ Kopii ligilon Kopiita en la tondejon Eraro okazis dum konekto al la servilo. - Vi ne permesatas %s por alinomigi ĉi tiun dosieron por forigi ĉi tiun dosieron diff --git a/src/main/res/values-es-rAR/strings.xml b/src/main/res/values-es-rAR/strings.xml index c4d5736352..5d90cb63f9 100644 --- a/src/main/res/values-es-rAR/strings.xml +++ b/src/main/res/values-es-rAR/strings.xml @@ -220,7 +220,6 @@ Un error ocurrió mientras se conectaba con el Servidor. La operación no se realizó Un error ocurrió esperando al Servidor, la operación no se realizó Operación no completada, Servidor no disponible. - Tu no tienes permiso %s para renombrar este archivo para borrar este archivo diff --git a/src/main/res/values-es-rBO/strings.xml b/src/main/res/values-es-rBO/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-es-rBO/strings.xml +++ b/src/main/res/values-es-rBO/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-es-rCL/strings.xml b/src/main/res/values-es-rCL/strings.xml index 52a2380b03..5351af1dc7 100644 --- a/src/main/res/values-es-rCL/strings.xml +++ b/src/main/res/values-es-rCL/strings.xml @@ -134,7 +134,6 @@ algoritmo Mantener ambos %1$s no pudo ser copiado a la carpeta local %2$s - Cuentas Choose detalles diff --git a/src/main/res/values-es-rCO/strings.xml b/src/main/res/values-es-rCO/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-es-rCO/strings.xml +++ b/src/main/res/values-es-rCO/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-es-rCR/strings.xml b/src/main/res/values-es-rCR/strings.xml index 123109707f..a49546500f 100644 --- a/src/main/res/values-es-rCR/strings.xml +++ b/src/main/res/values-es-rCR/strings.xml @@ -8,5 +8,4 @@ Archivos - diff --git a/src/main/res/values-es-rEC/strings.xml b/src/main/res/values-es-rEC/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-es-rEC/strings.xml +++ b/src/main/res/values-es-rEC/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-es-rES/strings.xml b/src/main/res/values-es-rES/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-es-rES/strings.xml +++ b/src/main/res/values-es-rES/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-es-rPE/strings.xml b/src/main/res/values-es-rPE/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-es-rPE/strings.xml +++ b/src/main/res/values-es-rPE/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-es-rPY/strings.xml b/src/main/res/values-es-rPY/strings.xml index 123109707f..a49546500f 100644 --- a/src/main/res/values-es-rPY/strings.xml +++ b/src/main/res/values-es-rPY/strings.xml @@ -8,5 +8,4 @@ Archivos - diff --git a/src/main/res/values-es-rUS/strings.xml b/src/main/res/values-es-rUS/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-es-rUS/strings.xml +++ b/src/main/res/values-es-rUS/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-es-rUY/strings.xml b/src/main/res/values-es-rUY/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-es-rUY/strings.xml +++ b/src/main/res/values-es-rUY/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-et-rEE/strings.xml b/src/main/res/values-et-rEE/strings.xml index 398f6e89ad..9342828b4b 100644 --- a/src/main/res/values-et-rEE/strings.xml +++ b/src/main/res/values-et-rEE/strings.xml @@ -273,7 +273,6 @@ Allpool on loend kohalikest failidest ning serveris asuvatest failidest %5$s, mi Viga: ei suutnud operatsiooni lõpetada Serveriga ühendumisel tekkis tõrge. - Sul ei ole %s õigusi selle faili ümbernimetamiseks diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml index 637746f19e..3de3a0aa2e 100644 --- a/src/main/res/values-fa/strings.xml +++ b/src/main/res/values-fa/strings.xml @@ -227,7 +227,6 @@ کپی کردن لینک کپی به کلیپ بورد تکمیل عملیات امکانپذیر نمی باشد، سرور در دسترس نمی باشد - شما دسترسی %s را ندارید برای تغییر نام این فایل برای حذف این فایل diff --git a/src/main/res/values-fr-rCA/strings.xml b/src/main/res/values-fr-rCA/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-fr-rCA/strings.xml +++ b/src/main/res/values-fr-rCA/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-fy-rNL/strings.xml b/src/main/res/values-fy-rNL/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-fy-rNL/strings.xml +++ b/src/main/res/values-fy-rNL/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index 5e3ad5288a..e709211df7 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -254,7 +254,6 @@ Descárgueo de aquí: %2$s Produciuse un erro mentres agardaba polo servidor, a operación non se puido levar a fin Produciuse un erro mentres agardaba polo servidor, a operación non se puido levar a fin A operación non se completou, o servidor non está dispoñíbel - Non ten permisos %s para renomear este ficheiro para eliminar este ficheiro diff --git a/src/main/res/values-gu/strings.xml b/src/main/res/values-gu/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-gu/strings.xml +++ b/src/main/res/values-gu/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-hi-rIN/strings.xml b/src/main/res/values-hi-rIN/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-hi-rIN/strings.xml +++ b/src/main/res/values-hi-rIN/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-hi/strings.xml b/src/main/res/values-hi/strings.xml index fa5a01cf5c..dc916a52e7 100644 --- a/src/main/res/values-hi/strings.xml +++ b/src/main/res/values-hi/strings.xml @@ -31,7 +31,6 @@ त्रुटि विवरण भेजें - खाते विवरण diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml index 02575b009e..5056264435 100644 --- a/src/main/res/values-hr/strings.xml +++ b/src/main/res/values-hr/strings.xml @@ -59,7 +59,6 @@ Makni Detalji Pošaljite - Korisnićki računi Potrebna autentikacija Pogrešna lozinka diff --git a/src/main/res/values-hy/strings.xml b/src/main/res/values-hy/strings.xml index a1c0eb3f1b..fa28b808cf 100644 --- a/src/main/res/values-hy/strings.xml +++ b/src/main/res/values-hy/strings.xml @@ -71,7 +71,6 @@ 2012/05/18 12:23 PM Ուղարկել Պատճենել հղումը - Հաշիվներ Սխալ գաղտնաբառ Ընտրել diff --git a/src/main/res/values-ia/strings.xml b/src/main/res/values-ia/strings.xml index 9cb34946d1..b298b12d78 100644 --- a/src/main/res/values-ia/strings.xml +++ b/src/main/res/values-ia/strings.xml @@ -41,7 +41,6 @@ Nomine de dossier Error Incognite Invia - Contos Contrasigno errate Seliger diff --git a/src/main/res/values-io/strings.xml b/src/main/res/values-io/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-io/strings.xml +++ b/src/main/res/values-io/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-jv/strings.xml b/src/main/res/values-jv/strings.xml index 02aea080fd..28c53906dd 100644 --- a/src/main/res/values-jv/strings.xml +++ b/src/main/res/values-jv/strings.xml @@ -7,5 +7,4 @@ Njipuk - diff --git a/src/main/res/values-ka-rGE/strings.xml b/src/main/res/values-ka-rGE/strings.xml index 34ee785f82..43b52911f2 100644 --- a/src/main/res/values-ka-rGE/strings.xml +++ b/src/main/res/values-ka-rGE/strings.xml @@ -122,7 +122,6 @@ დატოვე ორივე გაგზავნა კოპირებულია კლიპბორდში - ანგარიში არჩევა დეტალური ინფორმაცია diff --git a/src/main/res/values-km/strings.xml b/src/main/res/values-km/strings.xml index f589185606..bffeaeb5a5 100644 --- a/src/main/res/values-km/strings.xml +++ b/src/main/res/values-km/strings.xml @@ -88,7 +88,6 @@ រហូតដល់ៈ ហត្ថលេខា: ផ្ញើ - គណនី ខុស​ពាក្យ​សម្ងាត់ ជ្រើស diff --git a/src/main/res/values-kn/strings.xml b/src/main/res/values-kn/strings.xml index 58047399a9..09c9cda4b3 100644 --- a/src/main/res/values-kn/strings.xml +++ b/src/main/res/values-kn/strings.xml @@ -32,7 +32,6 @@ ಮರುಹೆಸರಿಸು ತೆಗೆದುಹಾಕಿ ಕಳುಹಿಸಿ - ದೃಢೀಕರಣ ಅಗತ್ಯವಿದೆ ದುರ್ಬಲ ಗುಪ್ತಪದ ಆಯ್ಕೆ diff --git a/src/main/res/values-ku-rIQ/strings.xml b/src/main/res/values-ku-rIQ/strings.xml index 27ee50c468..8c1351031f 100644 --- a/src/main/res/values-ku-rIQ/strings.xml +++ b/src/main/res/values-ku-rIQ/strings.xml @@ -33,7 +33,6 @@ لابردن هه‌ڵه ناوی بوخچه - هەژمارەکان ناونیشانی ڕاژه بگەڕێ diff --git a/src/main/res/values-la/strings.xml b/src/main/res/values-la/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-la/strings.xml +++ b/src/main/res/values-la/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-lb/strings.xml b/src/main/res/values-lb/strings.xml index 3d0b8aa58d..ab05339ddf 100644 --- a/src/main/res/values-lb/strings.xml +++ b/src/main/res/values-lb/strings.xml @@ -242,7 +242,6 @@ Beim Waarden op de Server ass e Feeler opgetrueden, d\'Operatioun konnt net duerchgeféiert ginn Beim Waarden op de Server ass e Feeler opgetrueden, d\'Operatioun konnt net duerchgeféiert ginn D\'Operatioun konnt net ofgeschloss ginn, de Server ass net disponibel - Du hues keng Berechtegung %s fir dëse Fichier ëmzebenennen diff --git a/src/main/res/values-lo/strings.xml b/src/main/res/values-lo/strings.xml index 9866508df4..338c8c2762 100644 --- a/src/main/res/values-lo/strings.xml +++ b/src/main/res/values-lo/strings.xml @@ -8,6 +8,5 @@ On device--> ຂໍ້ຜິດພາດທີ່ບໍ່ຮູ້ສາເຫດ ຂໍ້ຜິດພາດທີ່ບໍ່ຮູ້ສາເຫດ - ການແບ່ງປັນ diff --git a/src/main/res/values-lt-rLT/strings.xml b/src/main/res/values-lt-rLT/strings.xml index f969a4cb91..8a10f973ad 100644 --- a/src/main/res/values-lt-rLT/strings.xml +++ b/src/main/res/values-lt-rLT/strings.xml @@ -256,7 +256,6 @@ Klaida prisijungiant prie serverio, operacija neįvykdyta Klaida prisijungiant prie serverio, operacija neįvykdyta Serveris nepasiekiamas, operacija negali būti atlikta - Neturite leidimo %s pervadinti failo diff --git a/src/main/res/values-mg/strings.xml b/src/main/res/values-mg/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-mg/strings.xml +++ b/src/main/res/values-mg/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-mk/strings.xml b/src/main/res/values-mk/strings.xml index 0d2dd06273..f6338b7955 100644 --- a/src/main/res/values-mk/strings.xml +++ b/src/main/res/values-mk/strings.xml @@ -235,7 +235,6 @@ Се случи грешка при чекање на на серверот, операцијата не можеше да се изврши Се случи грешка при чекање на на серверот, операцијата не можеше да се изврши Операцијата не можеше да заврши, серверот не е достапен - Немате дозвола %s да ја преименувате датотеката да ја избришете оваа датотека diff --git a/src/main/res/values-ml-rIN/strings.xml b/src/main/res/values-ml-rIN/strings.xml index a84b15a09b..196d2ce85a 100644 --- a/src/main/res/values-ml-rIN/strings.xml +++ b/src/main/res/values-ml-rIN/strings.xml @@ -8,5 +8,4 @@ ഫയലുകൾ - diff --git a/src/main/res/values-ml/strings.xml b/src/main/res/values-ml/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-ml/strings.xml +++ b/src/main/res/values-ml/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-mn/strings.xml b/src/main/res/values-mn/strings.xml index 8d80afeee4..1fab82e8ca 100644 --- a/src/main/res/values-mn/strings.xml +++ b/src/main/res/values-mn/strings.xml @@ -18,6 +18,5 @@ Аккаунт үүсгэх Одоогийн Устгах - Түгээлт diff --git a/src/main/res/values-mr/strings.xml b/src/main/res/values-mr/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-mr/strings.xml +++ b/src/main/res/values-mr/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-ms-rMY/strings.xml b/src/main/res/values-ms-rMY/strings.xml index efe192ad1d..6deb85457f 100644 --- a/src/main/res/values-ms-rMY/strings.xml +++ b/src/main/res/values-ms-rMY/strings.xml @@ -58,7 +58,6 @@ Buang Lokal sahaja Hantar - Akaun Alamat pelayan Cari diff --git a/src/main/res/values-mt-rMT/strings.xml b/src/main/res/values-mt-rMT/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-mt-rMT/strings.xml +++ b/src/main/res/values-mt-rMT/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-my/strings.xml b/src/main/res/values-my/strings.xml index 6f3b9bd571..06045df19e 100644 --- a/src/main/res/values-my/strings.xml +++ b/src/main/res/values-my/strings.xml @@ -17,7 +17,6 @@ မဟုတ်ဘူး အိုကေ ပယ်ဖျက်မည် - ရွေးချယ် သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည် ပြင်ဆင်နိုင် diff --git a/src/main/res/values-ne/strings.xml b/src/main/res/values-ne/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-ne/strings.xml +++ b/src/main/res/values-ne/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-nn-rNO/strings.xml b/src/main/res/values-nn-rNO/strings.xml index 23c0672ce1..a7327b6bf0 100644 --- a/src/main/res/values-nn-rNO/strings.xml +++ b/src/main/res/values-nn-rNO/strings.xml @@ -126,7 +126,6 @@ Klarte ikkje å lagra sertifikatet Detaljar Send - Kontoar Loggar Feil passord diff --git a/src/main/res/values-oc/strings.xml b/src/main/res/values-oc/strings.xml index 4f4dea106d..6fc2b583e4 100644 --- a/src/main/res/values-oc/strings.xml +++ b/src/main/res/values-oc/strings.xml @@ -256,7 +256,6 @@ En rason d\'aquesta modificacion, totes los fichièrs mandats amb de versions an Una error s\'es produsida pendent l\'espèra del servidor. L\'operacion a pas pogut èsser efectuada Una error s\'es produsida pendent l\'espèra del servidor. L\'operacion a pas pogut èsser efectuada L\'operacion a pas pogut èsser acabada, lo servidor es pas disponible - Avètz pas la permission %s de renomenar aqueste fichièr d’escafar aqueste fichièr diff --git a/src/main/res/values-or-rIN/strings.xml b/src/main/res/values-or-rIN/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-or-rIN/strings.xml +++ b/src/main/res/values-or-rIN/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-pa/strings.xml b/src/main/res/values-pa/strings.xml index 1affca08de..7583c2ee53 100644 --- a/src/main/res/values-pa/strings.xml +++ b/src/main/res/values-pa/strings.xml @@ -103,7 +103,6 @@ ਦੋਵੇਂ ਰੱਖੋ ਚਿੱਤਰ ਝਲਕ ਭੇਜੋ - ਅਕਾਊਂਟ ਚੁਣੋ ਵੇਰਵ diff --git a/src/main/res/values-rm/strings.xml b/src/main/res/values-rm/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-rm/strings.xml +++ b/src/main/res/values-rm/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-si-rLK/strings.xml b/src/main/res/values-si-rLK/strings.xml index 9c9bd43db5..c5861e8b10 100644 --- a/src/main/res/values-si-rLK/strings.xml +++ b/src/main/res/values-si-rLK/strings.xml @@ -73,7 +73,6 @@ නොසිතු ප්‍රශ්ණයක්; කරුණාකර වෙනත් යෙදුමක් භාවිතා කර ගොනුව තෝරන්න ගොනුවක් තෝරා නැත සඟවන්න - ගිණුම් තෝරන්න සේවාදායකයේ ලිපිනය diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index 63fbabf57c..1eb12a4831 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -4,5 +4,4 @@ Všeobecné Stiahnuť Zrušiť - diff --git a/src/main/res/values-sr-rSP/strings.xml b/src/main/res/values-sr-rSP/strings.xml index 0b90b6adff..3620e5fdf3 100644 --- a/src/main/res/values-sr-rSP/strings.xml +++ b/src/main/res/values-sr-rSP/strings.xml @@ -66,7 +66,6 @@ Zadrži oboje Pošalji Kopirano u klipbord - Nalozi Izaberi Detaljnije diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index 91a9b96a8f..16d0193be9 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -283,7 +283,6 @@ Критична грешка: не могу да радим Дошло је до грешке при повезивању са сервером. - Немате дозволу %s да преименујете овај фајл diff --git a/src/main/res/values-su/strings.xml b/src/main/res/values-su/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-su/strings.xml +++ b/src/main/res/values-su/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-sw-rKE/strings.xml b/src/main/res/values-sw-rKE/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-sw-rKE/strings.xml +++ b/src/main/res/values-sw-rKE/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-ta-rIN/strings.xml b/src/main/res/values-ta-rIN/strings.xml index 0f601d8306..3d361b3a12 100644 --- a/src/main/res/values-ta-rIN/strings.xml +++ b/src/main/res/values-ta-rIN/strings.xml @@ -29,7 +29,6 @@ பதிவேற்று விவரங்கள் அனுப்பவும் - கணக்குகள் விவரங்கள் diff --git a/src/main/res/values-ta-rLK/strings.xml b/src/main/res/values-ta-rLK/strings.xml index 5f6b266d4e..ff4d0534f1 100644 --- a/src/main/res/values-ta-rLK/strings.xml +++ b/src/main/res/values-ta-rLK/strings.xml @@ -108,7 +108,6 @@ நெறிமுறை இது ஒரு placeholder இரண்டையும் வைக்க - கணக்குகள் தெரிவுசெய்க விவரங்கள் diff --git a/src/main/res/values-te/strings.xml b/src/main/res/values-te/strings.xml index 74eaf1c824..3598130dbb 100644 --- a/src/main/res/values-te/strings.xml +++ b/src/main/res/values-te/strings.xml @@ -21,7 +21,6 @@ పొరపాటు సంచయం పేరు పంపించు - సేవకి చిరునామా తొలగించు diff --git a/src/main/res/values-tg-rTJ/strings.xml b/src/main/res/values-tg-rTJ/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-tg-rTJ/strings.xml +++ b/src/main/res/values-tg-rTJ/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-th-rTH/strings.xml b/src/main/res/values-th-rTH/strings.xml index a80ee581f3..36dd3735e4 100644 --- a/src/main/res/values-th-rTH/strings.xml +++ b/src/main/res/values-th-rTH/strings.xml @@ -298,7 +298,6 @@ ข้อผิดพลาด: ไม่สามารถดำเนินการได้ เกิดข้อผิดพลาดขณะกำลังเชื่อมต่อกับเซิร์ฟเวอร์ - คุณไม่ได้รับสิทธิ์ %s เพื่อเปลี่ยนชื่อไฟล์นี้ diff --git a/src/main/res/values-ug/strings.xml b/src/main/res/values-ug/strings.xml index 9d8f200105..3344d33741 100644 --- a/src/main/res/values-ug/strings.xml +++ b/src/main/res/values-ug/strings.xml @@ -45,7 +45,6 @@ ئات ئۆزگەرت چىقىرىۋەت يوللا - ھېساباتلار مۇلازىمېتىر ئادرىسى ھەمبەھىر diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index c81545a145..30d65c58d1 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -272,7 +272,6 @@ Під час очікування на сервер виникла помилка, операцію неможливо завершити Під час очікування на сервер виникла помилка, операцію неможливо завершити Неможливо завершити операцію, сервер недоступний - У вас немає повноважень %s на перейменування цього файла diff --git a/src/main/res/values-ur-rPK/strings.xml b/src/main/res/values-ur-rPK/strings.xml index 977fb30bc6..fe3ac15b0b 100644 --- a/src/main/res/values-ur-rPK/strings.xml +++ b/src/main/res/values-ur-rPK/strings.xml @@ -25,7 +25,6 @@ غیر معروف خرابی غیر معروف خرابی بھجیں - منتخب کریں اشتراک لنک تاریخ معیاد سیٹ کریں diff --git a/src/main/res/values-ur/strings.xml b/src/main/res/values-ur/strings.xml index 63dbc495ac..141427dbe5 100644 --- a/src/main/res/values-ur/strings.xml +++ b/src/main/res/values-ur/strings.xml @@ -1,5 +1,4 @@ خرابی - diff --git a/src/main/res/values-uz/strings.xml b/src/main/res/values-uz/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-uz/strings.xml +++ b/src/main/res/values-uz/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index e456b1f05f..f65e8ffc8c 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -187,7 +187,6 @@ Một lỗi đã xảy ra khi thử chia sẻ file hoặc thư mục này Một lỗi đã xảy ra khi thử gỡ chia sẻ file hoặc thư mục này Gởi - Tài khoản Chọn Chi tiết diff --git a/src/main/res/values-yo/strings.xml b/src/main/res/values-yo/strings.xml index 37e6152416..9d3a402143 100644 --- a/src/main/res/values-yo/strings.xml +++ b/src/main/res/values-yo/strings.xml @@ -6,5 +6,4 @@ - diff --git a/src/main/res/values-zh-rHK/strings.xml b/src/main/res/values-zh-rHK/strings.xml index 888175d952..e8d12f5fba 100644 --- a/src/main/res/values-zh-rHK/strings.xml +++ b/src/main/res/values-zh-rHK/strings.xml @@ -67,7 +67,6 @@ 12:23:45 發送 複製連結 - 帳號 密碼錯誤 伺服器地址 From 8220047f3b6dc3e1272f8c4b77465bd6d1d050f1 Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot <> Date: Mon, 15 May 2017 08:48:56 +0000 Subject: [PATCH 06/41] Drone: update Lint results to reflect reduced error/warning count [skip ci] --- scripts/lint/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lint/lint-results.txt b/scripts/lint/lint-results.txt index 23b9c0c074..653e21853f 100644 --- a/scripts/lint/lint-results.txt +++ b/scripts/lint/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 74 errors and 859 warnings + Lint Report: 73 errors and 849 warnings From 66cbc31bd71af229534e2adb6d32c623309065fa Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Mon, 15 May 2017 10:57:51 +0200 Subject: [PATCH 07/41] comment gms again --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 11a843779b..728cf968d0 100644 --- a/build.gradle +++ b/build.gradle @@ -195,7 +195,7 @@ dependencies { compile 'com.googlecode.ez-vcard:ez-vcard:0.10.2' // uncomment for gplay, modified - compile 'com.google.android.gms:play-services:10.2.4' + //compile 'com.google.android.gms:play-services:10.2.4' compile 'org.parceler:parceler-api:1.1.6' annotationProcessor 'org.parceler:parceler:1.1.6' @@ -239,4 +239,4 @@ tasks.withType(Test) { } // uncomment for gplay, modified (must be at the bottom) -apply plugin: 'com.google.gms.google-services' \ No newline at end of file +//apply plugin: 'com.google.gms.google-services' \ No newline at end of file From 37aac8498c52e0763ab96d9903eae4c6a5699a20 Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Wed, 17 May 2017 16:08:21 +0200 Subject: [PATCH 08/41] prevent NPE use boolean to determinate if resume or if new start --- .../android/ui/fragment/ExtendedListFragment.java | 4 ++-- .../owncloud/android/ui/preview/PreviewMediaFragment.java | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java index 4b04a6d362..44486c95ce 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java @@ -282,8 +282,8 @@ public class ExtendedListFragment extends Fragment } public boolean onQueryTextChange(final String query) { - if (getFragmentManager().findFragmentByTag(FileDisplayActivity.TAG_SECOND_FRAGMENT) - instanceof ExtendedListFragment){ + if (getFragmentManager() != null && getFragmentManager(). + findFragmentByTag(FileDisplayActivity.TAG_SECOND_FRAGMENT) instanceof ExtendedListFragment) { performSearch(query, false); return true; } else { diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java index 70bc38a016..def3c61d33 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -106,6 +106,7 @@ public class PreviewMediaFragment extends FileFragment implements private MediaServiceConnection mMediaServiceConnection = null; private VideoHelper mVideoHelper; private boolean mAutoplay; + private static boolean mOnResume = false; public boolean mPrepared; private static final String TAG = PreviewMediaFragment.class.getSimpleName(); @@ -220,6 +221,7 @@ public class PreviewMediaFragment extends FileFragment implements */ @Override public void onActivityCreated(Bundle savedInstanceState) { + mOnResume = true; super.onActivityCreated(savedInstanceState); Log_OC.v(TAG, "onActivityCreated"); @@ -556,6 +558,8 @@ public class PreviewMediaFragment extends FileFragment implements @Override public void onResume() { super.onResume(); + mOnResume = !mOnResume; + if (getActivity() != null) { AnalyticsUtils.setCurrentScreenName(getActivity(), SCREEN_NAME, TAG); } @@ -629,7 +633,7 @@ public class PreviewMediaFragment extends FileFragment implements private void playAudio() { OCFile file = getFile(); - if (!mMediaServiceBinder.isPlaying(file)) { + if (!mMediaServiceBinder.isPlaying(file) && !mOnResume) { Log_OC.d(TAG, "starting playback of " + file.getStoragePath()); mMediaServiceBinder.start(mAccount, file, mAutoplay, mSavedPlaybackPosition); @@ -640,6 +644,8 @@ public class PreviewMediaFragment extends FileFragment implements mMediaController.updatePausePlay(); } } + + mOnResume = false; } From 44c062e85321f76b177e5fe884e1f66f72c47860 Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot <> Date: Wed, 17 May 2017 14:20:12 +0000 Subject: [PATCH 09/41] Drone: update Lint results to reflect reduced error/warning count [skip ci] --- scripts/lint/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lint/lint-results.txt b/scripts/lint/lint-results.txt index c6190dcce2..e819a37182 100644 --- a/scripts/lint/lint-results.txt +++ b/scripts/lint/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 75 errors and 853 warnings \ No newline at end of file + Lint Report: 75 errors and 852 warnings From 0f6f4ad64223d82e97dcbce4c10c44720b167ebd Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Wed, 17 May 2017 16:40:54 +0200 Subject: [PATCH 10/41] do not send status messages if fragment is destroyed --- .../java/com/owncloud/android/media/MediaControlView.java | 4 ++++ .../com/owncloud/android/ui/preview/PreviewMediaFragment.java | 1 + 2 files changed, 5 insertions(+) diff --git a/src/main/java/com/owncloud/android/media/MediaControlView.java b/src/main/java/com/owncloud/android/media/MediaControlView.java index fe9faf5ab6..4f01c46afb 100644 --- a/src/main/java/com/owncloud/android/media/MediaControlView.java +++ b/src/main/java/com/owncloud/android/media/MediaControlView.java @@ -197,6 +197,10 @@ public class MediaControlView extends FrameLayout /* implements OnLayoutChangeLi updatePausePlay(); } + public void stopMediaPlayerMessages() { + mHandler.removeMessages(SHOW_PROGRESS); + } + private void initControllerView(View v) { mPauseButton = (ImageButton) v.findViewById(R.id.playBtn); diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java index def3c61d33..ed759c97d8 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -580,6 +580,7 @@ public class PreviewMediaFragment extends FileFragment implements if (mMediaServiceConnection != null) { Log_OC.d(TAG, "Unbinding from MediaService ..."); if (mMediaServiceBinder != null && mMediaController != null) { + mMediaController.stopMediaPlayerMessages(); mMediaServiceBinder.unregisterMediaController(mMediaController); } getActivity().unbindService(mMediaServiceConnection); From da497abdb61aab5c0a8365da2a289c074172ea6e Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Thu, 18 May 2017 12:20:55 +0200 Subject: [PATCH 11/41] move/copy drawer icons --- .../ui/activity/FileDisplayActivity.java | 2 +- src/main/res/drawable-hdpi/nav_activity.png | Bin 0 -> 676 bytes .../{ic_folder_open.png => nav_all_files.png} | Bin src/main/res/drawable-hdpi/nav_contacts.png | Bin 0 -> 539 bytes .../{ic_star.png => nav_favorites.png} | Bin ...c_cloud_upload.png => nav_folder_sync.png} | Bin .../{logout.png => nav_logout.png} | Bin .../res/drawable-hdpi/nav_notifications.png | Bin 0 -> 623 bytes ...vailable_offline.png => nav_on_device.png} | Bin ...ic_participate.png => nav_participate.png} | Bin src/main/res/drawable-hdpi/nav_photos.png | Bin 0 -> 2310 bytes .../{ic_recent.png => nav_recently.png} | Bin src/main/res/drawable-hdpi/nav_settings.png | Bin 0 -> 1004 bytes .../{ic_shared.png => nav_shared.png} | Bin .../{ic_uploads.png => nav_uploads.png} | Bin src/main/res/drawable-hdpi/nav_videos.png | Bin 0 -> 1145 bytes src/main/res/drawable-mdpi/nav_activity.png | Bin 0 -> 505 bytes src/main/res/drawable-mdpi/nav_all_files.png | Bin 0 -> 505 bytes src/main/res/drawable-mdpi/nav_contacts.png | Bin 0 -> 394 bytes .../{ic_star.png => nav_favorites.png} | Bin ...c_cloud_upload.png => nav_folder_sync.png} | Bin .../{logout.png => nav_logout.png} | Bin .../res/drawable-mdpi/nav_notifications.png | Bin 0 -> 450 bytes ...vailable_offline.png => nav_on_device.png} | Bin ...ic_participate.png => nav_participate.png} | Bin src/main/res/drawable-mdpi/nav_photos.png | Bin 0 -> 1570 bytes .../{ic_recent.png => nav_recently.png} | Bin src/main/res/drawable-mdpi/nav_settings.png | Bin 0 -> 646 bytes .../{ic_shared.png => nav_shared.png} | Bin .../{ic_uploads.png => nav_uploads.png} | Bin src/main/res/drawable-mdpi/nav_videos.png | Bin 0 -> 853 bytes src/main/res/drawable-xhdpi/nav_activity.png | Bin 0 -> 850 bytes .../{ic_folder_open.png => nav_all_files.png} | Bin src/main/res/drawable-xhdpi/nav_contacts.png | Bin 0 -> 656 bytes .../{ic_star.png => nav_favorites.png} | Bin ...c_cloud_upload.png => nav_folder_sync.png} | Bin .../{logout.png => nav_logout.png} | Bin .../res/drawable-xhdpi/nav_notifications.png | Bin 0 -> 719 bytes ...vailable_offline.png => nav_on_device.png} | Bin ...ic_participate.png => nav_participate.png} | Bin src/main/res/drawable-xhdpi/nav_photos.png | Bin 0 -> 3085 bytes .../{ic_recent.png => nav_recently.png} | Bin src/main/res/drawable-xhdpi/nav_settings.png | Bin 0 -> 604 bytes .../{ic_shared.png => nav_shared.png} | Bin .../{ic_uploads.png => nav_uploads.png} | Bin src/main/res/drawable-xhdpi/nav_videos.png | Bin 0 -> 1545 bytes src/main/res/drawable-xxhdpi/nav_activity.png | Bin 0 -> 1232 bytes .../{ic_folder_open.png => nav_all_files.png} | Bin src/main/res/drawable-xxhdpi/nav_contacts.png | Bin 0 -> 972 bytes .../{ic_star.png => nav_favorites.png} | Bin ...c_cloud_upload.png => nav_folder_sync.png} | Bin .../{logout.png => nav_logout.png} | Bin .../res/drawable-xxhdpi/nav_notifications.png | Bin 0 -> 1033 bytes ...vailable_offline.png => nav_on_device.png} | Bin ...ic_participate.png => nav_participate.png} | Bin src/main/res/drawable-xxhdpi/nav_photos.png | Bin 0 -> 4765 bytes .../{ic_recent.png => nav_recently.png} | Bin src/main/res/drawable-xxhdpi/nav_settings.png | Bin 0 -> 994 bytes .../{ic_shared.png => nav_shared.png} | Bin .../{ic_uploads.png => nav_uploads.png} | Bin src/main/res/drawable-xxhdpi/nav_videos.png | Bin 0 -> 2400 bytes .../res/drawable-xxxhdpi/nav_activity.png | Bin 0 -> 1625 bytes .../res/drawable-xxxhdpi/nav_all_files.png | Bin 0 -> 1625 bytes .../{ic_star.png => nav_favorites.png} | Bin ...c_cloud_upload.png => nav_folder_sync.png} | Bin .../{logout.png => nav_logout.png} | Bin .../drawable-xxxhdpi/nav_notifications.png | Bin 0 -> 1317 bytes ...vailable_offline.png => nav_on_device.png} | Bin ...ic_participate.png => nav_participate.png} | Bin .../{ic_recent.png => nav_recently.png} | Bin .../res/drawable-xxxhdpi/nav_settings.png | Bin 0 -> 2435 bytes .../{ic_shared.png => nav_shared.png} | Bin .../{ic_uploads.png => nav_uploads.png} | Bin src/main/res/menu/drawer_menu.xml | 32 +++++++++--------- src/main/res/menu/navigation_bar_menu.xml | 8 ++--- 75 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 src/main/res/drawable-hdpi/nav_activity.png rename src/main/res/drawable-hdpi/{ic_folder_open.png => nav_all_files.png} (100%) create mode 100644 src/main/res/drawable-hdpi/nav_contacts.png rename src/main/res/drawable-hdpi/{ic_star.png => nav_favorites.png} (100%) rename src/main/res/drawable-hdpi/{ic_cloud_upload.png => nav_folder_sync.png} (100%) rename src/main/res/drawable-hdpi/{logout.png => nav_logout.png} (100%) create mode 100644 src/main/res/drawable-hdpi/nav_notifications.png rename src/main/res/drawable-hdpi/{ic_action_available_offline.png => nav_on_device.png} (100%) rename src/main/res/drawable-hdpi/{ic_participate.png => nav_participate.png} (100%) create mode 100644 src/main/res/drawable-hdpi/nav_photos.png rename src/main/res/drawable-hdpi/{ic_recent.png => nav_recently.png} (100%) create mode 100644 src/main/res/drawable-hdpi/nav_settings.png rename src/main/res/drawable-hdpi/{ic_shared.png => nav_shared.png} (100%) rename src/main/res/drawable-hdpi/{ic_uploads.png => nav_uploads.png} (100%) create mode 100644 src/main/res/drawable-hdpi/nav_videos.png create mode 100644 src/main/res/drawable-mdpi/nav_activity.png create mode 100644 src/main/res/drawable-mdpi/nav_all_files.png create mode 100644 src/main/res/drawable-mdpi/nav_contacts.png rename src/main/res/drawable-mdpi/{ic_star.png => nav_favorites.png} (100%) rename src/main/res/drawable-mdpi/{ic_cloud_upload.png => nav_folder_sync.png} (100%) rename src/main/res/drawable-mdpi/{logout.png => nav_logout.png} (100%) create mode 100644 src/main/res/drawable-mdpi/nav_notifications.png rename src/main/res/drawable-mdpi/{ic_action_available_offline.png => nav_on_device.png} (100%) rename src/main/res/drawable-mdpi/{ic_participate.png => nav_participate.png} (100%) create mode 100644 src/main/res/drawable-mdpi/nav_photos.png rename src/main/res/drawable-mdpi/{ic_recent.png => nav_recently.png} (100%) create mode 100644 src/main/res/drawable-mdpi/nav_settings.png rename src/main/res/drawable-mdpi/{ic_shared.png => nav_shared.png} (100%) rename src/main/res/drawable-mdpi/{ic_uploads.png => nav_uploads.png} (100%) create mode 100644 src/main/res/drawable-mdpi/nav_videos.png create mode 100644 src/main/res/drawable-xhdpi/nav_activity.png rename src/main/res/drawable-xhdpi/{ic_folder_open.png => nav_all_files.png} (100%) create mode 100644 src/main/res/drawable-xhdpi/nav_contacts.png rename src/main/res/drawable-xhdpi/{ic_star.png => nav_favorites.png} (100%) rename src/main/res/drawable-xhdpi/{ic_cloud_upload.png => nav_folder_sync.png} (100%) rename src/main/res/drawable-xhdpi/{logout.png => nav_logout.png} (100%) create mode 100644 src/main/res/drawable-xhdpi/nav_notifications.png rename src/main/res/drawable-xhdpi/{ic_action_available_offline.png => nav_on_device.png} (100%) rename src/main/res/drawable-xhdpi/{ic_participate.png => nav_participate.png} (100%) create mode 100644 src/main/res/drawable-xhdpi/nav_photos.png rename src/main/res/drawable-xhdpi/{ic_recent.png => nav_recently.png} (100%) create mode 100644 src/main/res/drawable-xhdpi/nav_settings.png rename src/main/res/drawable-xhdpi/{ic_shared.png => nav_shared.png} (100%) rename src/main/res/drawable-xhdpi/{ic_uploads.png => nav_uploads.png} (100%) create mode 100644 src/main/res/drawable-xhdpi/nav_videos.png create mode 100644 src/main/res/drawable-xxhdpi/nav_activity.png rename src/main/res/drawable-xxhdpi/{ic_folder_open.png => nav_all_files.png} (100%) create mode 100644 src/main/res/drawable-xxhdpi/nav_contacts.png rename src/main/res/drawable-xxhdpi/{ic_star.png => nav_favorites.png} (100%) rename src/main/res/drawable-xxhdpi/{ic_cloud_upload.png => nav_folder_sync.png} (100%) rename src/main/res/drawable-xxhdpi/{logout.png => nav_logout.png} (100%) create mode 100644 src/main/res/drawable-xxhdpi/nav_notifications.png rename src/main/res/drawable-xxhdpi/{ic_action_available_offline.png => nav_on_device.png} (100%) rename src/main/res/drawable-xxhdpi/{ic_participate.png => nav_participate.png} (100%) create mode 100644 src/main/res/drawable-xxhdpi/nav_photos.png rename src/main/res/drawable-xxhdpi/{ic_recent.png => nav_recently.png} (100%) create mode 100644 src/main/res/drawable-xxhdpi/nav_settings.png rename src/main/res/drawable-xxhdpi/{ic_shared.png => nav_shared.png} (100%) rename src/main/res/drawable-xxhdpi/{ic_uploads.png => nav_uploads.png} (100%) create mode 100644 src/main/res/drawable-xxhdpi/nav_videos.png create mode 100644 src/main/res/drawable-xxxhdpi/nav_activity.png create mode 100644 src/main/res/drawable-xxxhdpi/nav_all_files.png rename src/main/res/drawable-xxxhdpi/{ic_star.png => nav_favorites.png} (100%) rename src/main/res/drawable-xxxhdpi/{ic_cloud_upload.png => nav_folder_sync.png} (100%) rename src/main/res/drawable-xxxhdpi/{logout.png => nav_logout.png} (100%) create mode 100644 src/main/res/drawable-xxxhdpi/nav_notifications.png rename src/main/res/drawable-xxxhdpi/{ic_action_available_offline.png => nav_on_device.png} (100%) rename src/main/res/drawable-xxxhdpi/{ic_participate.png => nav_participate.png} (100%) rename src/main/res/drawable-xxxhdpi/{ic_recent.png => nav_recently.png} (100%) create mode 100644 src/main/res/drawable-xxxhdpi/nav_settings.png rename src/main/res/drawable-xxxhdpi/{ic_shared.png => nav_shared.png} (100%) rename src/main/res/drawable-xxxhdpi/{ic_uploads.png => nav_uploads.png} (100%) diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java index 4ef0b67286..2e59651931 100644 --- a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -313,7 +313,7 @@ public class FileDisplayActivity extends HookActivity dialog.dismiss(); } }) - .setIcon(R.drawable.ic_cloud_upload) + .setIcon(R.drawable.nav_folder_sync) .show(); } } diff --git a/src/main/res/drawable-hdpi/nav_activity.png b/src/main/res/drawable-hdpi/nav_activity.png new file mode 100644 index 0000000000000000000000000000000000000000..f955a2d7220ff8afad29846c73d29f257ad10cdd GIT binary patch literal 676 zcmV;V0$crwP)#Z#ggo7*2;=~n%4I16av$=yaW^a?-hiUF#CGXAr z=a=^;!vJUc59;-LH>A9jfCnk1o(T8=5CAg9JOprEfCa#cK*pFhfGq%rGB|*@%4BBV z1aOIn#DJEr(9uSI1OR!Se`y?uh=u^p9X&T&p)d>|5YhVaJ2N*2WUakGL@)j_QK~th zG)e!qVeKv0a&X0v80L_{wEoGL7>0L<=v_(btJeBf zoki0${X80tva(#IgR$G~wvk zkAKh0FKk&51edkey8!%EVVL=Ck|g&}8?&%NTI+2I7yv&!&+9K5bSjWB<~D$P0x$sZ zd@va7FAZd^^_Y2E2xias{iMpkxqsPYGSR;8->tK%bM6CxPBG5R8`j#NRXi%6LyKgs zRcV@L`1d2<$8o$~Hm6JycWMB@bUN*n!2EK~b?f+u0cou-7Gp#d4~N4~jQ}z8S|N0h z=lND$A2Faj&x;ibk|as%`iKD$(Mh14IF8>e<0IL!W1yK*>hZEZVn6`a0Dy>IMN#x| zSrh4&9TL&AReYp@OcX`mr94-XG3GS{PJXcpIp;P3lwK*%B&k1nL7ww2j#}mb0000< KMNUMnLSTY9ts=z$ literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-hdpi/ic_folder_open.png b/src/main/res/drawable-hdpi/nav_all_files.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_folder_open.png rename to src/main/res/drawable-hdpi/nav_all_files.png diff --git a/src/main/res/drawable-hdpi/nav_contacts.png b/src/main/res/drawable-hdpi/nav_contacts.png new file mode 100644 index 0000000000000000000000000000000000000000..72b2171642f6869ced3446f40c94354245002792 GIT binary patch literal 539 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB*pj^6U4S$Y{B+)352QE?JR*yM zvQ&rUPlPeufHm>3#+V#$}!^jv*0;-%d01kPehNw%@eC5*4X{<_Vxj%9;Q)V?VtLM#XO8K!+W z-}36~uhl^-zwjQIZ8-5;fkjNd*=+N3tyx=VJ+Hi1K543_rRQ7|-}^@k=iK^o{s!02 zefv#)*%&;+YVP0P^me-#(}$CRX4@}JTAY)oxcrIWuA(VtbxYo8%=XvtoW$%oHxsB^ z#glIiH&B0CtAiC_Tu~R)syZ`j+yjD>Ht%N_~H|`4e=`LRbwaG=ubbLer(3Q zcu}syAJ#63WsqjDIqkfh!Oyd3m!y% amfpF4ny}=v^XkCpWAJqKb6Mw<&;$SiRO8|R literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-hdpi/ic_star.png b/src/main/res/drawable-hdpi/nav_favorites.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_star.png rename to src/main/res/drawable-hdpi/nav_favorites.png diff --git a/src/main/res/drawable-hdpi/ic_cloud_upload.png b/src/main/res/drawable-hdpi/nav_folder_sync.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_cloud_upload.png rename to src/main/res/drawable-hdpi/nav_folder_sync.png diff --git a/src/main/res/drawable-hdpi/logout.png b/src/main/res/drawable-hdpi/nav_logout.png similarity index 100% rename from src/main/res/drawable-hdpi/logout.png rename to src/main/res/drawable-hdpi/nav_logout.png diff --git a/src/main/res/drawable-hdpi/nav_notifications.png b/src/main/res/drawable-hdpi/nav_notifications.png new file mode 100644 index 0000000000000000000000000000000000000000..deac351b3fe7a831ce4d23bd27b31b3f0e620f61 GIT binary patch literal 623 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 W&-3Su(Sw zr8wTqH~CW}K~WJBatR2cck5vxq(sq3tErg1cr##ZvO+RDuZMhXH=CK+%tkAgJg|p- zf1dZ5_xt91zX1;MKLe{xGz{Yt02h7SpW3$lYBju(13b*xDt-UFAj`690GtR2IiX`7 zjG#iHa1uZ?AS9||LL=tq$Ye54MWfNS+S=MLEz8;{anW_%ZZdfLxvtv{UoN<0Ga{(31AMuha%#V{20LLeLnCF5qXVd1iRV8XO#aJRXn# z0^nGP!qs4Hdwctd$;rt-N{xFqbxlppI}bn%036e`{5xctW}}GwfPl^Jfda`}03afb z01_c`9g@!|rEYn4NJL%^A?6Or0mpIblv3?VsdmS4>PQX%xU)}=7=V|`4foqcj=HY< zG|3k$5UocdkuxJBBj1-ACnhHT0x*@$W^=CVegojKAQBPzoaERp4IXhcO*11R?*?@1 z4coS-5dgz5E&-VGaXTb0E2YL!a!vu>C$%W0#zdsohpgZ@&Sw=m2pv=K=}fOuYOGw0 zpP(H_B=Vb&>!x0sK6_FVLFI1@K`P$z_Hk)nP&ub6h3zDxWrS6?u zyM|t8XXjPyOyx>=L`2S~)9Lk&j*cG}78V>}XPLUXy81+94m(4+5*kQu<#M^}ejWPH zN5`%X<#M^-)9G{_fM-LH#sM7Hzj%l|ko-U?HB)Nav#GbXw%!J?7KXS=tm#_2ut$)- zpIq}HajGcnmvgQBF61c)0P^|#M*x=f-*pk05|I`WX$7ztLd>FwwCda`0PEVmtZVFn z?@iq>j3-5;EtyPyRes4I9v*&^YpcoKR)G?uPkZ=260r-6kuG+R;ABOKh9n$!^O5Y(K aF8mG6LsU%}V!Ji~00004nJ zERz6X#=6pzy+A?964!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<{Ozj?Yi zhE&XXd)Ky0HC5#J!{TmER^~!cwZ4@KYQ;QQN{$>1C^kwXM{G-&R=Jv0E85io8PSI~q+>v9sj_<*nH*XfN zdtKMxvF>T3LG$aNQ+pF7_N}*FBUgC6lt1cSg4^AP1wY>X`SWM)tHW*WwU-K*i>v<^ zSkweoUlBU6o7cR6=X(}^6jR2(XB=tY9N#vc|Mcc$^;UMK1pig`b2%EWusCEfDQvYa zwqNkR`o7e~9GT-r&(D9ChDw++PMF2u;mfc@jUh;wVI?Q=!rtNsEc*8MJ^pd?())u} zOSl!3?D{(5TO3@@G0YQWTFG4D#?i_7z*12~rC~a!q9Eg*c>+QL2X1pF9%m^icDkX+ zct!Y7AIE~Z0%Z;i+tpimg%6apY;a_nF;BqEh2gW{AvTVLI;RLjMwxzrFb{^~>Mf#z z2Z~xYFfm2U6A)8r_$qLSiDiSGlZ6uFn&|?44h*l=TO>IXtXmA28FTst)KnVY3LRo$ z*--1WgO%}3yMPo&LVZhsBg1di7HNS4|2QA=vP@_fh;wB4$?=et>4Z0jBEzJ11%{yA zo4;^x*l}O!(d>Qi<@Nt6c?&qit!)3_!|=)Qk2r?{|KWO|aq}PUZ)Es(`a`}0!|&uD zqAVNa+wMCs+)n?oU7_Kv(H~BZgle98C#D;GhvzpkTs!|E9q3-8Kgt3Jeo6cj*T zsb>Uw!)e1mq5=m#O8)EOcu>Jp-^yZOe>mQd@yziL<_-*(jsNfp9w_0dZ)Pc| zZrh*8l#%|!TA`t;ZNDVh8^y#KB4y`ST>x46Uo@ALKk@~vsFpX3fq6XZudFrl3NSKfH6P^Z|QIqD}b zD22gIyC&3-UmCIcRqi&H5B`UF&#asBY0I}|stxm{^AgJ14?kRfYxXOKb?ev5yB*oT zwcKFy>Y!7HZ!Lbs;OFoEzo+B3U}0!AxAD$byWagX;HkeVXI9I7<@;a$*z0$DJ5G13 y_;-g@xKc`R`qC-<{(gRSF~3q#^C6JeaQmlx+}^gZc6+@;AW2VGKbLh*2~7Y`?Z4Lm literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-mdpi/nav_activity.png b/src/main/res/drawable-mdpi/nav_activity.png new file mode 100644 index 0000000000000000000000000000000000000000..1f180b100e48ec1140bfdad328dc75f88c9a33f0 GIT binary patch literal 505 zcmV||0Nrl)1i&uI=E4EK?=O?Q1^^LhEgWEsxdKoa z02ccOp66`=I33>4vqa8>o&cyvJdW@C>q!H>UawuN)jBf)lu}0|_afznF(zpwbR1_J zz#l;D5-FvYNZutS#fjvD*7_q_j|Gst1h8h2-^^ySH*pP#7L-z(B;NtJv!;_g)>=Qs z^~Uy~-|v6sa=DG9Fk{RCfW}Dpi`M!%$v*}dd$<@-zcm2B>Hy?dDwXeP=1G5Yl8Peon$PDO)2(v=NESro vEC_-h`)8X$p6A`#_^tQAb=`a0nN;-)xDJC(vwI@V00000NkvXXu0mjf!w=It literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-mdpi/nav_all_files.png b/src/main/res/drawable-mdpi/nav_all_files.png new file mode 100644 index 0000000000000000000000000000000000000000..1f180b100e48ec1140bfdad328dc75f88c9a33f0 GIT binary patch literal 505 zcmV||0Nrl)1i&uI=E4EK?=O?Q1^^LhEgWEsxdKoa z02ccOp66`=I33>4vqa8>o&cyvJdW@C>q!H>UawuN)jBf)lu}0|_afznF(zpwbR1_J zz#l;D5-FvYNZutS#fjvD*7_q_j|Gst1h8h2-^^ySH*pP#7L-z(B;NtJv!;_g)>=Qs z^~Uy~-|v6sa=DG9Fk{RCfW}Dpi`M!%$v*}dd$<@-zcm2B>Hy?dDwXeP=1G5Yl8Peon$PDO)2(v=NESro vEC_-h`)8X$p6A`#_^tQAb=`a0nN;-)xDJC(vwI@V00000NkvXXu0mjf!w=It literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-mdpi/nav_contacts.png b/src/main/res/drawable-mdpi/nav_contacts.png new file mode 100644 index 0000000000000000000000000000000000000000..344baee58820b7aec3f41922d4ac3884e1fa0cff GIT binary patch literal 394 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE(}6TtKSPDj(q#+`jG~?{jv*e$-%c^~Iuan_dfwYi;j)!fOykrE zvNMjkd1&f6b|^***clpl3vhRr+&aR#WK$8VbHOWxX@{QQTq0p={4-^OTno zT9|#Ta&?FvTwT~h6vPo#swX)(iQ{cf3A}Q*@$t@|nM%K3q2ry*gX)A;YE0{TIvGe=8pfuloOI e^^J|S`xve+3tGmxN+%2$S`419elF{r5}E)#S)g|S literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-mdpi/ic_star.png b/src/main/res/drawable-mdpi/nav_favorites.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_star.png rename to src/main/res/drawable-mdpi/nav_favorites.png diff --git a/src/main/res/drawable-mdpi/ic_cloud_upload.png b/src/main/res/drawable-mdpi/nav_folder_sync.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_cloud_upload.png rename to src/main/res/drawable-mdpi/nav_folder_sync.png diff --git a/src/main/res/drawable-mdpi/logout.png b/src/main/res/drawable-mdpi/nav_logout.png similarity index 100% rename from src/main/res/drawable-mdpi/logout.png rename to src/main/res/drawable-mdpi/nav_logout.png diff --git a/src/main/res/drawable-mdpi/nav_notifications.png b/src/main/res/drawable-mdpi/nav_notifications.png new file mode 100644 index 0000000000000000000000000000000000000000..2e35a0cf8991ef91d90dfda9b18de9891f89fd9f GIT binary patch literal 450 zcmV;z0X_bSP)iZ_c^>)&TGQ zB~TG6&@IdIVzyYB^Rg^Q!2JRNc<)Dx_?CidU0Z7>)GWI^&v)CrsxkH6Kh>1$Y87a9 s4RIXbPN!3hG3Wn*aU9=iyeqWg7osRwaER7p!~g&Q07*qoM6N<$g4gS~UH||9 literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-mdpi/ic_action_available_offline.png b/src/main/res/drawable-mdpi/nav_on_device.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_action_available_offline.png rename to src/main/res/drawable-mdpi/nav_on_device.png diff --git a/src/main/res/drawable-mdpi/ic_participate.png b/src/main/res/drawable-mdpi/nav_participate.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_participate.png rename to src/main/res/drawable-mdpi/nav_participate.png diff --git a/src/main/res/drawable-mdpi/nav_photos.png b/src/main/res/drawable-mdpi/nav_photos.png new file mode 100644 index 0000000000000000000000000000000000000000..1d767a5feabada4f84e87c71e141677463c90b51 GIT binary patch literal 1570 zcmZXUeKga19LK-gem0Lq%|lskN!?N@igm@tvNTsRCdIW@p7NAs#MJ7So>mLdb>v~u zq>>ajOG=uY;?!j+mWR+|r(_nglKZ!dQP-KDw! z00Y`iHymh=l8E*VXUeLy) z!?uNGw;6}Lost^;-UwRZK`LZ)$xlCLmn_+K`d|_B4E!nV!$=8#z*W~;yn%UIMBM1i zrR$!vPAbiQ*ddf|KN`<(YF@4E$s?*Y@Mkq0Rr_H6&vr94_p@c$R1_Uw zCTKj;r6+o;VR!_!cXZ4Yz8jR=Jbpxvcg?igxVD&tVHae4$%xqic2nt-pXG9Sc3@zj z-RP&=w{v}lmIeR5GP^H4EUXzH#4rO!Ira}M?ns8Irg$unIAcvHZAqem6dKxPDj~K- zOW#Fd221Q;oA7&+M8|YO+%v6$tGLu}`i5Jv%h~@@TW~5Epc?>mZ;}VwRmv7x7kgo@ z;>I_@BQpdGMFU*@U)iyewm)h;S4wrzJ z5a&)j3r^bS$}xehXkHf@-BmL&L{w(<)A7%b}X^a%TBm9ILYJ*bB;_|C4T;^pfllXHdkey>LtObZJu z{xI_Vb1FC?-m4}G#HSUOz(2+~O*C*3=`6Q^>sV|Z$(tR6LZR@r$q@EMGH?_&JHWel zy*JL#E9zvVTzQW^SO1XMLToP6zcIf+C%URD8+W=+ z$7m33<~hD{Ei5%peK|5QVOPaF=ND)F=-uF~mZIr!)f3xfS|ZcUg6^>l2aGyij_$fv zTK{o8Q1dW$ck!5>nf;!0O^ZdqFtxZfn$RHA_?UlK^0|b0U-ii64vvL<+`<^=1sKKk z)YR0KbbJuR4w+mPwSonlS|i2Dz@keTx^7+-iJAC}7rfdSCrBT5kK>#q6wRlPWLJ~Z zDhwHq4Q~9X3@E$C9}%j1??#lxX7S`DC$MhcasUCtQ!OVi zxAEflEpFyT-LwPMec?6wb*TPYV_#GF$rf^NkoI)P*fx7Vl-ax4OT-mhN94qqNc1LG z<>svOg+tW^L}S!e7et(uoUbnMR|A4*CdY%KsFzDi6MzRYU<*|H_gqaUR)SP{Q55eG z5DN4i$iendZ4&~tBoyUl8AZ{B06(xE0ZtI983B+4S@M#i7)AgU5FE(9ju1&Y=QM`# zMnEw|p_EINj=e+Rp(!)H54Fr-An4C$}yHd1I!xP%PzK?|KkjTaXXI zO{#2x)F4FZyyrW~CDUrEM;q5H2&`i)`~Oi$LunH*|6PmKI+B>-(&d4=eVY%L@o)V_!T62-o149F-GAIb~hZE h-QFfxVfnMEG$`T4iPF*UOcZj@0gdYAc8|hJ`3Gm=*0=xw literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-mdpi/ic_recent.png b/src/main/res/drawable-mdpi/nav_recently.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_recent.png rename to src/main/res/drawable-mdpi/nav_recently.png diff --git a/src/main/res/drawable-mdpi/nav_settings.png b/src/main/res/drawable-mdpi/nav_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..20d7dd8f597ea5fd69fb2eb01980cb8a76e9812c GIT binary patch literal 646 zcmV;10(t$3P)q_$h$*>2o@>9Ofl!ZD;cC4*3MY<&3<(l(K1zX&YnOQpzTP{tWJA zs#Q3Hhs^vDz-@QsQp%>*`oiUEt?Sm>695edJ|m)MQ51bCssQPSUaqIRdGXZXf{1o= zaL*N=GDrm(b4F2a#y~06V&-iZW9AjDb-kd1Iy0~2xZ6spR-u7XYMqGo04(RU8rIsL zYm)ZAm+LLu{$(#T z0KBL$hjY*Ku20_U^JOp?{PunSCxA7Fe}(d+BEun~t!}q_G-Ut)!{PAQ_x;BJz7tV6 z8jW5GA#MV=kLf=y0q{l$vBu2%0B!*|GsdV)MP(%eKoA5603PMwLt{*4nJ zoY_^s0%eflgCJVibdwE*7$D$owlc zk!iA4DcU2FF~!5rCj0%G>&E-vFR$A)@5{bTDW|iIfp)_{fb{j$7f+r%*^oKw@wQxf zp1lH9zq8Zi#k-HT-^?kSCbe&>6o=xTvU9aYn}1twJN)3?%$t{&Wy;CR$kfa`|NQN) zhiYH5&h0F}8FpB2?<^m+_LU1$7;mxG>z-{`EnSF=t)ZVRx1bv7zn#913es0oetcSMkdW9?i^Y`VwJ1Yl_F~;!1w(XO;-(lz?7D5ya!?1Pnx1r5|l=3ow30?ecXfaT!R1N}I zVCGLc__soffiMj30@zMOqi4WzoKpa10Dy=-XU*SE`+4L>Xk%le4B$Zf zd89_DTrTe?B6sWBNOd5JqB{Vrj^)wV1CHaI0C2iHW|dETo*d1exFDdh$95f1=FG)qLYN%()k2QWV z!?^j|;wB0qj35YB0qjepEFL0eK2xn$Kg2DFJwj5-^8k(}k`*5-jYi|8N#IWl0JkqARsp?Tcz%tW8Wr527e~q^#;s{oH_W!s}wO zcs~($LQP6=9A|}y`kh|KJ+4pgCHoU;m*YX zfUX9J=*IH$^2ap9c^T+-g1v1voA=TZYd26Tm3E^0CGWiN`#;k1Yd26R6#f|>W?uC? z?^zc7+6^#s=LysV;AF+G-2f4FcHm~C(RiN~e;ys!YT%t^S@kUW^Eicmj}Q?p2q9Wo zlILNd-GS%zdi`nEd&j>>V_ zodl82PG-my94%C&;2`3xAa?;9azBUOP}DZL+?k8yea7&<@Av!MOL)H=I2;a#W1f++ zH*7Q-XVNsi1#AGPvX4Il9nbTgHJi;3Gbv!LT}+bX5pW0a4q280PmMA6thIYHBak)! zhW)2L4jp66r7|SEq8k9jar`((^8g!JrZ9z1AP9o9BJv(s$Qd1~>bX{{wNs>i;S=yY z@8$%}11x0OV)ct|psJfyWJ?nOPF9pHO`uZB5cpD2wj2Qwd0R!cG=Vftp98}QqQfj( ztw5{Q+ELYZ-khqoi{1gH2mtuLe;4TFh;*_{VJ5kN{-E3K4(s*$>%m~K0-WdY8$Jb| z7-O!_)G&9DX^+zm$GlVcM{KS2lO(yQs%s*08dwEZfa8G4mLNc=6h2{_PQ$*IHDB3-0(a2#=RUcN+Jit;``$)!_M)SPyDVveC#}PPI qp}@%6?oWNy{PzM5hr{8RZ+-#A;Y9m4b literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/ic_star.png b/src/main/res/drawable-xhdpi/nav_favorites.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_star.png rename to src/main/res/drawable-xhdpi/nav_favorites.png diff --git a/src/main/res/drawable-xhdpi/ic_cloud_upload.png b/src/main/res/drawable-xhdpi/nav_folder_sync.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_cloud_upload.png rename to src/main/res/drawable-xhdpi/nav_folder_sync.png diff --git a/src/main/res/drawable-xhdpi/logout.png b/src/main/res/drawable-xhdpi/nav_logout.png similarity index 100% rename from src/main/res/drawable-xhdpi/logout.png rename to src/main/res/drawable-xhdpi/nav_logout.png diff --git a/src/main/res/drawable-xhdpi/nav_notifications.png b/src/main/res/drawable-xhdpi/nav_notifications.png new file mode 100644 index 0000000000000000000000000000000000000000..d035a62131673da1ae41971fd6d688ab5c3d5c8e GIT binary patch literal 719 zcmV;=0x@~8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H10!&FnK~!jg?U}KQ6G0Tlzb`SONxihoD(P;F5$8Mwd{t*<47HWJyH&_;b3kh}^AIDlb~C)>l(C zjTrDe?-YPl0CxaX4hi1{umNB#2!hXfYv(rLy6$C?PXNqoO23K7?QXaGGEe<-99}^8`H4TLSPL`456bM6PC?L?#1Dsna6z7W&KPZ)}k~ z-|2Kd>IyS`dm{1(=9&k9xyfYmFpE%o0!pbfBJv)GpEkPeCP{L(*Xw=I5ou3AM6Sbp z^8ipOm&;dlMcM{PUewiS%o;5NN-4jfK7Ql6Zd)fl_49yI$`_GU{g(6~dBJg<<6#)SN)w;Tz_gm*L&rp_ zB{a?E_aM2FChq^*#1_jxh_S0h*LAl^)>DRm4}#!?iMqx%G0Art;X1JgV)7K)OdCk@ znW>`242;L)bpXQ@p~Gsmx^AkjF$4X6|3@6hi#XWCFplFzlW%HrUGDB@Fc@q%8jZ(s z9De~YFCudQc1XS^*{RiP%k6f1%VbT9#bTK)KLPK5x%EC71(pB+002ovPDHLkV1i1w BL&N|8 literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/ic_action_available_offline.png b/src/main/res/drawable-xhdpi/nav_on_device.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_action_available_offline.png rename to src/main/res/drawable-xhdpi/nav_on_device.png diff --git a/src/main/res/drawable-xhdpi/ic_participate.png b/src/main/res/drawable-xhdpi/nav_participate.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_participate.png rename to src/main/res/drawable-xhdpi/nav_participate.png diff --git a/src/main/res/drawable-xhdpi/nav_photos.png b/src/main/res/drawable-xhdpi/nav_photos.png new file mode 100644 index 0000000000000000000000000000000000000000..078ed8ae510e15ce5c5c05cb6a4f240921449fb7 GIT binary patch literal 3085 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 literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_folder_open.png b/src/main/res/drawable-xxhdpi/nav_all_files.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_folder_open.png rename to src/main/res/drawable-xxhdpi/nav_all_files.png diff --git a/src/main/res/drawable-xxhdpi/nav_contacts.png b/src/main/res/drawable-xxhdpi/nav_contacts.png new file mode 100644 index 0000000000000000000000000000000000000000..f36e4cba949d1a42091686aa2e0633219fd2e16f GIT binary patch literal 972 zcmV;-12g=IP){A)U#*?# z^F81)aJ<0b4+0nJ_4=)yot^J}_3Ui~Wh3WvpfY5sR776&HIlpp6o%m`RlNe#N-EhE zk+X3e@4D`N*iZAmsOmE1g#%E_YC7k91T8EqoDPEER|c>$J&RytYYKL#}spR{p7OtAsa!hLj9s){|WRp8v7G>*awViSvQ1(lA!$Ii{*T15{(<&w+OF*~8lHIJP zb6x_9<9Js@E&^!@;r!Se*ya<@_U-5S4HG%k|aOZYPBm-6#YHc0Yy<%+1uND zHVA_As`?`E9PmI%wUDkx_V3oy-z}x{f8jTYoat)X|>a))2hN?c@ zZnyXI9F%*CiO4&QUpN3$S?{?N`3@>PpGQFM-irkE%u%1^5OVikB%r*T?V}`j@AmhX u0W6>aET91_paCo(V~jDz7-NhvBj+Dzy&D1U%wC`X0000#8KAri0Dx`VCNrM}U;+RUjTQ=p^8*6|^_;8aFUYp- z0|2f7nDfU^--zh2=Xp1BsP&Uv1-Y)<69mB+fJH5ad}=nEYiqUIr!0H@N+GX527oXO zccZl&09afs7I$UUXC`tL#LO$&7_%yiF0IJr6tgUABM}_}a0I}bh~cjQTw&&GzVAOx zyW5{+D#*6&?EoqOHph&36o#QYI5_xFu+~4xM3Cb+D*+5Kv($QWtJ!Rxs?}=mgz{RF zx**%Ow-eFTcGjB?c~3+~JockL_n&Gx>9|v#~z`_*b=L0xmn&zu|z5XPHd;lp5 zvMg&a5naaLH-M590PHbM^Lf2qf0o7{q;iT`meof@!vMO|$e)3)M6}KGyvNeP;`c%2 za(ONhT|{%x%>D)G0Zy3fo=}^&A%yFER%sd95D4E*< zU#Fhk#4i7$M-VfgL4I-opu4N9>$GH`*b!7Nmy3-?;~jt{QkgONI59D?VrXcnDG?@i z1T`9sKIAV40G9Uj^lXv}6B9&4JEgLc5(I%*7coK1yhSQY08=VRa*@vUz0I!>kysZ= zLCXZQlCoSXNK(-Mus~0IAia-TLpn@V$K@o@u za$R?gM2;j;SDOPZ7Dg;}Xo>J7v2K7hnUQsT8?7&|JJ z%FDO`u?5WnInyMP6id)7k~2+gNwL--WFeZ z2xMfoi5$pS5HnvB$ha=irCl-=UF)c`<5Zvc!;eIu6XnxiO+q9}@@C~ff__=g4#FJf4N00000NkvXXu0mjf D^d`aH literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_action_available_offline.png b/src/main/res/drawable-xxhdpi/nav_on_device.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_action_available_offline.png rename to src/main/res/drawable-xxhdpi/nav_on_device.png diff --git a/src/main/res/drawable-xxhdpi/ic_participate.png b/src/main/res/drawable-xxhdpi/nav_participate.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_participate.png rename to src/main/res/drawable-xxhdpi/nav_participate.png diff --git a/src/main/res/drawable-xxhdpi/nav_photos.png b/src/main/res/drawable-xxhdpi/nav_photos.png new file mode 100644 index 0000000000000000000000000000000000000000..671b6bf107897e598caebbbce07eff0aba411fad GIT binary patch literal 4765 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 U3V-L1z#@&o)78&qol`;+01s(f)Bpeg literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxxhdpi/ic_action_available_offline.png b/src/main/res/drawable-xxxhdpi/nav_on_device.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/ic_action_available_offline.png rename to src/main/res/drawable-xxxhdpi/nav_on_device.png diff --git a/src/main/res/drawable-xxxhdpi/ic_participate.png b/src/main/res/drawable-xxxhdpi/nav_participate.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/ic_participate.png rename to src/main/res/drawable-xxxhdpi/nav_participate.png diff --git a/src/main/res/drawable-xxxhdpi/ic_recent.png b/src/main/res/drawable-xxxhdpi/nav_recently.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/ic_recent.png rename to src/main/res/drawable-xxxhdpi/nav_recently.png diff --git a/src/main/res/drawable-xxxhdpi/nav_settings.png b/src/main/res/drawable-xxxhdpi/nav_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..64f0ad73f6e6977248a88491ca87aa06e775d3b5 GIT binary patch literal 2435 zcmV-}34Hd6P)}-f9UF3YH-JPP2`JRzgVRVyt%5qvkSWbDQDkuX1w`appj0evgC<~;dmcYz z(U2j@zMQ?gvHP3h3pwXG&+~uoIlFt_fRvP!l$4Z|l$4Z|cN!G81LL9V`e%sf`v5)= z($qO-e%x`K7vhfTMkF!;rfG_Sfq@GEZc}9PqNZuHP1BTd$2Jxbw*xog^5x6#hdS{A z;5OH0;z(oygb*K^3O1Ga6}JQ9@R2EEGc-v}Koq~$vz^W`HUJ-wDBeFX^EVvF`JLa2t*xy&DdlQrei%T%5Mp()So~91 zhe9V{?b@|BO`ksfWnBNEBLV!Dh;~+0RsGU5&Ebh`=(@g)h-?6h!usQpqs(kLj?*(y zA=5OogM)*gX69x9^|*e-ICb^v)q6TSJO3TVkwM7xW{;wz*7 zuwlc7Tc%B$_C03)VrWT&1W)vnp`oECwr$(?#_0bq6bf^hc{MXX2H=hf>gO%XvP1b0 zrn381aS}kahvJfm4g%;pbLPyia=F}cBI;u1*~%0RA^_0^W^O8#N(bl7o3{c$6EiP| zx98(!0C(B8{aVoWvmyO|2HwO60Kv>F0IbO6a+d(y%FGHR42Syzcp;a|U1H{2eO9k_ zHFzv&`+<8vKA&I2%za4an^Yx{M6}qltfN6H2NjQ)d3%WZ|4#^4i$Fi-KmzKz{v`ml zaYvpYYF$ly<2!4nX;uvk44eQkC+?^d##v3%=9{KD=%kKuUQxGtXe=8B)r- ziRb}lHUS)q+erZTx|&Uj*QtoLF$TlTykAQB)Yh$A|2$5a6Yjr505)&jxbdSxh-ZlC z3y5j=A2WX)!0yS)c}>8TID!E1S7u)2IL;A2mE1%%>bky!i1q=vv(k#g{R%SaPUB0UXjat)Zi% zcw0dSP0*G=R`E)j$eZ(})w^bQ5P4n$+ zHv0&G(-Hd3%v{tot=`Z2K%fUyKA-{S(s5aOGP z#fiF&y_%-g+O~Zvr~xHiF`v&jG4po-Ob=n^m~Go1Qz*{37>4mj01HEyxJpD%T9(xn z))yr!TCO8~AEbF8STjP<>=kH?X6N=0o$Ye6B z+S}XT3~C_o5L74>7L?27qfjJ107xmnt;$w~+IXm3E*~uv3JZc72-E{~U0+2+I{{QF z)@Q0tM-MV{v*S4X{8sekNK;eOw3#z!b|BhC`qSBLcFC44TmGTa=%!7Z-Zwlvd<4-R z)a&f;?{Deq>KgJ|!E*xEuU|hqo6SB~p|_Ponx;LdYE{fM&36q94E!3vC!=^4W0y+WgiX#vJL_{kynaoPVFpe?vFN6>;mdoV}M0C~-c1|XfnJuNfpNKw- zaI0Oaoc^wta-I@UDwX!+a=9lE|NhX0M6{5ZA;kYiPa*;{gD5d~5FRg;N_)H%^z;nq z?(QxFSQmFxQ;2o0W|QJ)W7c5+-El`Y1?cvAHURKB6(NMs5#L7LslXLiBhPp`L~xDX z-roMDOPAgR;1h92nnZ}G-R}l1-;;4wRaNZ(&c+>V0y*ny;|pIs004S=dWLFhYX0uN zW2d+<^W$x8ZN5+E1buHK!!QmbJuQEYUfZ_o5MbAM(DeW&qV*WLnCYF4bhQYyWk2wO zjC(uC-hkE52X#0i7{N~f?G1WU3J`u#{wa)HTI7WxW`3TC>TTPeLqrWo#>4z95jD6z z)id++0KCrUUv@PJOeL-?dj-HQBKnbKS+9=%gS)1@1Hh`VeguJ;pUq@4PZo>C{xLD# z!OUL;um-@~am9=K$}(WWOZyH0*jXx-4o>!2?q1qwA-dZV$8vy~pLQH)!X4d>jg6UH zF1H*&Ge*|FlXqz!@ZW1Ie*j<>5&g7WF7N8-==hsoI~BOLvX6+?S(f#CzZF|rT0WS` zWY#eAN&s&PA-0L&?GVeQcC5&)+lVMAdv~EuC6{0;G#m47hRi)!}pS8CFtqt;hLJ7lSEVp z@7Lpx$2n$hZfk3c^yE!SN=iyfN=iyfN=k}X{sV^FT7rvLpo;(i002ovPDHLkV1i^O Bd|v @@ -124,22 +124,22 @@ android:checkableBehavior="single"> diff --git a/src/main/res/menu/navigation_bar_menu.xml b/src/main/res/menu/navigation_bar_menu.xml index b076206baf..c8037a372d 100644 --- a/src/main/res/menu/navigation_bar_menu.xml +++ b/src/main/res/menu/navigation_bar_menu.xml @@ -2,18 +2,18 @@ \ No newline at end of file From 44b9355315ca4f5b9492c5ad45917d29594460d9 Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Thu, 18 May 2017 12:52:20 +0200 Subject: [PATCH 12/41] change to value of current master --- scripts/lint/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lint/lint-results.txt b/scripts/lint/lint-results.txt index a0669c99d3..c6190dcce2 100644 --- a/scripts/lint/lint-results.txt +++ b/scripts/lint/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 73 errors and 849 warnings \ No newline at end of file + Lint Report: 75 errors and 853 warnings \ No newline at end of file From 17beb10fddbc8325bea93a67cc98ad01d35580d0 Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot <> Date: Thu, 18 May 2017 11:15:26 +0000 Subject: [PATCH 13/41] Drone: update Lint results to reflect reduced error/warning count [skip ci] --- scripts/lint/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lint/lint-results.txt b/scripts/lint/lint-results.txt index c6190dcce2..c0f92e3b8e 100644 --- a/scripts/lint/lint-results.txt +++ b/scripts/lint/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 75 errors and 853 warnings \ No newline at end of file + Lint Report: 74 errors and 848 warnings From 7eddd7440c2d984aeee977c8a3990a89efdb2ba9 Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Thu, 18 May 2017 14:34:44 +0200 Subject: [PATCH 14/41] fixed "all files" --- src/main/res/drawable-mdpi/nav_all_files.png | Bin 505 -> 278 bytes src/main/res/drawable-xxxhdpi/nav_all_files.png | Bin 1625 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/res/drawable-xxxhdpi/nav_all_files.png diff --git a/src/main/res/drawable-mdpi/nav_all_files.png b/src/main/res/drawable-mdpi/nav_all_files.png index 1f180b100e48ec1140bfdad328dc75f88c9a33f0..0a53eea0dfc6297eecf708389ad009ed27aeea6f 100644 GIT binary patch delta 230 zcmV#UM{2OLsQ^nUfLRU%t<)dU!5 zL5#7fPee9zvmR9S1mFfBtTnp(+03pY0yAqCIJ}g|pX77>A|kPsyr!~r;GGgLB&U?p zkan85EueOVDXbl7IzOlW)jJ==3oL)dJMan gYx~04V~Gvm31y)#bdi96D)fn6q*FKjCV#Gig5N<}v~((^||0Nrl) z1i&uI=E4EK?=O?Q1^^LhEgWEsxdKoa02ccOp66`=I33>4vqa8>o&cyvJdW@C>q!H> zUawuN)jBf)lz&o3B=;iahA}2-By=2S8^9kx>=G%ZmPpZT8{;gyacdj zk>AW_vo~=Ki58SnnxU;5{Jl0x2#r4Mapx^I*=5o1>q%dR50f5Fx_>0#1Imtf; z7<>ht7%u>zR4VO{@gvR5n?auE-P-uA_rP`Cd)t{*^$WNT VgHE%1BFz8*002ovPDHLkV1ks@(Xjvk diff --git a/src/main/res/drawable-xxxhdpi/nav_all_files.png b/src/main/res/drawable-xxxhdpi/nav_all_files.png deleted file mode 100644 index 38507dcf75a9eb518b7fad826dfa8dd44e62b378..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1625 zcmV-f2B!ImP)@~8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H11=dMKK~#90?VM3)97Pz%|KHwTyqHiFrB#Zehzg2=AU=r*MN|+3 zMSKwZrXuZ`++B7rTC|I{lDpkYQe#C5f}l_#4+?@%DEcDeg9su;D@vrI)*?zn?wV_o z`Fu$r#H881oteFz&hPDZcfRkR`{$dTnVmhrVzF2(7K^0^C~E;}ak3VW2H*Fe%vwWQ za%(`jT;9RV`?J=OmfRXpDwPf)$NJaE*Dm=MBNfDU}$e}b7G-FSRxXejpv^!-{&rBWGmUH24#n>U>5gkd<8g(jKw zeFeC#JC6T<`2djn|9+s)4XD@aHv$;j;D-TifIc?B_x*J~bc+f&pfpxzsf#%z}YFHK5b!)BxPR&1JR=QbDCs*)4>4WxMNa1t_9eEJj2$ zyxn#79-x4Fy?#G4KON^<6P6)>J~AK(0#^ue6ftM#LI`^gkjcWr!hQgE$Gm)LYHI3V zm3nm17Y2-tjqN0&g9)0P1Hh{E=%g zs8*}p!OUe{`4sZQ{QUeSAD1RUn*l^L381JepDG;3sT@0YY)Mu;EnSf3c~1d&SVu0! z%r+X06EXuTuYgLWG6WiRcw%DWSJ`ou8sK@} zEzB%!#E>Ds3=a>tR0LLP!0Mj^9{lSntfahyp2xqo$th^kQ(wUy_Q8O-Fl^rX~SK7*MO#u0i}=cc;#uKmU$O zJxMUa03;Xz5m8y@*21(HVL+i!h}-`kZ#J7>C>4_sBMcBi#4(`bI8NU^t2V-bm?NM! z8jZ#oS)Jq5_C$WM*cjt4mK3j4)uEWr$D0F#JrLn1mQ% z0JiReE--UdtCED6V!);qKt#^?LWtbFkDPl0HtvRC=BZYz^nq@Fx7&R)Gci4odjr Date: Thu, 18 May 2017 14:35:57 +0200 Subject: [PATCH 15/41] Warning "Duplicated icons under different names" increased, but no other way possible --- scripts/lint/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lint/lint-results.txt b/scripts/lint/lint-results.txt index c6190dcce2..71708cc631 100644 --- a/scripts/lint/lint-results.txt +++ b/scripts/lint/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 75 errors and 853 warnings \ No newline at end of file + Lint Report: 75 errors and 860 warnings \ No newline at end of file From b43dc9d1a7cfa34630af2e0ba3a67836c4d206ed Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot <> Date: Thu, 18 May 2017 12:50:27 +0000 Subject: [PATCH 16/41] Drone: update Lint results to reflect reduced error/warning count [skip ci] --- scripts/lint/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lint/lint-results.txt b/scripts/lint/lint-results.txt index 71708cc631..48f603cb85 100644 --- a/scripts/lint/lint-results.txt +++ b/scripts/lint/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 75 errors and 860 warnings \ No newline at end of file + Lint Report: 75 errors and 858 warnings From 9bc5d1bde75b6b97cc80d620eda08570cbd693ad Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Mon, 22 May 2017 00:25:50 +0000 Subject: [PATCH 17/41] [tx-robot] updated from transifex --- src/main/res/values-pl/strings.xml | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 4a5708a010..003a4da88d 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -17,7 +17,7 @@ A - Z Z - A Najnowsze najpierw - Najstarsze najpier + Najstarsze najpierw Największe najpierw Najmniejsze najpierw @@ -42,7 +42,7 @@ Więcej Konta Zarządzaj kontami - Blokada hasłem + Blokada kodem PIN Blokada odciskiem palca Brak skonfigurowanych odcisków palców Pokaż ukryte pliki @@ -144,7 +144,7 @@ Anuluj synchronizację Anuluj Wróć - Zapisać + Zapisz Zapisz i wyjdź Błąd Wczytuję … @@ -211,16 +211,16 @@ Lokalnie: %1$s Zdalnie: %1$s Brak wystarczającego miejsca, aby skopiować wybrane pliki do folderu %1$s. Czy w zamian chcesz je tam przenieść? - Wymyśl kod PIN. + Podaj kod PIN - Wpisz kod PIN. - Kod PIN będzie wymagany przy każdym uruchomieniu aplikacji. - Wpisz kod PIN ponownie. - Usuń swój kod PIN. - Podane hasła nie są takie same. - Kod PIN nieprawidłowy. - Kod PIN został usunięty. - Kod PIN został zapisany. + Wymyśl kod PIN + Kod PIN będzie wymagany przy każdym uruchomieniu aplikacji + Wpisz kod PIN ponownie + Usuń swój kod PIN + Podane kody PIN nie są takie same + Kod PIN nieprawidłowy + Kod PIN został usunięty + Kod PIN został zapisany %1$s odtwarzacz muzyki %1$s (odtwarzany) @@ -399,7 +399,7 @@ do wysyłania do tego folderu Ten plik nie jest już dostępny na serwerze - Ścieżka przechowywania aktualizacji + Aktualizacja ścieżki przechowywania Koniec Przygotowywanie migracji… Sprawdzanie docelowe… @@ -422,7 +422,7 @@ Użyj Nie można odczytać katalogu źródłowego! - Czy nadal chcesz zmienić ścieżkę do %1$s?\n\nUwaga: Wszystkie dane będą musiały zostać ponownie pobrane. + Czy nadal chcesz zmienić ścieżkę przechowywania na %1$s?\n\nUwaga: Wszystkie dane będą musiały zostać pobrane ponownie. Konta Dodaj konto @@ -608,12 +608,12 @@ Dostęp do, współdzielenie i ochrona twoich plików w domu i w pracy Wiele kont - Podłączenie się do wszystkich chmur + Podłączenie się do wszystkich swoich chmur Natychmiastowe wysyłanie Twoje zdjęcia będą bezpieczne - Pominąć + Pomiń Umieść palec na czytniku odcisku palca Nie rozpoznano odcisku palca From 16cfaa5525407708cd09fb658df8b5d0b60cbbf0 Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Mon, 22 May 2017 09:49:58 +0200 Subject: [PATCH 18/41] change/add nav_videos res --- src/main/res/drawable-hdpi/nav_videos.png | Bin 1145 -> 382 bytes src/main/res/drawable-mdpi/nav_videos.png | Bin 853 -> 298 bytes src/main/res/drawable-xhdpi/nav_videos.png | Bin 1545 -> 384 bytes src/main/res/drawable-xxhdpi/nav_videos.png | Bin 2400 -> 536 bytes src/main/res/drawable-xxxhdpi/nav_videos.png | Bin 0 -> 618 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/res/drawable-xxxhdpi/nav_videos.png diff --git a/src/main/res/drawable-hdpi/nav_videos.png b/src/main/res/drawable-hdpi/nav_videos.png index 09520e449b60f1c77c6e1c10851e19fe53f6dd4f..a66280c59e429a1096184acea0909b509c9b8b91 100644 GIT binary patch delta 332 zcmV-S0ki)32>t>giBL{Q4GJ0x0000DNk~Le0000a0000a2nGNE0O0_bn2{kG3m+r^ z03Rd)0bIC9kwzzf0Q*TqK~z|U?bk66!9W;*;g>KP7{p{_Kw>jn41TP|4-m7B!N0&@ zk_d+OlT(eV`|jGry~(9bd&xa%n@b9zkX;qyybbgVFx-J1a0aLuH)cSu01!Y2Simc& z9v@Hf@KG}!4Y^QDnY0Dgoi2eoD e_q5P|_5j-x9yC#)847s-00004nJ zERz6X#=6pzy+A?964!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<{Ozj?Yi zhE&XXd)Ky0HC5#J!{TmER^~!cwZ4@KYQ;QQN{$>1C^kwXM{G-&R=Jv0E85io8PSI~q+>v9sj_<*nH*XfN zdtKMxvF>T3LG$aNQ+pF7_N}*FBUgC6lt1cSg4^AP1wY>X`SWM)tHW*WwU-K*i>v<^ zSkweoUlBU6o7cR6=X(}^6jR2(XB=tY9N#vc|Mcc$^;UMK1pig`b2%EWusCEfDQvYa zwqNkR`o7e~9GT-r&(D9ChDw++PMF2u;mfc@jUh;wVI?Q=!rtNsEc*8MJ^pd?())u} zOSl!3?D{(5TO3@@G0YQWTFG4D#?i_7z*12~rC~a!q9Eg*c>+QL2X1pF9%m^icDkX+ zct!Y7AIE~Z0%Z;i+tpimg%6apY;a_nF;BqEh2gW{AvTVLI;RLjMwxzrFb{^~>Mf#z z2Z~xYFfm2U6A)8r_$qLSiDiSGlZ6uFn&|?44h*l=TO>IXtXmA28FTst)KnVY3LRo$ z*--1WgO%}3yMPo&LVZhsBg1di7HNS4|2QA=vP@_fh;wB4$?=et>4Z0jBEzJ11%{yA zo4;^x*l}O!(d>Qi<@Nt6c?&qit!)3_!|=)Qk2r?{|KWO|aq}PUZ)Es(`a`}0!|&uD zqAVNa+wMCs+)n?oU7_Kv(H~BZgle98C#D;GhvzpkTs!|E9q3-8Kgt3Jeo6cj*T zsb>Uw!)e1mq5=m#O8)EOcu>Jp-^yZOe>mQd@yziL<_-*(jsNfp9w_0dZ)Pc| zZrh*8l#%|!TA`t;ZNDVh8^y#KB4y`ST>x46Uo@ALKk@~vsFpX3fq6XZudFrl3NSKfH6P^Z|QIqD}b zD22gIyC&3-UmCIcRqi&H5B`UF&#asBY0I}|stxm{^AgJ14?kRfYxXOKb?ev5yB*oT zwcKFy>Y!7HZ!Lbs;OFoEzo+B3U}0!AxAD$byWagX;HkeVXI9I7<@;a$*z0$DJ5G13 y_;-g@xKc`R`qC-<{(gRSF~3q#^C6JeaQmlx+}^gZc6+@;AW2VGKbLh*2~7Y`?Z4Lm diff --git a/src/main/res/drawable-mdpi/nav_videos.png b/src/main/res/drawable-mdpi/nav_videos.png index 638f8edf24a38ae00c4a1b409da741cc6815b9bd..9e0d7ee357e044dc3e51e7f7c1abcb237d0a33cc 100644 GIT binary patch delta 247 zcmVmzR3lzfu z02IRk6>v>Lkwzzf0H;YrK~zYI?b0y{!ax)N(WeO7*y|1K#X?AF>qR|-rGnrE^ahr8 zY9X;O0SQWy&BiLzd{~wl_Oo=9(97l=>xkYbHaHKmgK;)@kpc;(pMjih!~p0=68@wt zFu|xvptzzUGc0k$9=F&57<%t?5fZ8rXcVdw2nx0Si$Y#L@X*qVYKiLvg2Yt=Cme9E xE3O*2go<{Yw;}|tNU@6KO*3alIWLwUB$&C@M5q7&002ovPDHLkV1m-AVC?_^ literal 853 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf4nJ zoY_^s0%eflgCJVibdwE*7$D$owlc zk!iA4DcU2FF~!5rCj0%G>&E-vFR$A)@5{bTDW|iIfp)_{fb{j$7f+r%*^oKw@wQxf zp1lH9zq8Zi#k-HT-^?kSCbe&>6o=xTvU9aYn}1twJN)3?%$t{&Wy;CR$kfa`|NQN) zhiYH5&h0F}8FpB2?<^m+_LU1$7;mxG>z-{`EnSF=t)ZVRx1bv7zn#913es0oetcSMkdW9?$UvUJ3Anh8sdr#qG)_2kVB6mC z1^kNqBa8N8)^o7Rne zD4}+kQ#(%Ae1g}pLBRaOC&`YKN)?28_<-?5=;YJ gr9&8oVSITN1Nihf2ED?D)c^nh07*qoM6N<$g4d{oKmY&$ literal 1545 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 cqUzo{;>K~(@h%^|^f6-O&gjq4nJ z1oMC}qwm#U0zg5@64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_&pL@DE zhE&XXd)GcIBvGX8V|j><4$JNkqljG`;)*w-QdA?mR(q_TEpXAv`G8+cL(~!vzvq7y z64UN|e*W`d$bH#o1#<61iWMgU?E?aXqj`njVlG8{{=VFE>5{&uylU;eT@OA!I{RK_ zuhkcq!#0z@L|yXt-2cD);NqjRzq?ChESkH-Ji2`~gFm1B>4@}b_SFm)bCyT5vlvvL zxPIp7!uE`3kL<*Y*=GnI=wV1>F;H%hWIV%>;KpFg1Q9yN@cdC@|5x+>(2isIm1eEc`G)JjXy4EI;=d}&d2DbXBWa3Q1x+PQiE7G|5T Date: Mon, 22 May 2017 10:02:08 +0200 Subject: [PATCH 19/41] set to 757575ff and no transparence as in othere files --- drawable_resources/ic_list_empty_image.svg | 43 ++++++++-------- drawable_resources/ic_list_empty_video.svg | 51 +++++++++---------- src/main/res/drawable-hdpi/nav_photos.png | Bin 2310 -> 698 bytes src/main/res/drawable-hdpi/nav_videos.png | Bin 382 -> 450 bytes src/main/res/drawable-mdpi/nav_photos.png | Bin 1570 -> 516 bytes src/main/res/drawable-mdpi/nav_videos.png | Bin 298 -> 360 bytes src/main/res/drawable-xhdpi/nav_photos.png | Bin 3085 -> 696 bytes src/main/res/drawable-xhdpi/nav_videos.png | Bin 384 -> 423 bytes src/main/res/drawable-xxhdpi/nav_photos.png | Bin 4765 -> 1063 bytes src/main/res/drawable-xxhdpi/nav_videos.png | Bin 536 -> 616 bytes src/main/res/drawable-xxxhdpi/nav_photos.png | Bin 0 -> 1189 bytes src/main/res/drawable-xxxhdpi/nav_videos.png | Bin 618 -> 668 bytes 12 files changed, 46 insertions(+), 48 deletions(-) create mode 100644 src/main/res/drawable-xxxhdpi/nav_photos.png diff --git a/drawable_resources/ic_list_empty_image.svg b/drawable_resources/ic_list_empty_image.svg index bbaa5b6e3f..d885015618 100644 --- a/drawable_resources/ic_list_empty_image.svg +++ b/drawable_resources/ic_list_empty_image.svg @@ -1,21 +1,20 @@ + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + height="16" + width="16" + version="1" + id="svg4" + sodipodi:docname="ic_list_empty_image.svg" + inkscape:version="0.91 r13725" + inkscape:export-filename="C:\DEV\src\Android\Nextcloud\favourites\src\main\res\drawable-mdpi\ic_list_empty_image.png" + inkscape:export-xdpi="432" + inkscape:export-ydpi="432"> @@ -38,19 +37,19 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1005" + inkscape:window-width="1600" + inkscape:window-height="835" id="namedview6" showgrid="false" inkscape:zoom="14.75" - inkscape:cx="8" + inkscape:cx="17.694915" inkscape:cy="8" - inkscape:window-x="-9" - inkscape:window-y="-9" + inkscape:window-x="1600" + inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + height="16" + width="16" + version="1" + id="svg4" + sodipodi:docname="ic_list_empty_video.svg" + inkscape:version="0.91 r13725" + inkscape:export-filename="C:\DEV\src\Android\Nextcloud\favourites\src\main\res\drawable-mdpi\ic_list_empty_video.png" + inkscape:export-xdpi="432" + inkscape:export-ydpi="432"> @@ -38,21 +37,21 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1005" + inkscape:window-width="1600" + inkscape:window-height="835" id="namedview6" showgrid="false" - inkscape:zoom="14.75" - inkscape:cx="8" - inkscape:cy="8" - inkscape:window-x="-9" - inkscape:window-y="-9" + inkscape:zoom="20.85965" + inkscape:cx="-15.290906" + inkscape:cy="9.1100694" + inkscape:window-x="1600" + inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg4" /> + color="#000" /> diff --git a/src/main/res/drawable-hdpi/nav_photos.png b/src/main/res/drawable-hdpi/nav_photos.png index 61eb88f1c538a00a3684758171e1f75f029a6574..dafb3ebddf0870858fd1fa2d2649ba46bc62148e 100644 GIT binary patch delta 650 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 W&-0>T53ZGQnjNkl7mQtCdALGg}OPti=xyvyH*O zz+jRHhW3+FjjH?Z+QhxdrA>RuJ!zXu3Zal)72~`O^b0WDfgNxLs2MkAK(7E0KnGaB zE2thHPx0_kGae1OP)nJ#1=gNG(|A0qdRqAF0w}Azpb5}&0e_LwKI%^mfH|-SR=}ZX z5Ja2lkO-#^`voL9f!Tm0RhR}yQh{lLBr90y_8}Kf=uSyqnH5CR0I5JE8;~kQ`UT_! zBIO0`fhBO%hDdoq8z%~*((OY5lvUa{GzPk!)^8>+n4qgM>20FpE^?Cml^)^$HQtE+ g1=aVo(0}#-+Y=r%QJ@(Lc>n+a07*qoM6N<$f=tDG%K!iX diff --git a/src/main/res/drawable-mdpi/nav_photos.png b/src/main/res/drawable-mdpi/nav_photos.png index 1d767a5feabada4f84e87c71e141677463c90b51..520c19889d25407f33ef6830ff1d12230f336846 100644 GIT binary patch delta 467 zcmV;^0WAKa41@$BiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_>mzR3lzfu z02IRk6>v>Lkwzzf0f9+GK~zYI?UFH1+dve@fA5X~DML4;3glRfohmVOtU&4~K!Lpy zEG!+)v4^V7(7{o>uyklQgxFEHN+?@D1<)>hgk~XkuR~=iGLDmgr>g(y{GQ+Mce*?H zp9K*B=iHHqd})z;ud4e+QG8niFve`EDylkcgDxVeF=hvU_$w$=6h+pCAW4$6T(4D| zy9n+4URX&QwP z&aAa>^E|(Qt$}YCW6o98s_MttUfm_v!N*gB;Gw>1` zRV9yFX zR}Jtoi~0`*Ns?#?VVSw5v+xzQB2d*|fHwcSQWW?a*&^>>&L4MNjhtj@1V;b>002ov JPDHLkV1k&S*C+r0 delta 1529 zcmZXUdoCtPtJ+KzIX6FkGdPc4#M4CZA$&=MkU#dC2Yz z-cu7d|1HONZ``zTK}Ctj85gVgcF))B9(a-rsoeBb%sL`SFkU`YNWB7o2pE|uWlh-0 z8*mM&mpO#J)^u0-YXEblqlRd)5W%ge35JV}I>&nDy^q zvRDt2vp?!qEQPqLR0`pq$JyIYKz}5+cL)j0|L5KeLXaRN|xCZ?T5T+vW6-a@T{@w zq~3VWL?Q)kyA&JoMn=(AqzUuPUNO~Kqw$>ca{dnKdVaNZ@)t#A3+&d&zp*j6q1oWMt)x zc|9jN;Ht_<9&+D}i&f8#X-n`x19yw`^& z^YZdusZU{FCIHL4E_3+kk#}lo3WWn6iOk#Y(AQet(*aX!5B*7h=mHmDav@r5>=G8% zI2oXNUw2{Q?b~$j5czO!9*#BoFzX*MqI=27$=h62eW6JI#qA+FG+@;e%uN8=gW}V>zpFwnRW+_2RcsEtrggh_-^<#mJip{9;CN*~r`00L|QD52R z{<#BYo+!=k)tdwziy0vyEEv7dPHdWyR4`SaPf$Zy*dl^?m6ueX?ZBGQgYLxLZO*{+iVs#svXIB#~Ii7h3`~bDQWAW#$*6MBJzZ<2w2HT~O>D zDV>Vt6^;e&khk+4yLk5;YQAzM>xFX9>Dh6*8c5B_?lF8;P`HQWOeI?qa>n#n-;=0&A%^q9+Zw@Ia zSv=++*VrM)3!5(6>LYKH5ta^CLuoo5sG=S&Cqy1|>%rvDeJhI*e}wGP4P+Y`DDpZw zI&39D*+h(JCphO+ezUv*BXR&o+s>{Y>}Bid{x>A+sJt5sWwT$YD8$VHh3stqh(t^L E3&P0G2LJ#7 diff --git a/src/main/res/drawable-mdpi/nav_videos.png b/src/main/res/drawable-mdpi/nav_videos.png index 9e0d7ee357e044dc3e51e7f7c1abcb237d0a33cc..9c1f16c29b5700bacc5d565727a8074221e0a587 100644 GIT binary patch delta 258 zcmV+d0sa1}0_XyeZhz%TL_t(YiS3d-j>0eyM!&I~5(#Q9fy6~t+B0mQ!cKAoqqs=5 z#hwCbFTxFA_W~eMM$tzRQXs^SEkl8Lja`i1D`tQixhSdDV0)l0DWMkzIx7K>$oZF@h1c^feQR2G-B$sX5Hciv) zLdACl>bhRViU*#1MMY7Rmj**1c^V+O=^wfj0RRNBPUL!Z4!ZbeFx+3uH2?qr07*qo IM6N<$f+11B7C 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 Vb9;#>>tX-^002ovPDHLkV1n44h}!@F delta 284 zcmV+%0ptFs1AqgNZGQm$NklH;PS<>b*Resy5-V^_5h4clo!A7VF#%~b{hjW_ufR(rMHoLBeSsU$l*iBL{Q4GJ0x0000DNk~Le0000;0000;2nGNE09Ea?N0A{J3;;e! z002Ho0W~16*^x#ke*>gRL_t(|ob8#vZxlxq$G>kc6874mKuRJgP6#FGXaPkEKMGP) z(V#TY1V!#cfQ@7 zoxM5x<|AD*J8$08=VqR6=KzPp;cz${4u@j|G&mroTujsSe;$C77V5FZ8)m+cB*~4z z2j1X7nx@}lw&Vc7XGC;8ilT#q4~7I0(HE1cY3k@?SvIsWh6K$rp6Bfz9Q&k7AT$4L zz8w1yQB*dklAt6>;^yT{A3+e53UWuR1ShBjC#ZxDI0$gw$Ls- z2!gMe`5}N$$IWBrb7`7x064Fk%O=`8h?%dUL{5Pp!Z19do69Czg5o$nKt$iwiDBm1 z*+ELFZ!zK~poF73xoo3*#P(^#?A6R=72O@QrV+NPf0N5LT7o>!dtNt&nQO;P16qQ7 z-+uz&znWq9b#mE8OOTXuotdxH2>I9ZyrJvN?SS_0pvA?-t3>o$g{g0e=yb2wd#9Vr zCfb6el*;%0GXMerZ?~BChf?aBUa$9;ZXVk-dPkB{DgcR;@|U%>wPQ-DuK~;x(Q9UY z+VA)Oe>PKQbA%9wlO%aoH_pgQq?B?Uz=QXnsY3{HoQQrGLL_x>M|b>vkPzZ?&-3m8 z=nzpPgjlW(&CDNu#n+XzZSQHSu)4Z>2_yalC88({!*ymZUBjB7D2lpD zsau^+=j`(G@=Md}3n7j(^Tn;6GxJYX*0FNLf8NVk0dOqKvXwZF513rP*ms()HE}@& zIk}XsNlBynP7@|7XoQ>`W0JP&JGx9v&=@&6jU|=!9UUejsDhjvZAm8kPLb9H)sT}@ zTaxL%Q>0Zv8gg=KNiyAcinJ!Eft;L5lG^AyMOqPLKu*qBNp1C=BE|(7l#?@3Qk#9J ze~3{*Ey&3klGJA3DPrthtVKCFxug@Do15J>`%V!fg5o&dpJmw!fc+-c8$&nCvPVQT zhZg%zk;a0eDC%Ze_6Y6E$(d9h01bQ41df$;v<1zA96(dhtjGZ>_MjjLKDwJ!O0`qX z6tbf)?M>hWmEZ)G-~^T61eM?fl`tfTL7D%tQOK0=YH(mk(89vPZ2)%xY)qn}DPaS^ pUElYAwOxqA;cz${4u@l#@IMd=nIa`!34{Ou002ovPDHLkV1mJO*RlWr literal 4765 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 eh=_4nJ z1oMC}qwm#U0zg5@64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq<{t~dAc}; zRLpsMXJfZasR;Xr_otU~n15&Y5a3}9)Kk#h>NQbKU}wWYvpKykSMr{1*KC<>bmm;C zI*VX;#zIcPq8XQtxn<8@;CiX^Wqx0C_x|*WKMxk%$@#YZbKU3JH*4iBcHB9$&*t9r zTJzn-It!)*d1)>M6Je}dWetw)IeEsOVaKIp`_s?#8LThA{IYzT@VPCr8?M!H%hrXz zXZT@wdQ*0;`W7|^7poe}_^q-TybK3+GW4!lbvl2vix*dRF`V=i>JEc6sB^ybSLdE#l>Wu^*W4@};7-_HW|6=k5!u zB$^e@H<^GSw(qANZ+EjYHqgY84RL+^dote&n2hBJR67988>qMxiJcHr2tW9J#> zm1=xkvue)Md6OSckkXWcu|~T&GExJg0*oX zN7ql<+td0ZH6u{u`;1EN1D`GZ>d&2tb`88U`CYP3(;hyJ)1N#ismyjM;Xa_O^h?@- zb-}9r^)4>kC#l@j0ZIXbMCpm_MrDTk*WI}z{}hD-4oP+YfRU;FzxVoq=N-oN6_u(9pEiL=C^d-+^-?mFK-%snQ%db>d7 zdvjLa1dYSxZCAR5b69zEe>jV(Fv$M<<5UyU$alXvgTbn%K8f+g2l2~U*gk;35V>gTe~DWM4f97`fB literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxxhdpi/nav_videos.png b/src/main/res/drawable-xxxhdpi/nav_videos.png index ee483c81c3a7b55ae5299d340e85320f6f6289be..da3b3854fbca111b775509464b05d2bd0327a30b 100644 GIT binary patch delta 570 zcmaFGGKY0SZatHvr;B4q#hkZy4E>}71&)1`oXs>*dx^iVFC%NvtQeIbul08ooc@2~ zm?F|4w6vK`)6(VL#3i5YR%y;(8k$r8Ic;D3?`xkj{zct3I-%qO1yfqL@m+iU^?20l z=8hP-!g(2W*Q4@}7uICOZpe`Jxm=ppRIpZ{JJTPA@u2|@6OwAzx92+ zLDIp+kKe$@YgN@ftJ|Ut-<~_aZeTp%_snj=luLh}xF{VqxMF$zGao}Tg8>^>qM22q z?cwvRt-IW8_luvfe&7@uzp4Gh2caoeE$s|ysT}@{KC1-em}iJ6+OQkcFLeGQaG-_f zVlacSmP|?uyy-($e92x4A7F$Ht1w^}!7RKsF1<&WgvD4lj;M_cI3R+^gW4koEDHbHkKw z^AimDN}u*l`NTGdkxy*Fl%m$EJpUi+o;duT%&_6+eb%#ob5m~hmNQ5&H@xNg@I51# zB|Q7@WngGNIL?^n=@~jdI{mEq!>2_*OJ^CYt=(EDIB|2ckJx?t(Aqd1vHKUA1q7ks Zp7lAM4`q#&*ZF delta 520 zcmbQk`if;jZaw33PZ!6KiaBrZ+Gm9%inM(!57E(K*&SjOv5P}o@kUgNYGl`HkJYmU zE;>0M@QZ1PTH@jN{I5b{+P%-ue;y3EFZ--O?wv@n;zR~8FgTi5_$}sAwCC^3J(n)& zd&;ZU-rM!yMxl7EW+gCIA^Vy${ zNRMV;&0sNSc{DqVLG_92XO1px&v^F8PP~|XhTwr7hBOufqt+ zA2s%WHUB?-(mn58)4q6KDu1kFCMmb8hi{^ygM_3~aD#!C%Q1#TmyR=xPOk+-nOdeP zYO!*xbqe7TsE=w{A)_#b@1mlEhUB8)h5#*>;|vR3I?gdVy%G>+YMG*_#>%nM$%jWE zsO7=LB{!c~H>_8fEYi(CnQ2K>%?tsBr;nVUGprPsw_?-S_~U}6!^)%We2iXtb|HKL zRUa27HHdZdPi5K?RkK210Z{2PhPC4IMr;xre@xIku;OStPd%fXo}C4A%*(Qm;m0K3 z%we>Xu(#%w^PGjtw}0Md7{3GgeJ#@;%bOy9bKez-KDaH&HuKf%YX@KL*Z4c(%cFN& qck$i+=k-hJWzZ%2&pObU+0CfInD^?w_eocffTydU%Q~k7#wGw-C)$Dl From d17af1d37ecb5e967c3a3aa81757fa69a1291ddd Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Mon, 22 May 2017 17:09:05 +0200 Subject: [PATCH 20/41] ignore oauth for now and use always basic auth --- .../operations/DetectAuthenticationMethodOperation.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java b/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java index 3988516e66..7e56b3ac29 100644 --- a/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java +++ b/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java @@ -98,11 +98,8 @@ public class DetectAuthenticationMethodOperation extends RemoteOperation { // analyze response if (result.getHttpCode() == HttpStatus.SC_UNAUTHORIZED) { String authRequest = ((result.getAuthenticateHeader()).trim()).toLowerCase(); - if (authRequest.startsWith("basic")) { + if (authRequest.startsWith("basic") || authRequest.startsWith("bearer")) { authMethod = AuthenticationMethod.BASIC_HTTP_AUTH; - - } else if (authRequest.startsWith("bearer")) { - authMethod = AuthenticationMethod.BEARER_TOKEN; } // else - fall back to UNKNOWN From 0627dd2a84f3b476f1229a4958b9063ce1d69e92 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Mon, 22 May 2017 17:21:37 +0200 Subject: [PATCH 21/41] bump version --- CHANGELOG.md | 3 +++ src/main/AndroidManifest.xml | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab0ba9a492..7ca0301f49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.4.3 (May 22, 2017) +- Hotfix: ignore oauth header for now and use basic auth to allow new logins for nc12 + ## 1.4.2 (March 14, 2017) - Auto Upload for newly taken photos/images (Android 6+) - Auto Upload improvements and fixes diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 6e9239f8e4..12b580a16b 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -19,10 +19,9 @@ along with this program. If not, see . --> + android:versionCode="10040399" + android:versionName="1.4.3"> Date: Tue, 23 May 2017 00:26:22 +0000 Subject: [PATCH 22/41] [tx-robot] updated from transifex --- src/main/res/values-de-rDE/strings.xml | 6 +++--- src/main/res/values-is/strings.xml | 4 ++-- src/main/res/values-sq/strings.xml | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/res/values-de-rDE/strings.xml b/src/main/res/values-de-rDE/strings.xml index abfc6e9907..9436a3d223 100644 --- a/src/main/res/values-de-rDE/strings.xml +++ b/src/main/res/values-de-rDE/strings.xml @@ -269,7 +269,7 @@ Die Autorisierung ist abgelaufen. Bitte Autorisierung nochmals durchführen Bitte gib das aktuelle Passwort ein Ihre Sitzung ist abgelaufen. Bitte erneut verbinden - Verbinden zum Authentifizierungs-Server ... + Verbinden zum Authentifizierungs-Server … Der Server unterstützt diese Authentifizierung-Methode nicht %1$s unterstützt nicht mehrere Benutzerkonten Ihr Server gibt keine korrekte Benutzer-ID zurück, bitte kontaktieren Sie einen Administrator @@ -297,7 +297,7 @@ Verbotene Zeichen: / \\ < > : \" | ? * Der Dateiname enthält mindestens ein ungültiges Zeichen Dateiname darf nicht leer sein - Bitte warten... + Bitte warten … Überprüfe gespeicherte Anmeldeinformationen Ein unerwartetes Problem ist aufgetreten. Bitte versuche, die Datei in einer anderen App zu öffnen Keine Datei gewählt @@ -305,7 +305,7 @@ Kopiere Datei vom privatem Speicher Anmelden mit oAuth2 - Verbinde mit dem oAuth2-Server... + Verbinde mit dem OAuth2-Server … Die Identität der Website konnte nicht überprüft werden - Das Zertifikat des Servers ist nicht vertrauenswürdig diff --git a/src/main/res/values-is/strings.xml b/src/main/res/values-is/strings.xml index 8abf238d2f..e290b8eb72 100644 --- a/src/main/res/values-is/strings.xml +++ b/src/main/res/values-is/strings.xml @@ -560,13 +560,13 @@ Smelltu hér til að fá þér einn frá þjónustuaðila. Tilkynna um vandamál á Github Hefurðu áhuga á að hjálpa til við að prófa næstu útgáfu? Prófaðu þróunarútgáfuna - Þetta innigeldur alla væntanlega eiginleika og er alveg á jaðrinum hvað varðar stöðugleika, Villur geta komið upp, og ef slíkt gerist, endilega tilkynntu um þær. + Þetta inniheldur alla væntanlega eiginleika og er alveg á jaðrinum hvað varðar stöðugleika. Villur geta komið upp, og ef slíkt gerist, endilega tilkynntu um þær. Forútgáfa Útgáfukandídat (RC) er stöðutaka á væntanlegri útgáfu og er vænst til að hún sé nokkuð stöðug. Með prófun á uppsetningunni þinni værirðu að hjálpa til við að tryggja þann stöðugleika. Skráðu þig til prófana í Play-safninu eða skoðaðu handvirkt í \"útgáfur\" hlutanum á F-Droid. Vertu virkur þáttakandi Taktu þátt í spjalli á IRC: <a href=\"%1$s\">#nextcloud-mobile</a> Hjálpaðu öðrum á <a href=\"%1$s\">spjallvefnum</a> - <a href=\"%1$s\">Þýða</a> forritið + <a href=\"%1$s\">Þýddu</a> forritið Yfirfarðu, bættu og skrifaðu kóða, skoðaðu <a href=\"%1$s\">CONTRIBUTING.md<a> fyrir nánari upplýsingar Færa í… Afrita í… diff --git a/src/main/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml index 5684eed659..23cdd1161a 100644 --- a/src/main/res/values-sq/strings.xml +++ b/src/main/res/values-sq/strings.xml @@ -563,6 +563,10 @@ në 7 ditët e fundit. Lëshimi i kandidatit Lëshimi i kandidatit (RC) është një fragment i lëshimit të ardhshme dhe pritet të jetë i qëndrueshëm. Testimi i setup-it tuaj individuale mund të ndihmojë për ta siguruar këtë. Regjistrohuni për testimin në Play Store ose manualisht shikoni në seksionin \"versionet\" në F-Droid. Kontribim aktiv + Bashkohu në bisedat në IRC: <a href=\"%1$s\">#nextcloud-mobile</a> + Ndihmo të tjerët në <a href=\"%1$s\">forum</a> + <a href=\"%1$s\">Përktheni</a> aplikacionin + Kontriboni si një zhvillues, shih<a href=\"%1$s\">CONTRIBUTING.md</a> për detaje Levizni tek… Kopjojeni tek… Zgjidh dosjen… From 0ae25b0c2c9dcadcee67046dfbfb5b947c0d01c7 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Tue, 23 May 2017 06:55:56 +0000 Subject: [PATCH 23/41] [tx-robot] updated from transifex --- src/main/res/values-ast/strings.xml | 1 + src/main/res/values-cs-rCZ/strings.xml | 4 ++++ src/main/res/values-el/strings.xml | 4 ++++ src/main/res/values-es/strings.xml | 4 ++++ src/main/res/values-ja-rJP/strings.xml | 5 +++++ 5 files changed, 18 insertions(+) diff --git a/src/main/res/values-ast/strings.xml b/src/main/res/values-ast/strings.xml index 6853699aa4..48a34ab966 100644 --- a/src/main/res/values-ast/strings.xml +++ b/src/main/res/values-ast/strings.xml @@ -168,6 +168,7 @@ Los conteníos de los ficheros %1$d pueden nun tar sincronizaos (%2$d conflictos) Dexáronse dalgunos ficheros llocales. Los ficheros %1$d fuera de la carpeta %2$s nun puen copiase dientro + Lo mesmo que na versión 1.3.16, los archivos xubíos dende esti preséu copiáronse dientro la carpeta llocal %1$s pa prevenir la perda de datos cuando un ficheru se sincroniza con múltiples cuentes Por mor d\'esti cambéu, tolos ficheros xubíos en versiones previes d\'esta aplicación tán copiaos na carpeta %2$s . Por embargu, un error torgó\'l pieslle de la operación demientres la sincronización de la cuenta. Pues dexar el/los ficheru/os como tán, desaniciar l\'enllaz a %3$s , o mover el/los ficheru/os a la carpeta %1$s y guardar l\'enllaz a %4$s . El llistáu d\'abaxo contién los ficheros llocales y remotos enllazaos en %5$s La carpeta %1$s yá nun esiste Mover too Moviéronse tolos ficheros diff --git a/src/main/res/values-cs-rCZ/strings.xml b/src/main/res/values-cs-rCZ/strings.xml index eb2c48e98a..bef0bcebbf 100644 --- a/src/main/res/values-cs-rCZ/strings.xml +++ b/src/main/res/values-cs-rCZ/strings.xml @@ -540,6 +540,10 @@ Předběžná verze Předběžná verze nebo také Release Candidate (RC) je stabilní stav připravované, finální verze. Přihlas se jako tester v Play store nebo si najdi a instaluj hodící se verzi z F-Droid pod \"Verze\". Aktivně něčím přispět + Diskutovat na IRC: <a href=\"%1$s\">#nextcloud-mobile</a> + Pomozte ostatním na <a href=\"%1$s\">fóru</a> + <a href=\"%1$s\">Přeložte</a> aplikaci + Přispět jako vývojář, detaily pod <a href=\"%1$s\">CONTRIBUTING.md</a> Přesunout do… Kopírovat do… Vybrat adresář… diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 8b13948abe..a795d9b017 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -557,6 +557,10 @@ Release candidate Η υποψήφια κυκλοφορία (RC) είναι ένα στιγμιότυπο της επερχόμενης έκδοσης και αναμένεται να είναι σταθερή. Η δοκιμή της μεμονωμένης εγκατάστασής σας θα βοηθήσει στην εξασφάλιση αυτού. Εγγραφείτε για δοκιμές στο Play store ή χειροκίνητα αναζητείστε στο τμήμα \"εκδόσεις\" στο F-Droid. Ενεργή συνεισφορά + Συμμετέχετε στη συνομιλία στο IRC: <a href=\"%1$s\">#nextcloud-mobile</a> + Βοηθήστε χρήστες στο <a href=\"%1$s\">forum</a> + <a href=\"%1$s\">Μεταφράστε</a> την εφαρμογή + Συνεισφέρετε ως προγραμματιστής, για περισσότερες λεπτομέρειες δείτε <a href=\"%1$s\">CONTRIBUTING.md</a> Μετακίνηση σε… Αντιγραφή σε… Επιλογή φακέλου… diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 46f3ac382c..ce5a71aa7c 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -558,6 +558,10 @@ Versión a ser liberada La versión a ser liberada (release candidate - RC) es una instantánea de la próxima versión y se espera que sea estable. Probar su configuración individual podría ayudar a asegurar esto. Regístrate para probarla en Play Store o busca manualmente en la sección \"versiones\" de F-Droid. Colabore activamente + Únase a la conversación en IRC: <a href=\"%1$s\">#nextcloud-mobile</a> + Ayude a otros en el <a href=\"%1$s\">foro</a> + <a href=\"%1$s\">Traducen</a> la app + Revisa, corrige y escribe código, lee <a href=\"%1$s\">CONTRIBUTING.md</a> para más detalles Mover a… Copiar a… Elija carpeta… diff --git a/src/main/res/values-ja-rJP/strings.xml b/src/main/res/values-ja-rJP/strings.xml index aff2449b91..c72fb54e81 100644 --- a/src/main/res/values-ja-rJP/strings.xml +++ b/src/main/res/values-ja-rJP/strings.xml @@ -182,6 +182,7 @@ %1$d ファイルのコンテンツを同期できませんでした（%2$d の競合） 一部のローカルファイルが忘れられています %2$s フォルダー内の %1$d ファイルはコピーできませんでした。 + バージョン 1.3.16以降、このデバイスからアップロードされたファイルは、単独のファイルが複数のアカウントと同期する際にデータの損失を防ぐため、ローカルの%1$sフォルダーにコピーされます。 この変更により、このアプリの以前のバージョンでアップロードされたすべてのファイルは%2$sフォルダーにコピーされます。しかしながら、アカウント同期中にはエラーが発生してこの操作が完了しないようになっています。ファイルをこのままにして%3$sへのリンクを削除するか、あるいは%1$sフォルダーにファイルを移動して%4$sへのリンクを維持することができます。 以下のリストにあるのは、ローカルのファイル及びそれらにリンクしている %5$s内のリモートファイルです。 すべて移動 すべてのファイルを移動しました 一部のファイルは移動できませんでした @@ -436,6 +437,10 @@ 開発バージョンをテスト リリース候補 積極的な貢献 + IRCでチャットに参加してください: <a href=\"%1$s\">#nextcloud-mobile</a> + <a href=\"%1$s\">フォーラム</a> で他の人を助けてください + アプリを <a href=\"%1$s\">翻訳する</a> + 開発者として貢献には、 <a href=\"%1$s\">CONTRIBUTING.md</a> をご覧ください。 …に移動 …にコピー … フォルダーを選択 From 15339b665a70c60733f819e1862dffabd78c78b2 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Tue, 23 May 2017 08:04:28 +0200 Subject: [PATCH 24/41] align app version code/name throughout builds (1.4.3) --- src/gplay/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gplay/AndroidManifest.xml b/src/gplay/AndroidManifest.xml index b35a5b09fb..8e252d1de1 100644 --- a/src/gplay/AndroidManifest.xml +++ b/src/gplay/AndroidManifest.xml @@ -19,8 +19,8 @@ + android:versionCode="10040399" + android:versionName="1.4.3"> Date: Tue, 23 May 2017 08:33:01 +0200 Subject: [PATCH 25/41] bump version --- src/modified/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modified/AndroidManifest.xml b/src/modified/AndroidManifest.xml index 7ae4b337d0..0a0f8fcc7c 100644 --- a/src/modified/AndroidManifest.xml +++ b/src/modified/AndroidManifest.xml @@ -19,8 +19,8 @@ + android:versionCode="10040399" + android:versionName="1.4.3"> Date: Mon, 15 May 2017 23:19:33 +0200 Subject: [PATCH 26/41] remove unnecessary return statement (codacy) --- src/main/java/com/owncloud/android/media/MediaService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/owncloud/android/media/MediaService.java b/src/main/java/com/owncloud/android/media/MediaService.java index eb67c18c1c..8f88763831 100644 --- a/src/main/java/com/owncloud/android/media/MediaService.java +++ b/src/main/java/com/owncloud/android/media/MediaService.java @@ -508,7 +508,6 @@ public class MediaService extends Service implements OnCompletionListener, OnPre // nobody is bound processStopRequest(true); } - return; } From e29ca8091d5c17b5c54eb9fd560027119ad3dbe2 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Mon, 15 May 2017 23:22:13 +0200 Subject: [PATCH 27/41] Use one line for each declaration, it enhances code readability (codacy) --- .../com/owncloud/android/authentication/AccountUtils.java | 5 ++++- .../com/owncloud/android/files/services/IndexedForest.java | 3 ++- src/main/java/com/owncloud/android/ui/CustomPopup.java | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/owncloud/android/authentication/AccountUtils.java b/src/main/java/com/owncloud/android/authentication/AccountUtils.java index 998ec5d452..4e0b99ad09 100644 --- a/src/main/java/com/owncloud/android/authentication/AccountUtils.java +++ b/src/main/java/com/owncloud/android/authentication/AccountUtils.java @@ -208,7 +208,10 @@ public class AccountUtils { if (currentAccountVersion == null) { Log_OC.i(TAG, "Upgrading accounts to account version #" + ACCOUNT_VERSION); Account[] ocAccounts = accountMgr.getAccountsByType(MainApp.getAccountType()); - String serverUrl, username, newAccountName, password; + String serverUrl; + String username; + String newAccountName; + String password; Account newAccount; for (Account account : ocAccounts) { // build new account name diff --git a/src/main/java/com/owncloud/android/files/services/IndexedForest.java b/src/main/java/com/owncloud/android/files/services/IndexedForest.java index a3c051abe6..dbeb8a225b 100644 --- a/src/main/java/com/owncloud/android/files/services/IndexedForest.java +++ b/src/main/java/com/owncloud/android/files/services/IndexedForest.java @@ -115,7 +115,8 @@ public class IndexedForest { String currentPath = remotePath; String parentPath = null; String parentKey = null; - Node currentNode = valuedNode, parentNode = null; + Node currentNode = valuedNode; + Node parentNode = null; boolean linked = false; while (!OCFile.ROOT_PATH.equals(currentPath) && !linked) { parentPath = new File(currentPath).getParent(); diff --git a/src/main/java/com/owncloud/android/ui/CustomPopup.java b/src/main/java/com/owncloud/android/ui/CustomPopup.java index 88c7ee2c1c..24d302edc4 100644 --- a/src/main/java/com/owncloud/android/ui/CustomPopup.java +++ b/src/main/java/com/owncloud/android/ui/CustomPopup.java @@ -136,7 +136,8 @@ public class CustomPopup { LayoutParams.WRAP_CONTENT)); root.measure(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); - int rootW = root.getWidth(), rootH = root.getHeight(); + int rootW = root.getWidth(); + int rootH = root.getHeight(); int screenW = mWManager.getDefaultDisplay().getWidth(); int xpos = ((screenW - rootW) / 2) + x; From b44320076b7cc709a169ac8cefa91d958aacb90d Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Mon, 15 May 2017 23:23:54 +0200 Subject: [PATCH 28/41] Fields should be declared at the top of the class, before any method declarations, constructors, initializers or inner classes (codacy) --- .../files/InstantUploadBroadcastReceiver.java | 14 +++++++------- .../ui/dialog/CreateFolderDialogFragment.java | 5 ++--- .../ui/dialog/RenameFileDialogFragment.java | 4 ++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/owncloud/android/files/InstantUploadBroadcastReceiver.java b/src/main/java/com/owncloud/android/files/InstantUploadBroadcastReceiver.java index 34b07b64d4..977b090077 100644 --- a/src/main/java/com/owncloud/android/files/InstantUploadBroadcastReceiver.java +++ b/src/main/java/com/owncloud/android/files/InstantUploadBroadcastReceiver.java @@ -56,6 +56,13 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { // http://developer.android.com/reference/android/hardware/Camera.html#ACTION_NEW_VIDEO private static final String NEW_VIDEO_ACTION = "android.hardware.action.NEW_VIDEO"; + /** + * Because we support NEW_PHOTO_ACTION and NEW_PHOTO_ACTION_UNOFFICIAL it can happen that + * handleNewPictureAction is called twice for the same photo. Use this simple static variable to + * remember last uploaded photo to filter duplicates. Must not be null! + */ + static String lastUploadedPhotoPath = ""; + @Override public void onReceive(Context context, Intent intent) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { @@ -75,13 +82,6 @@ public class InstantUploadBroadcastReceiver extends BroadcastReceiver { } } - /** - * Because we support NEW_PHOTO_ACTION and NEW_PHOTO_ACTION_UNOFFICIAL it can happen that - * handleNewPictureAction is called twice for the same photo. Use this simple static variable to - * remember last uploaded photo to filter duplicates. Must not be null! - */ - static String lastUploadedPhotoPath = ""; - private void handleNewPictureAction(Context context, Intent intent) { Cursor c = null; String file_path = null; diff --git a/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java index e1c6b9b8b0..774889382f 100644 --- a/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java +++ b/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java @@ -49,6 +49,8 @@ public class CreateFolderDialogFragment public static final String CREATE_FOLDER_FRAGMENT = "CREATE_FOLDER_FRAGMENT"; + private OCFile mParentFolder; + /** * Public factory method to create new CreateFolderDialogFragment instances. * @@ -63,9 +65,6 @@ public class CreateFolderDialogFragment return frag; } - - private OCFile mParentFolder; - @Override public Dialog onCreateDialog(Bundle savedInstanceState) { diff --git a/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java b/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java index 2b0035a8de..817f1faf78 100644 --- a/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java +++ b/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java @@ -54,6 +54,8 @@ public class RenameFileDialogFragment private static final String ARG_TARGET_FILE = "TARGET_FILE"; + private OCFile mTargetFile; + /** * Public factory method to create new RenameFileDialogFragment instances. * @@ -69,8 +71,6 @@ public class RenameFileDialogFragment } - private OCFile mTargetFile; - @Override public Dialog onCreateDialog(Bundle savedInstanceState) { mTargetFile = getArguments().getParcelable(ARG_TARGET_FILE); From 03a81d902d4f2e6498bc0de1efd6d38299a105f5 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Mon, 15 May 2017 23:27:13 +0200 Subject: [PATCH 29/41] An instanceof check is being performed on the caught exception. Create a separate catch clause for this exception type. (codacy) --- .../owncloud/android/datamodel/ThumbnailsCacheManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java index ccf351f71a..94e09a1e1c 100644 --- a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java +++ b/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java @@ -425,12 +425,13 @@ public class ThumbnailsCacheManager { thumbnail = doFileInBackground(mFile); } } + } // the app should never break due to a problem with thumbnails + catch (OutOfMemoryError t) { + Log_OC.e(TAG, "Generation of thumbnail for " + mFile.getAbsolutePath() + " failed", t); + System.gc(); } catch (Throwable t) { // the app should never break due to a problem with thumbnails Log_OC.e(TAG, "Generation of thumbnail for " + mFile.getAbsolutePath() + " failed", t); - if (t instanceof OutOfMemoryError) { - System.gc(); - } } return thumbnail; From a14401a2e4cab59157d568dfe98e270d67be59e3 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Tue, 16 May 2017 00:08:04 +0200 Subject: [PATCH 30/41] extract ContentValue object creation to private methods --- .../datamodel/FileDataStorageManager.java | 135 +++++++++--------- 1 file changed, 69 insertions(+), 66 deletions(-) diff --git a/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java index bf027041de..fad4b094b8 100644 --- a/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java +++ b/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -279,49 +279,18 @@ public class FileDataStorageManager { Log_OC.d(TAG, "Saving folder " + folder.getRemotePath() + " with " + updatedFiles.size() + " children and " + filesToRemove.size() + " files to remove"); - ArrayList operations = - new ArrayList(updatedFiles.size()); + ArrayList operations = new ArrayList<>(updatedFiles.size()); // prepare operations to insert or update files to save in the given folder for (OCFile file : updatedFiles) { - ContentValues cv = new ContentValues(); - cv.put(ProviderTableMeta.FILE_MODIFIED, file.getModificationTimestamp()); - cv.put( - ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA, - file.getModificationTimestampAtLastSyncForData() - ); - cv.put(ProviderTableMeta.FILE_CREATION, file.getCreationTimestamp()); - cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, file.getFileLength()); - cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, file.getMimetype()); - cv.put(ProviderTableMeta.FILE_NAME, file.getFileName()); - //cv.put(ProviderTableMeta.FILE_PARENT, file.getParentId()); - cv.put(ProviderTableMeta.FILE_PARENT, folder.getFileId()); - cv.put(ProviderTableMeta.FILE_PATH, file.getRemotePath()); - if (!file.isFolder()) { - cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getStoragePath()); - } - cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, mAccount.name); - cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE, file.getLastSyncDateForProperties()); - cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA, file.getLastSyncDateForData()); - cv.put(ProviderTableMeta.FILE_KEEP_IN_SYNC, file.isAvailableOffline() ? 1 : 0); - cv.put(ProviderTableMeta.FILE_ETAG, file.getEtag()); - cv.put(ProviderTableMeta.FILE_SHARED_VIA_LINK, file.isSharedViaLink() ? 1 : 0); - cv.put(ProviderTableMeta.FILE_SHARED_WITH_SHAREE, file.isSharedWithSharee() ? 1 : 0); - cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, file.getPublicLink()); - cv.put(ProviderTableMeta.FILE_PERMISSIONS, file.getPermissions()); - cv.put(ProviderTableMeta.FILE_REMOTE_ID, file.getRemoteId()); - cv.put(ProviderTableMeta.FILE_UPDATE_THUMBNAIL, file.needsUpdateThumbnail()); - cv.put(ProviderTableMeta.FILE_IS_DOWNLOADING, file.isDownloading()); - cv.put(ProviderTableMeta.FILE_ETAG_IN_CONFLICT, file.getEtagInConflict()); - cv.put(ProviderTableMeta.FILE_FAVORITE, file.getIsFavorite()); + ContentValues cv = createContentValueForFile(file, folder); boolean existsByPath = fileExists(file.getRemotePath()); if (existsByPath || fileExists(file.getFileId())) { // updating an existing file - operations.add(ContentProviderOperation.newUpdate(ProviderTableMeta.CONTENT_URI). - withValues(cv). - withSelection(ProviderTableMeta._ID + "=?", - new String[]{String.valueOf(file.getFileId())}) + operations.add(ContentProviderOperation.newUpdate(ProviderTableMeta.CONTENT_URI) + .withValues(cv) + .withSelection(ProviderTableMeta._ID + "=?", new String[]{String.valueOf(file.getFileId())}) .build()); } else { @@ -332,17 +301,14 @@ public class FileDataStorageManager { } // prepare operations to remove files in the given folder - String where = ProviderTableMeta.FILE_ACCOUNT_OWNER + AND + - ProviderTableMeta.FILE_PATH + "=?"; + String where = ProviderTableMeta.FILE_ACCOUNT_OWNER + AND + ProviderTableMeta.FILE_PATH + "=?"; String [] whereArgs = null; for (OCFile file : filesToRemove) { if (file.getParentId() == folder.getFileId()) { whereArgs = new String[]{mAccount.name, file.getRemotePath()}; if (file.isFolder()) { operations.add(ContentProviderOperation.newDelete( - ContentUris.withAppendedId( - ProviderTableMeta.CONTENT_URI_DIR, file.getFileId() - ) + ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_DIR, file.getFileId()) ).withSelection(where, whereArgs).build()); File localFolder = new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, file)); @@ -351,8 +317,7 @@ public class FileDataStorageManager { } } else { operations.add(ContentProviderOperation.newDelete( - ContentUris.withAppendedId( - ProviderTableMeta.CONTENT_URI_FILE, file.getFileId() + ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_FILE, file.getFileId() ) ).withSelection(where, whereArgs).build()); @@ -366,29 +331,7 @@ public class FileDataStorageManager { } // update metadata of folder - ContentValues cv = new ContentValues(); - cv.put(ProviderTableMeta.FILE_MODIFIED, folder.getModificationTimestamp()); - cv.put( - ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA, - folder.getModificationTimestampAtLastSyncForData() - ); - cv.put(ProviderTableMeta.FILE_CREATION, folder.getCreationTimestamp()); - cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, 0); - cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, folder.getMimetype()); - cv.put(ProviderTableMeta.FILE_NAME, folder.getFileName()); - cv.put(ProviderTableMeta.FILE_PARENT, folder.getParentId()); - cv.put(ProviderTableMeta.FILE_PATH, folder.getRemotePath()); - cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, mAccount.name); - cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE, folder.getLastSyncDateForProperties()); - cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA, folder.getLastSyncDateForData()); - cv.put(ProviderTableMeta.FILE_KEEP_IN_SYNC, folder.isAvailableOffline() ? 1 : 0); - cv.put(ProviderTableMeta.FILE_ETAG, folder.getEtag()); - cv.put(ProviderTableMeta.FILE_SHARED_VIA_LINK, folder.isSharedViaLink() ? 1 : 0); - cv.put(ProviderTableMeta.FILE_SHARED_WITH_SHAREE, folder.isSharedWithSharee() ? 1 : 0); - cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, folder.getPublicLink()); - cv.put(ProviderTableMeta.FILE_PERMISSIONS, folder.getPermissions()); - cv.put(ProviderTableMeta.FILE_REMOTE_ID, folder.getRemoteId()); - cv.put(ProviderTableMeta.FILE_FAVORITE, folder.getIsFavorite()); + ContentValues cv = createContentValueForFile(folder); operations.add(ContentProviderOperation.newUpdate(ProviderTableMeta.CONTENT_URI). withValues(cv). @@ -431,7 +374,67 @@ public class FileDataStorageManager { } } } + } + private ContentValues createContentValueForFile(OCFile folder) { + ContentValues cv = new ContentValues(); + cv.put(ProviderTableMeta.FILE_MODIFIED, folder.getModificationTimestamp()); + cv.put( + ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA, + folder.getModificationTimestampAtLastSyncForData() + ); + cv.put(ProviderTableMeta.FILE_CREATION, folder.getCreationTimestamp()); + cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, 0); + cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, folder.getMimetype()); + cv.put(ProviderTableMeta.FILE_NAME, folder.getFileName()); + cv.put(ProviderTableMeta.FILE_PARENT, folder.getParentId()); + cv.put(ProviderTableMeta.FILE_PATH, folder.getRemotePath()); + cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, mAccount.name); + cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE, folder.getLastSyncDateForProperties()); + cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA, folder.getLastSyncDateForData()); + cv.put(ProviderTableMeta.FILE_KEEP_IN_SYNC, folder.isAvailableOffline() ? 1 : 0); + cv.put(ProviderTableMeta.FILE_ETAG, folder.getEtag()); + cv.put(ProviderTableMeta.FILE_SHARED_VIA_LINK, folder.isSharedViaLink() ? 1 : 0); + cv.put(ProviderTableMeta.FILE_SHARED_WITH_SHAREE, folder.isSharedWithSharee() ? 1 : 0); + cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, folder.getPublicLink()); + cv.put(ProviderTableMeta.FILE_PERMISSIONS, folder.getPermissions()); + cv.put(ProviderTableMeta.FILE_REMOTE_ID, folder.getRemoteId()); + cv.put(ProviderTableMeta.FILE_FAVORITE, folder.getIsFavorite()); + return cv; + } + + private ContentValues createContentValueForFile(OCFile file, OCFile folder) { + ContentValues cv = new ContentValues(); + cv.put(ProviderTableMeta.FILE_MODIFIED, file.getModificationTimestamp()); + cv.put( + ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA, + file.getModificationTimestampAtLastSyncForData() + ); + cv.put(ProviderTableMeta.FILE_CREATION, file.getCreationTimestamp()); + cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, file.getFileLength()); + cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, file.getMimetype()); + cv.put(ProviderTableMeta.FILE_NAME, file.getFileName()); + //cv.put(ProviderTableMeta.FILE_PARENT, file.getParentId()); + cv.put(ProviderTableMeta.FILE_PARENT, folder.getFileId()); + cv.put(ProviderTableMeta.FILE_PATH, file.getRemotePath()); + if (!file.isFolder()) { + cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getStoragePath()); + } + cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, mAccount.name); + cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE, file.getLastSyncDateForProperties()); + cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA, file.getLastSyncDateForData()); + cv.put(ProviderTableMeta.FILE_KEEP_IN_SYNC, file.isAvailableOffline() ? 1 : 0); + cv.put(ProviderTableMeta.FILE_ETAG, file.getEtag()); + cv.put(ProviderTableMeta.FILE_SHARED_VIA_LINK, file.isSharedViaLink() ? 1 : 0); + cv.put(ProviderTableMeta.FILE_SHARED_WITH_SHAREE, file.isSharedWithSharee() ? 1 : 0); + cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, file.getPublicLink()); + cv.put(ProviderTableMeta.FILE_PERMISSIONS, file.getPermissions()); + cv.put(ProviderTableMeta.FILE_REMOTE_ID, file.getRemoteId()); + cv.put(ProviderTableMeta.FILE_UPDATE_THUMBNAIL, file.needsUpdateThumbnail()); + cv.put(ProviderTableMeta.FILE_IS_DOWNLOADING, file.isDownloading()); + cv.put(ProviderTableMeta.FILE_ETAG_IN_CONFLICT, file.getEtagInConflict()); + cv.put(ProviderTableMeta.FILE_FAVORITE, file.getIsFavorite()); + return cv; } From 0fa8df201def128e4981c7460bc07060f44236ff Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Tue, 16 May 2017 00:18:24 +0200 Subject: [PATCH 31/41] A switch statement does not contain a break (codacy) --- .../java/com/owncloud/android/ui/activity/DrawerActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java index 810628d322..559c660313 100644 --- a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java @@ -508,6 +508,7 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU case Menu.NONE: // account clicked accountClicked(menuItem.getTitle().toString()); + break; default: Log_OC.i(TAG, "Unknown drawer menu item clicked: " + menuItem.getTitle()); } From 766a691a1970ac190e85c6a1e9e9cc7f4ba74cd9 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Tue, 16 May 2017 00:20:35 +0200 Subject: [PATCH 32/41] A switch statement does not contain a break (codacy) --- .../com/owncloud/android/ui/activity/FileDisplayActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java index 8286dd1ceb..781f26f7ed 100644 --- a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -757,7 +757,7 @@ public class FileDisplayActivity extends HookActivity R.drawable.ic_view_list)); getListOfFilesFragment().setGridAsPreferred(); } - return true; + break; } default: retval = super.onOptionsItemSelected(item); From 6bc48fdb34d7356e09195dac0ca164da06c41500 Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Wed, 17 May 2017 14:07:04 +0200 Subject: [PATCH 33/41] store lint output in nextcloud --- .drone.yml | 2 +- .drone.yml.sig | 2 +- scripts/lint/lint-up-wrapper.sh | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100755 scripts/lint/lint-up-wrapper.sh diff --git a/.drone.yml b/.drone.yml index 4cb0358c1f..6879b0097e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,7 +34,7 @@ pipeline: # needs gplay - sed -i '/com.google.*.gms/s/^.*\/\///g' build.gradle - export BRANCH=$(scripts/lint/getBranchName.sh ${GIT_USERNAME} ${GIT_TOKEN} ${DRONE_PULL_REQUEST}) - - ruby scripts/lint/lint-up.rb ${GIT_USERNAME} ${GIT_TOKEN} $BRANCH + - scripts/lint/lint-up-wrapper.sh ${GIT_USERNAME} ${GIT_TOKEN} $BRANCH ${LOG_USERNAME} ${LOG_PASSWORD} ${DRONE_BUILD_NUMBER} when: matrix: FLAVOUR: Modified diff --git a/.drone.yml.sig b/.drone.yml.sig index 07e4da62e0..50bf8ccf99 100644 --- a/.drone.yml.sig +++ b/.drone.yml.sig @@ -1 +1 @@ -eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgdGVzdDoKICAgIGltYWdlOiBuZXh0Y2xvdWRjaS9hbmRyb2lkOmFuZHJvaWQtMTgKICAgIGNvbW1hbmRzOgogICAgICAjIHVuY29tbWVudCBncGxheSBmb3IgR3BsYXksIE1vZGlmaWVkIG9ubHkKICAgICAgLSBzaCAtYyAiaWYgWyAnJEZMQVZPVVInICE9ICdHZW5lcmljJyBdOyB0aGVuIHNlZCAtaSAnL2NvbS5nb29nbGUuKi5nbXMvcy9eLipcL1wvLy9nJyBidWlsZC5ncmFkbGU7IGZpIgoKICAgICAgLSBlY2hvIG5vIHwgYW5kcm9pZCBjcmVhdGUgYXZkIC0tZm9yY2UgLW4gdGVzdCAtdCAkQU5EUk9JRF9UQVJHRVQgLS1hYmkgJEFORFJPSURfQUJJIC1jIDIwTQogICAgICAtIGVtdWxhdG9yIC1hdmQgdGVzdCAtbm8td2luZG93ICYKICAgICAgLSAuL3dhaXRfZm9yX2VtdWxhdG9yLnNoCgogICAgICAjIGJ1aWxkIGFwcCBhbmQgYXNzZW1ibGUgQVBLLCBpbiBkZWJ1ZyBtb2RlCiAgICAgIC0gLi9ncmFkbGV3IGFzc2VtYmxlJHtGTEFWT1VSfQoKICAgICAgIyBydW4gYWxsIHRoZSBpbnN0cnVtZW50ZWQgdGVzdHMgb2YgYXBwIG1vZHVsZSAtIERJU0FCTEVEIHVudGlsIHdlIGdldCBhbiBzdGFibGUgc2V0dXAgZm9yIEVzcHJlc3NvIGluIFRyYXZpcwogICAgICAjIC0gLi9ncmFkbGV3IGNvbm5lY3RlZERlYnVnQW5kcm9pZFRlc3QgLS1pbmZvCgogICAgICAjIGluc3RhbGwgYXBwLCB0aGVuIGFzc2VtYmxlIGFuZCBpbnN0YWxsIGluc3RydW1lbnRlZCB0ZXN0cyBvZiBhcHAgbW9kdWxlCiAgICAgIC0gLi9ncmFkbGV3IDppbnN0YWxsJHtGTEFWT1VSfURlYnVnCiAgICAgIC0gLi9ncmFkbGV3IDppbnN0YWxsJHtGTEFWT1VSfURlYnVnQW5kcm9pZFRlc3QKCiAgICAgICMgcnVuIHNhbXBsZSBpbnN0cnVtZW50ZWQgdW5pdCB0ZXN0CiAgICAgICMgVE9ETyBmYWlscyBiZWNhdXNlIHRlc3QgcnVubmVyIGlzIG5vdCBhdmFpbGFibGUKICAgICAgIy0gYWRiIHNoZWxsIGFtIGluc3RydW1lbnQgLXcgLWUgZGVidWcgZmFsc2UgLWUgY2xhc3MgY29tLm93bmNsb3VkLmFuZHJvaWQuZGF0YW1vZGVsLk9DRmlsZVVuaXRUZXN0IGNvbS5vd25jbG91ZC5hbmRyb2lkLnRlc3QvYW5kcm9pZC5zdXBwb3J0LnRlc3QucnVubmVyLkFuZHJvaWRKVW5pdFJ1bm5lcgoKICAgIGVudmlyb25tZW50OgogICAgICAtIEFORFJPSURfVEFSR0VUPWFuZHJvaWQtMjQKICAgICAgLSBBTkRST0lEX0FCST1hcm1lYWJpLXY3YQogICAgICAtIExEX0xJQlJBUllfUEFUSD0vdXNyL2xpYi94ODZfNjQtbGludXgtZ251Lzovb3B0L2FuZHJvaWQtc2RrLWxpbnV4L3Rvb2xzL2xpYjY0L2dsZXNfbWVzYS8KCiAgbGludDoKICAgICAgaW1hZ2U6IG5leHRjbG91ZGNpL2FuZHJvaWQ6YW5kcm9pZC0xOAogICAgICBjb21tYW5kczoKICAgICAgICAjIG5lZWRzIGdwbGF5CiAgICAgICAgLSBzZWQgLWkgJy9jb20uZ29vZ2xlLiouZ21zL3MvXi4qXC9cLy8vZycgYnVpbGQuZ3JhZGxlCiAgICAgICAgLSBleHBvcnQgQlJBTkNIPSQoc2NyaXB0cy9saW50L2dldEJyYW5jaE5hbWUuc2ggJHtHSVRfVVNFUk5BTUV9ICR7R0lUX1RPS0VOfSAke0RST05FX1BVTExfUkVRVUVTVH0pCiAgICAgICAgLSBydWJ5IHNjcmlwdHMvbGludC9saW50LXVwLnJiICR7R0lUX1VTRVJOQU1FfSAke0dJVF9UT0tFTn0gJEJSQU5DSAogICAgICB3aGVuOgogICAgICAgIG1hdHJpeDoKICAgICAgICAgIEZMQVZPVVI6IE1vZGlmaWVkCgptYXRyaXg6CiAgRkxBVk9VUjoKICAgIC0gR2VuZXJpYwogICAgLSBHcGxheQogICAgLSBNb2RpZmllZAoKYnJhbmNoZXM6IG1hc3Rlcg.BJDcPdoKinGxnz6zT8dBxvwE_DBi9QyzXXnk0LOOdV4 \ No newline at end of file +eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgdGVzdDoKICAgIGltYWdlOiBuZXh0Y2xvdWRjaS9hbmRyb2lkOmFuZHJvaWQtMTgKICAgIGNvbW1hbmRzOgogICAgICAjIHVuY29tbWVudCBncGxheSBmb3IgR3BsYXksIE1vZGlmaWVkIG9ubHkKICAgICAgLSBzaCAtYyAiaWYgWyAnJEZMQVZPVVInICE9ICdHZW5lcmljJyBdOyB0aGVuIHNlZCAtaSAnL2NvbS5nb29nbGUuKi5nbXMvcy9eLipcL1wvLy9nJyBidWlsZC5ncmFkbGU7IGZpIgoKICAgICAgLSBlY2hvIG5vIHwgYW5kcm9pZCBjcmVhdGUgYXZkIC0tZm9yY2UgLW4gdGVzdCAtdCAkQU5EUk9JRF9UQVJHRVQgLS1hYmkgJEFORFJPSURfQUJJIC1jIDIwTQogICAgICAtIGVtdWxhdG9yIC1hdmQgdGVzdCAtbm8td2luZG93ICYKICAgICAgLSAuL3dhaXRfZm9yX2VtdWxhdG9yLnNoCgogICAgICAjIGJ1aWxkIGFwcCBhbmQgYXNzZW1ibGUgQVBLLCBpbiBkZWJ1ZyBtb2RlCiAgICAgIC0gLi9ncmFkbGV3IGFzc2VtYmxlJHtGTEFWT1VSfQoKICAgICAgIyBydW4gYWxsIHRoZSBpbnN0cnVtZW50ZWQgdGVzdHMgb2YgYXBwIG1vZHVsZSAtIERJU0FCTEVEIHVudGlsIHdlIGdldCBhbiBzdGFibGUgc2V0dXAgZm9yIEVzcHJlc3NvIGluIFRyYXZpcwogICAgICAjIC0gLi9ncmFkbGV3IGNvbm5lY3RlZERlYnVnQW5kcm9pZFRlc3QgLS1pbmZvCgogICAgICAjIGluc3RhbGwgYXBwLCB0aGVuIGFzc2VtYmxlIGFuZCBpbnN0YWxsIGluc3RydW1lbnRlZCB0ZXN0cyBvZiBhcHAgbW9kdWxlCiAgICAgIC0gLi9ncmFkbGV3IDppbnN0YWxsJHtGTEFWT1VSfURlYnVnCiAgICAgIC0gLi9ncmFkbGV3IDppbnN0YWxsJHtGTEFWT1VSfURlYnVnQW5kcm9pZFRlc3QKCiAgICAgICMgcnVuIHNhbXBsZSBpbnN0cnVtZW50ZWQgdW5pdCB0ZXN0CiAgICAgICMgVE9ETyBmYWlscyBiZWNhdXNlIHRlc3QgcnVubmVyIGlzIG5vdCBhdmFpbGFibGUKICAgICAgIy0gYWRiIHNoZWxsIGFtIGluc3RydW1lbnQgLXcgLWUgZGVidWcgZmFsc2UgLWUgY2xhc3MgY29tLm93bmNsb3VkLmFuZHJvaWQuZGF0YW1vZGVsLk9DRmlsZVVuaXRUZXN0IGNvbS5vd25jbG91ZC5hbmRyb2lkLnRlc3QvYW5kcm9pZC5zdXBwb3J0LnRlc3QucnVubmVyLkFuZHJvaWRKVW5pdFJ1bm5lcgoKICAgIGVudmlyb25tZW50OgogICAgICAtIEFORFJPSURfVEFSR0VUPWFuZHJvaWQtMjQKICAgICAgLSBBTkRST0lEX0FCST1hcm1lYWJpLXY3YQogICAgICAtIExEX0xJQlJBUllfUEFUSD0vdXNyL2xpYi94ODZfNjQtbGludXgtZ251Lzovb3B0L2FuZHJvaWQtc2RrLWxpbnV4L3Rvb2xzL2xpYjY0L2dsZXNfbWVzYS8KCiAgbGludDoKICAgICAgaW1hZ2U6IG5leHRjbG91ZGNpL2FuZHJvaWQ6YW5kcm9pZC0xOAogICAgICBjb21tYW5kczoKICAgICAgICAjIG5lZWRzIGdwbGF5CiAgICAgICAgLSBzZWQgLWkgJy9jb20uZ29vZ2xlLiouZ21zL3MvXi4qXC9cLy8vZycgYnVpbGQuZ3JhZGxlCiAgICAgICAgLSBleHBvcnQgQlJBTkNIPSQoc2NyaXB0cy9saW50L2dldEJyYW5jaE5hbWUuc2ggJHtHSVRfVVNFUk5BTUV9ICR7R0lUX1RPS0VOfSAke0RST05FX1BVTExfUkVRVUVTVH0pCiAgICAgICAgLSBzY3JpcHRzL2xpbnQvbGludC11cC13cmFwcGVyLnNoICR7R0lUX1VTRVJOQU1FfSAke0dJVF9UT0tFTn0gJEJSQU5DSCAke0xPR19VU0VSTkFNRX0gJHtMT0dfUEFTU1dPUkR9ICR7RFJPTkVfQlVJTERfTlVNQkVSfQogICAgICB3aGVuOgogICAgICAgIG1hdHJpeDoKICAgICAgICAgIEZMQVZPVVI6IE1vZGlmaWVkCgptYXRyaXg6CiAgRkxBVk9VUjoKICAgIC0gR2VuZXJpYwogICAgLSBHcGxheQogICAgLSBNb2RpZmllZAoKYnJhbmNoZXM6IG1hc3Rlcg.vRQiBogC3hjPLCVvLM0-Qrbvk4hnwKscwaPRBlyc8NM \ No newline at end of file diff --git a/scripts/lint/lint-up-wrapper.sh b/scripts/lint/lint-up-wrapper.sh new file mode 100755 index 0000000000..de4c2ee6d6 --- /dev/null +++ b/scripts/lint/lint-up-wrapper.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +#1: GIT_USERNAME +#2: GIT_TOKEN +#3: BRANCH +#4: LOG_USERNAME +#5: LOG_PASSWORD +#6: DRONE_BUILD_NUMBER + +cd `dirname $0` +ruby ./lint-up.rb $1 $2 $3 + +if [ $? -eq 0 ]; then + echo "New master at: https://nextcloud.kaminsky.me/index.php/s/tXwtChzyqMj6I8v" + curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/droneLogs/master.html --upload-file ../../build/reports/lint/lint.html +else + echo "New results at https://nextcloud.kaminsky.me/index.php/s/tXwtChzyqMj6I8v ->" $6.html + curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/droneLogs/$6.html --upload-file ../../build/reports/lint/lint.html +fi \ No newline at end of file From 306d0db5331b2185161427b766efe8ad1188045b Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Wed, 17 May 2017 14:35:02 +0200 Subject: [PATCH 34/41] fixed relative paths --- scripts/lint/lint-up-wrapper.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/lint/lint-up-wrapper.sh b/scripts/lint/lint-up-wrapper.sh index de4c2ee6d6..16bba8ac7a 100755 --- a/scripts/lint/lint-up-wrapper.sh +++ b/scripts/lint/lint-up-wrapper.sh @@ -7,13 +7,12 @@ #5: LOG_PASSWORD #6: DRONE_BUILD_NUMBER -cd `dirname $0` -ruby ./lint-up.rb $1 $2 $3 +ruby scripts/lint/lint-up.rb $1 $2 $3 if [ $? -eq 0 ]; then echo "New master at: https://nextcloud.kaminsky.me/index.php/s/tXwtChzyqMj6I8v" - curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/droneLogs/master.html --upload-file ../../build/reports/lint/lint.html + curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/droneLogs/master.html --upload-file build/reports/lint/lint.html else echo "New results at https://nextcloud.kaminsky.me/index.php/s/tXwtChzyqMj6I8v ->" $6.html - curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/droneLogs/$6.html --upload-file ../../build/reports/lint/lint.html -fi \ No newline at end of file + curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/droneLogs/$6.html --upload-file build/reports/lint/lint.html +fi From 4460c2135cc045005a57c6ba25fcf781da42c585 Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Thu, 18 May 2017 07:56:47 +0200 Subject: [PATCH 35/41] npe if expiring backups after fresh install --- .../java/com/owncloud/android/services/ContactsBackupJob.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/owncloud/android/services/ContactsBackupJob.java b/src/main/java/com/owncloud/android/services/ContactsBackupJob.java index 036e700709..223b5bac47 100644 --- a/src/main/java/com/owncloud/android/services/ContactsBackupJob.java +++ b/src/main/java/com/owncloud/android/services/ContactsBackupJob.java @@ -173,7 +173,9 @@ public class ContactsBackupJob extends Job { cal.add(Calendar.DAY_OF_YEAR, -daysToExpire); Long timestampToExpire = cal.getTimeInMillis(); - Log_OC.d(TAG, "expire: " + daysToExpire + " " + backupFolder.getFileName()); + if (backupFolder != null) { + Log_OC.d(TAG, "expire: " + daysToExpire + " " + backupFolder.getFileName()); + } Vector backups = storageManager.getFolderContent(backupFolder, false); From 523c5c5a41761a4035b4f59bb73ac57f14cf061e Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Thu, 18 May 2017 07:57:13 +0200 Subject: [PATCH 36/41] fix license comment --- .../com/owncloud/android/services/ContactsBackupJob.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/owncloud/android/services/ContactsBackupJob.java b/src/main/java/com/owncloud/android/services/ContactsBackupJob.java index 223b5bac47..fae51872d6 100644 --- a/src/main/java/com/owncloud/android/services/ContactsBackupJob.java +++ b/src/main/java/com/owncloud/android/services/ContactsBackupJob.java @@ -1,7 +1,7 @@ -/** - * Nextcloud Android client application - * - * @author Tobias Kaminsky +/* + Nextcloud Android client application + + @author Tobias Kaminsky * Copyright (C) 2017 Tobias Kaminsky * Copyright (C) 2017 Nextcloud GmbH. *

From 315ac57a32c65455b296aae4a8e3869073e9aed4 Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Thu, 18 May 2017 07:58:12 +0200 Subject: [PATCH 37/41] fix license comment --- .../owncloud/android/services/ContactsBackupJob.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/owncloud/android/services/ContactsBackupJob.java b/src/main/java/com/owncloud/android/services/ContactsBackupJob.java index fae51872d6..a81140d0ee 100644 --- a/src/main/java/com/owncloud/android/services/ContactsBackupJob.java +++ b/src/main/java/com/owncloud/android/services/ContactsBackupJob.java @@ -1,20 +1,20 @@ /* - Nextcloud Android client application - - @author Tobias Kaminsky + * Nextcloud Android client application + * + * @author Tobias Kaminsky * Copyright (C) 2017 Tobias Kaminsky * Copyright (C) 2017 Nextcloud GmbH. - *

+ * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * at your option) any later version. - *

+ * * 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 Affero General Public License for more details. - *

+ * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ From 778829d69c039c1a98fffcba6cec797179ef959c Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Thu, 18 May 2017 10:04:35 +0200 Subject: [PATCH 38/41] - always update contacts backup folder - if file is not downloaded, download it then show content --- .../contactsbackup/ContactListFragment.java | 38 ++++++++++- .../ContactsBackupFragment.java | 63 +++++++++++++++---- .../res/layout/contacts_backup_fragment.xml | 6 +- 3 files changed, 91 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java index ba4e5297e4..e1820499a3 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java @@ -23,9 +23,11 @@ package com.owncloud.android.ui.fragment.contactsbackup; import android.Manifest; import android.accounts.Account; +import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.content.IntentFilter; import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -53,6 +55,7 @@ import android.widget.LinearLayout; import com.evernote.android.job.JobRequest; import com.evernote.android.job.util.support.PersistableBundleCompat; import com.owncloud.android.R; +import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader; import com.owncloud.android.lib.common.utils.Log_OC; @@ -104,6 +107,7 @@ public class ContactListFragment extends FileFragment { public Button restoreContacts; private ContactListAdapter contactListAdapter; + private Account account; public static ContactListFragment newInstance(OCFile file, Account account) { ContactListFragment frag = new ContactListFragment(); @@ -142,13 +146,19 @@ public class ContactListFragment extends FileFragment { try { OCFile ocFile = getArguments().getParcelable(FILE_NAME); setFile(ocFile); - Account account = getArguments().getParcelable(ACCOUNT); + account = getArguments().getParcelable(ACCOUNT); if (!ocFile.isDown()) { Intent i = new Intent(getContext(), FileDownloader.class); i.putExtra(FileDownloader.EXTRA_ACCOUNT, account); i.putExtra(FileDownloader.EXTRA_FILE, ocFile); getContext().startService(i); + + // Listen for download messages + IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.getDownloadAddedMessage()); + downloadIntentFilter.addAction(FileDownloader.getDownloadFinishMessage()); + DownloadFinishReceiver mDownloadFinishReceiver = new DownloadFinishReceiver(); + getContext().registerReceiver(mDownloadFinishReceiver, downloadIntentFilter); } else { File file = new File(ocFile.getStoragePath()); vCards.addAll(Ezvcard.parse(file).all()); @@ -446,6 +456,27 @@ public class ContactListFragment extends FileFragment { return displayName; } } + + private class DownloadFinishReceiver extends BroadcastReceiver { + + @Override + public void onReceive(Context context, Intent intent) { + if (intent.getAction().equalsIgnoreCase(FileDownloader.getDownloadFinishMessage())){ + String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH); + + FileDataStorageManager storageManager = new FileDataStorageManager(account, + getContext().getContentResolver()); + OCFile ocFile = storageManager.getFileByPath(downloadedRemotePath); + File file = new File(ocFile.getStoragePath()); + + try { + contactListAdapter.replaceVCards(Ezvcard.parse(file).all()); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } } class ContactListAdapter extends RecyclerView.Adapter { @@ -475,6 +506,11 @@ class ContactListAdapter extends RecyclerView.Adapter vCards) { + this.vCards = vCards; + notifyDataSetChanged(); + } + public int[] getCheckedIntArray() { int[] intArray; if (checkedVCards != null && checkedVCards.size() > 0) { diff --git a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java index e133d0a49d..1b8d2e2e5e 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java @@ -1,4 +1,4 @@ -/** +/* * Nextcloud Android client application * * @author Mario Danic @@ -24,6 +24,7 @@ import android.Manifest; import android.accounts.Account; import android.app.DatePickerDialog; import android.content.DialogInterface; +import android.os.AsyncTask; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -44,7 +45,10 @@ import com.evernote.android.job.JobRequest; import com.evernote.android.job.util.support.PersistableBundleCompat; import com.owncloud.android.R; import com.owncloud.android.datamodel.ArbitraryDataProvider; +import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; +import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.operations.RefreshFolderOperation; import com.owncloud.android.services.ContactsBackupJob; import com.owncloud.android.ui.activity.ContactsPreferenceActivity; import com.owncloud.android.ui.fragment.FileFragment; @@ -167,21 +171,54 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi } } - final ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity(); + ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity(); - String backupFolderString = getResources().getString(R.string.contacts_backup_folder) + OCFile.PATH_SEPARATOR; - OCFile backupFolder = contactsPreferenceActivity.getStorageManager().getFileByPath(backupFolderString); + String backupFolderPath = getResources().getString(R.string.contacts_backup_folder) + OCFile.PATH_SEPARATOR; + refreshBackupFolder(backupFolderPath, contactsPreferenceActivity); + } - Vector backupFiles = contactsPreferenceActivity.getStorageManager().getFolderContent(backupFolder, - false); + private void refreshBackupFolder(final String backupFolderPath, + final ContactsPreferenceActivity contactsPreferenceActivity) { + AsyncTask task = new AsyncTask() { + @Override + protected Boolean doInBackground(String... path) { + FileDataStorageManager storageManager = new FileDataStorageManager(account, + getActivity().getContentResolver()); - if (backupFiles == null || backupFiles.size() == 0) { - contactsRestoreHeader.setVisibility(View.GONE); - contactsDatePickerBtn.setVisibility(View.GONE); - } else { - contactsRestoreHeader.setVisibility(View.VISIBLE); - contactsDatePickerBtn.setVisibility(View.VISIBLE); - } + RemoteOperationResult result = new RemoteOperationResult(RemoteOperationResult.ResultCode.UNKNOWN_ERROR); + try { + OCFile folder = storageManager.getFileByPath(path[0]); + RefreshFolderOperation operation = new RefreshFolderOperation(folder, System.currentTimeMillis(), + false, false, false, storageManager, account, getContext()); + + result = operation.execute(account, getContext()); + } catch (Exception e) { + e.printStackTrace(); + } + + return result.isSuccess(); + } + + @Override + protected void onPostExecute(Boolean result) { + if (result) { + OCFile backupFolder = contactsPreferenceActivity.getStorageManager().getFileByPath(backupFolderPath); + + Vector backupFiles = contactsPreferenceActivity.getStorageManager() + .getFolderContent(backupFolder, false); + + if (backupFiles == null || backupFiles.size() == 0) { + contactsRestoreHeader.setVisibility(View.GONE); + contactsDatePickerBtn.setVisibility(View.GONE); + } else { + contactsRestoreHeader.setVisibility(View.VISIBLE); + contactsDatePickerBtn.setVisibility(View.VISIBLE); + } + } + } + }; + + task.execute(backupFolderPath); } diff --git a/src/main/res/layout/contacts_backup_fragment.xml b/src/main/res/layout/contacts_backup_fragment.xml index 84f05a78b6..d9c17a1293 100644 --- a/src/main/res/layout/contacts_backup_fragment.xml +++ b/src/main/res/layout/contacts_backup_fragment.xml @@ -90,7 +90,8 @@ android:layout_marginTop="@dimen/standard_margin" android:text="@string/contacts_header_restore" android:textColor="@color/primary" - android:textStyle="bold"/> + android:textStyle="bold" + android:visibility="gone"/> + android:theme="@style/Button.Primary" + android:visibility="gone"/> From 977e2fb691ef70506ab75344d1d12203c24e24f5 Mon Sep 17 00:00:00 2001 From: tobiaskaminsky Date: Mon, 22 May 2017 08:56:17 +0200 Subject: [PATCH 39/41] logging via LOG_OC removed unnedded try catch --- .../contactsbackup/ContactListFragment.java | 2 +- .../contactsbackup/ContactsBackupFragment.java | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java index e1820499a3..97655f53a3 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java @@ -472,7 +472,7 @@ public class ContactListFragment extends FileFragment { try { contactListAdapter.replaceVCards(Ezvcard.parse(file).all()); } catch (IOException e) { - e.printStackTrace(); + Log_OC.e(TAG, "IO Exception: " + file.getAbsolutePath()); } } } diff --git a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java index 1b8d2e2e5e..93656385b4 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java @@ -185,17 +185,11 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi FileDataStorageManager storageManager = new FileDataStorageManager(account, getActivity().getContentResolver()); - RemoteOperationResult result = new RemoteOperationResult(RemoteOperationResult.ResultCode.UNKNOWN_ERROR); - try { - OCFile folder = storageManager.getFileByPath(path[0]); - RefreshFolderOperation operation = new RefreshFolderOperation(folder, System.currentTimeMillis(), - false, false, false, storageManager, account, getContext()); - - result = operation.execute(account, getContext()); - } catch (Exception e) { - e.printStackTrace(); - } + OCFile folder = storageManager.getFileByPath(path[0]); + RefreshFolderOperation operation = new RefreshFolderOperation(folder, System.currentTimeMillis(), + false, false, false, storageManager, account, getContext()); + RemoteOperationResult result = operation.execute(account, getContext()); return result.isSuccess(); } From 7995544f6cdd779d5f1f8780dfb38bcd71bb530f Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Wed, 24 May 2017 00:26:32 +0000 Subject: [PATCH 40/41] [tx-robot] updated from transifex --- src/main/res/values-cs-rCZ/strings.xml | 1 - src/main/res/values-de-rDE/strings.xml | 4 ++-- src/main/res/values-de/strings.xml | 4 ++-- src/main/res/values-el/strings.xml | 1 - src/main/res/values-en-rGB/strings.xml | 4 ++-- src/main/res/values-es-rMX/strings.xml | 4 ++-- src/main/res/values-es/strings.xml | 1 - src/main/res/values-fr/strings.xml | 4 ++-- src/main/res/values-is/strings.xml | 10 +++++----- src/main/res/values-nb-rNO/strings.xml | 4 ++-- src/main/res/values-nl/strings.xml | 4 ++-- src/main/res/values-pl/strings.xml | 5 +++-- src/main/res/values-pt-rBR/strings.xml | 4 ++-- src/main/res/values-ru/strings.xml | 4 ++-- src/main/res/values-sq/strings.xml | 4 ++-- src/main/res/values-tr/strings.xml | 4 ++-- src/main/res/values-zh-rCN/strings.xml | 4 ++-- 17 files changed, 32 insertions(+), 34 deletions(-) diff --git a/src/main/res/values-cs-rCZ/strings.xml b/src/main/res/values-cs-rCZ/strings.xml index bef0bcebbf..321ef1571a 100644 --- a/src/main/res/values-cs-rCZ/strings.xml +++ b/src/main/res/values-cs-rCZ/strings.xml @@ -403,7 +403,6 @@ CHYBA: V průběhu migrace CHYBA: V průběhu aktualizace indexu - Datový adresář již existuje, co teď? Nahradit Použít diff --git a/src/main/res/values-de-rDE/strings.xml b/src/main/res/values-de-rDE/strings.xml index 9436a3d223..8a6f46c52d 100644 --- a/src/main/res/values-de-rDE/strings.xml +++ b/src/main/res/values-de-rDE/strings.xml @@ -418,7 +418,6 @@ FEHLER: Migration fehlgeschlagen FEHLER: Während der Aktualisierung des Indexes - Datenordner existiert bereits, was soll geschehen? Überschreiben Verwende bestehenden @@ -659,4 +658,5 @@ Abmelden Keine App gefunden, mit der ein Bid gesetzt werden könnte! Datenschutz - + + diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index d06f0f6cc9..dcd00d4ae7 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -418,7 +418,6 @@ FEHLER: Migration fehlgeschlagen FEHLER: Während der Aktualisierung des Indexes - Datenordner existiert bereits, was soll geschehen? Überschreiben Verwende bestehenden @@ -660,4 +659,5 @@ Abmelden Keine App gefunden, mit der ein Bid gesetzt werden könnte! Datenschutz - + + diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index a795d9b017..a1b2d52fad 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -417,7 +417,6 @@ ΣΦΑΛΜΑ: Κατά την μεταφορά ΣΦΑΛΜΑ: Κατά την ενημέρωση ευρετηρίου - Ο φάκελος των δεδομένων υπάρχει ήδη, τι να κάνω; Αντικατάσταση Χρήση diff --git a/src/main/res/values-en-rGB/strings.xml b/src/main/res/values-en-rGB/strings.xml index de46f62324..b3852dba3f 100644 --- a/src/main/res/values-en-rGB/strings.xml +++ b/src/main/res/values-en-rGB/strings.xml @@ -417,7 +417,6 @@ ERROR: Failed during migration ERROR: Failed to updating index - Data folder exists already. Choose one of the following: Replace Use @@ -658,4 +657,5 @@ Logout No app found to set a picture with! Privacy - + + diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml index 9239bf5ede..7954c705b5 100644 --- a/src/main/res/values-es-rMX/strings.xml +++ b/src/main/res/values-es-rMX/strings.xml @@ -418,7 +418,6 @@ en los últimos 7 días. ERROR: Falla durante la migración ERROR: Falla durante la actualización del índice - La carpeta de datos ya existe. Elija una de las siguientes: Remplazar Usar @@ -659,4 +658,5 @@ en los últimos 7 días. Salir de la sesión ¡No se encontró una aplicación con la cual establecer una imagen! Privacidad - + + diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index ce5a71aa7c..67ba916236 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -418,7 +418,6 @@ ERROR: Fallo durante la migración ERROR: Fallo al actualizar el índice - La carpeta de datos ya existe. Escoge una de las opciones: Reemplazar Usar diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 6771263480..a379f868e5 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -417,7 +417,6 @@ ERREUR : Echec lors de la migration ERREUR : Echec lors de la mise à jour de l\'index - Le dossier de données existe déjà. Choisissez une des options suivantes : Remplacer Conserver le dossier actuel @@ -658,4 +657,5 @@ Se déconnecter Aucune application trouvée pour utiliser cette image ! Vie privée - + + diff --git a/src/main/res/values-is/strings.xml b/src/main/res/values-is/strings.xml index e290b8eb72..24362c6cfc 100644 --- a/src/main/res/values-is/strings.xml +++ b/src/main/res/values-is/strings.xml @@ -53,7 +53,7 @@ Virkja skráningu í annál Þetta er notað til að skrá vandamál Ferill annálsskráningar - Þetta sýnir skráningar í annála + Þetta sýnir skráningar í atvikaskrár Eyða ferli Samstilla dagatal & tengiliði Setja upp DAVdroid (v1.3.0+) fyrir þennan aðgang @@ -419,7 +419,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila. VILLA: Mistókst við yfirfærslu VILLA: Mistókst að uppfæra skráningarvísi - Gagnamappa er þegar til staðar. Veldu eitt af eftirtöldu: Skipta út Nota @@ -431,10 +430,10 @@ Smelltu hér til að fá þér einn frá þjónustuaðila. Sýsla með notandaaðganga Öruggri tengingu endurbeint í gegnum óörugga leið. - Annálar + Atvikaskrár Ferill sendinga Ekkert forrit fannst til að senda atvikaskrár. Settu upp tölvupóstforrit. - %1$s annálar Android-forrita + %1$s atvikaskrár Android-forrita Hleð inn gögnum … Auðkenningar krafist @@ -660,4 +659,5 @@ Smelltu hér til að fá þér einn frá þjónustuaðila. Útskráning Engin forrit fundust til að setja mynd! Gagnaleynd - + + diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml index cd7e95acb4..9a30171f1b 100644 --- a/src/main/res/values-nb-rNO/strings.xml +++ b/src/main/res/values-nb-rNO/strings.xml @@ -418,7 +418,6 @@ FEIL: Under migrering FEIL: Under oppdatering av indeks - Datamappe finnes fra før, hva skal gjøres? Erstatt Bruk @@ -659,4 +658,5 @@ Utlogging Fant ikke noe program å sette bilder med. Personvern - + + diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index dfc4f652e9..f7163e6405 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -419,7 +419,6 @@ Kies er eentje van een provider. FOUT: Tijdens migratie FOUT: Tijdens bijwerken index - Gegevensmap bestaat al, wat te doen? Vervangen Gebruiken @@ -662,4 +661,5 @@ Kies er eentje van een provider. Uitloggen Geen app gevonden om afbeelding in te stellen Privacy - + + diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 003a4da88d..7aaa207e67 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -417,7 +417,6 @@ BŁĄD: Nieudana migracja BŁĄD: Nieudana aktualizacja indeksu - Folder z danymi już istnieje. Wybierz jedną z następujących czynności: Zamień Użyj @@ -658,5 +657,7 @@ Otrzymano nowe powiadomienie Wyloguj + Nie znaleziono aplikacji do ustawienia obrazu! Prywatność - + + diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index d4a9c2b540..995d593253 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -418,7 +418,6 @@ ERRO: Falha durante a migração ERRO: Falha ao atualizar índice - Pasta Data já existe. Escolha uma das seguintes: Substituir Usar @@ -659,4 +658,5 @@ Sair Nenhum aplicativo encontrado para atribuir uma imagem! Privacidade - + + diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 14a7fd939c..5359d16a24 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -420,7 +420,6 @@ ОШИБКА: Ошибка при миграции ОШИБКА: Ошибка при обновлении индекса - Каталог с данными уже существует. Выберите одно из действий: Перезаписать Использовать существующий @@ -663,4 +662,5 @@ Выйти Не надено приложения, с помощью которого можно установить изображение! Конфиденциальность - + + diff --git a/src/main/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml index 23cdd1161a..b9b6cb3d15 100644 --- a/src/main/res/values-sq/strings.xml +++ b/src/main/res/values-sq/strings.xml @@ -418,7 +418,6 @@ në 7 ditët e fundit. GABIM: Gjatë migrimit GABIM: Gjatë përditësimit të indeksit - Folderi i të dhënave ekziston tashmë, cfarë të bëni? Mbishkruaj Përdor ekzistueset @@ -659,4 +658,5 @@ në 7 ditët e fundit. Dilni Nuk u gjet aplikacioni me të cilin vendoset foto! Privatësi - + + diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index b98a4e57a8..2c7e68c0f6 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -418,7 +418,6 @@ HATA: Aktarımda sorun çıktı HATA: Dizin güncellenirken sorun çıktı - Veri klasörü zaten var, yapılacak işlemi seçin: Değiştirilsin Kullanılsın @@ -659,4 +658,5 @@ Oturumu Kapat Görselin ayarlanabileceği bir uygulama bulunamadı! Gizlilik - + + diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index b49324d3c5..1c6a0e0065 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -421,7 +421,6 @@ 错误：迁移过程中失败 错误：无法更新索引 - 数据文件夹已经存在。 选择以下选项之一： 代替 使用 @@ -661,4 +660,5 @@ 退出 没有应用程序发现设置图片！ 隐私 - + + From 7dc5cc7a94983af46b4a864227fe3fa9a95509b8 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Wed, 24 May 2017 11:36:24 +0200 Subject: [PATCH 41/41] remove non existing reference to lint config --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6a4b6d1bd4..2eb4756f47 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,6 @@ repositories { android { lintOptions { abortOnError false - lintConfig file("${project.rootDir}/lint.xml") htmlReport true htmlOutput file("$project.buildDir/reports/lint/lint.html") disable 'MissingTranslation'