mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-20 16:02:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse source
This commit is contained in:
Tobias Kaminsky 2023-07-15 02:31:43 +02:00
commit f3d5b886bf
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -6,9 +6,11 @@
* @author David A. Velasco * @author David A. Velasco
* @author Andy Scherzinger * @author Andy Scherzinger
* @author Chris Narkiewicz * @author Chris Narkiewicz
* @author TSI-mc
* Copyright (C) 2011 Bartek Przybylski * Copyright (C) 2011 Bartek Przybylski
* Copyright (C) 2016 ownCloud Inc. * Copyright (C) 2016 ownCloud Inc.
* Copyright (C) 2018 Andy Scherzinger * Copyright (C) 2018 Andy Scherzinger
* Copyright (C) 2023 TSI-mc
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2, * it under the terms of the GNU General Public License version 2,
@ -1657,6 +1659,12 @@ public class OCFileListFragment extends ExtendedListFragment implements
return; return;
} }
// avoid calling api multiple times if async task is already executing
if (remoteOperationAsyncTask != null && remoteOperationAsyncTask.getStatus() != AsyncTask.Status.FINISHED) {
Log_OC.d(TAG, "OCFileListSearchAsyncTask already running skipping new api call for search event: " + searchEvent.getSearchType());
return;
}
prepareCurrentSearch(event); prepareCurrentSearch(event);
searchFragment = true; searchFragment = true;
setEmptyListLoadingMessage(); setEmptyListLoadingMessage();

4
app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
View file

@ -4,9 +4,11 @@
* @author David A. Velasco * @author David A. Velasco
* @author Chris Narkiewicz * @author Chris Narkiewicz
* @author Andy Scherzinger * @author Andy Scherzinger
* @author TSI-mc
* Copyright (C) 2016 ownCloud Inc. * Copyright (C) 2016 ownCloud Inc.
* Copyright (C) 2019 Chris Narkiewicz <hello@ezaquarii.com> * Copyright (C) 2019 Chris Narkiewicz <hello@ezaquarii.com>
* Copyright (C) 2020 Andy Scherzinger * Copyright (C) 2020 Andy Scherzinger
* Copyright (C) 2023 TSI-mc
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2, * it under the terms of the GNU General Public License version 2,
@ -410,7 +412,7 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
final OCFile fileNew = getFile(); final OCFile fileNew = getFile();
if (fileNew != null) { if (fileNew != null) {
showFileActions(file); showFileActions(fileNew);
} }
} }
} }

4
app/src/main/res/values-gl/strings.xml
View file

@ -45,7 +45,7 @@
<string name="auth_account_not_the_same">O usuario que introduciu non coincide co usuario desta conta</string> <string name="auth_account_not_the_same">O usuario que introduciu non coincide co usuario desta conta</string>
<string name="auth_bad_oc_version_title">Versión do servidor non recoñecida</string> <string name="auth_bad_oc_version_title">Versión do servidor non recoñecida</string>
<string name="auth_connection_established">Estabeleceuse a conexión</string> <string name="auth_connection_established">Estabeleceuse a conexión</string>
<string name="auth_fail_get_user_name">O seu servidor non está devolvendo unha identificación de usuario correcta; contacte cun administrador.</string> <string name="auth_fail_get_user_name">O seu servidor non está devolvendo unha identificación de usuario correcta; contacte coa administración da instancia.</string>
<string name="auth_host_url">Enderezo do servidor https://…</string> <string name="auth_host_url">Enderezo do servidor https://…</string>
<string name="auth_incorrect_address_title">O formato do enderezo do servidor é erróneo</string> <string name="auth_incorrect_address_title">O formato do enderezo do servidor é erróneo</string>
<string name="auth_incorrect_path_title">Non se atopou o servidor</string> <string name="auth_incorrect_path_title">Non se atopou o servidor</string>
@ -712,7 +712,7 @@
<string name="shared_icon_shared">compartido</string> <string name="shared_icon_shared">compartido</string>
<string name="shared_icon_shared_via_link">compartido mediante ligazón</string> <string name="shared_icon_shared_via_link">compartido mediante ligazón</string>
<string name="shared_with_you_by">Compartido con Vde. por %1$s</string> <string name="shared_with_you_by">Compartido con Vde. por %1$s</string>
<string name="sharee_add_failed">Produciuse un fallo ao engadir un recurso compartido</string> <string name="sharee_add_failed">Produciuse un fallo ao engadir unha compartición</string>
<string name="show_images">Amosar as fotos</string> <string name="show_images">Amosar as fotos</string>
<string name="show_video">Amosar os vídeos</string> <string name="show_video">Amosar os vídeos</string>
<string name="signup_with_provider">Rexistrarse cun provedor</string> <string name="signup_with_provider">Rexistrarse cun provedor</string>