mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into reliable_uploads

Browse source 
Conflicts:
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
This commit is contained in:
Luke Owncloud 2014-11-25 14:28:05 +01:00
commit 4d07fcc1a1
8 changed files with 35 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
res/menu/file_select_all.xml
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/actionbar_select_all"
android:icon="@android:drawable/checkbox_off_background"
android:orderInCategory="1"
android:showAsAction="always"
android:title="actionbar_select_all"/>
</menu>

2
res/values-it/strings.xml
View file

@ -279,7 +279,7 @@
<string name="actionbar_logger">Registri</string>
<string name="log_send_history_button">Invia cronologia</string>
<string name="log_mail_subject">Registri applicazione ownCloud Android</string>
<string name="log_progress_dialog_text">Caricamento dati...</string>
<string name="log_progress_dialog_text">Caricamento dati in corso...</string>
<string name="saml_authentication_required_text">Autenticazione richiesta</string>
<string name="saml_authentication_wrong_pass">Password errata</string>
<string name="actionbar_move">Sposta</string>

25
res/values-sk-rSK/strings.xml
View file

@ -11,6 +11,12 @@
<string name="actionbar_settings">Nastavenia</string>
<string name="actionbar_see_details">Podrobnosti</string>
<string name="actionbar_send_file">Odoslať</string>
<string name="actionbar_sort">Zoradiť</string>
<string name="actionbar_sort_title">Zoradiť podľa</string>
<string-array name="actionbar_sortby">
<item>A-Z</item>
<item>Najnovšie - Najstaršie</item>
</string-array>
<!--TODO re-enable when server-side folder size calculation is available
<item>Biggest - Smallest</item>-->
<string name="prefs_category_general">Všeobecné</string>
@ -32,7 +38,10 @@
<string name="prefs_recommend">Doporučiť známemu</string>
<string name="prefs_feedback">Spätná väzba</string>
<string name="prefs_imprint">Podmienky používania</string>
<string name="prefs_remember_last_share_location">Zapamätať umiestnenie zdieľania</string>
<string name="prefs_remember_last_upload_location_summary">Zapamätať posledné umiestnenie pre nahranie zdieľaných súborov</string>
<string name="recommend_subject">Skúste %1$s na vašom telefóne!</string>
<string name="recommend_text">Chcel by som vám odporučiť %1$s na vašom smartfóne!\nSťahujte tu: %2$s</string>
<string name="auth_check_server">Skontrolovať Server</string>
<string name="auth_host_url">Adresa servera https://...</string>
<string name="auth_username">Používateľské meno</string>
@ -106,6 +115,7 @@
<string name="sync_fail_in_favourites_content">Obsah %1$d súborov nemohol byť synchronizovaný (%2$d konfliktov)</string>
<string name="sync_foreign_files_forgotten_ticker">Niektoré lokálne súbory boli zabudnuté</string>
<string name="sync_foreign_files_forgotten_content">%1$d súborov z %2$s priečinkov sa nepodarilo skopírovať do</string>
<string name="sync_foreign_files_forgotten_explanation">Od verzie 1.3.16 sú súbory nahrané z tohoto zariadenia kopírované do lokálneho priečinka %1$s, aby sa zabránilo strate dát pri synchronizácii jedného súboru s viacerými účtami.\n\nVšetky súbory nahraté predchádzajúcimi verziami aplikácie boli z tohoto dôvodu prekopírované do priečinka %2$s. Bohužiaľ sa objavila chyba zabraňujúca dokončeniu tejto operácie v priebehu synchronizácie účtu. Buď môžete súbor(y) ponechať ako sú a odobrať odkaz z priečinka %3$s, alebo presunúť súbor(y) do priečinka %1$s a zachovať odkaz na %4$s.\n\nNižšie je uvedený lokálny súbor(y) a vzdialený súbor(y) v %5$s, s ktorým je prepojený.</string>
<string name="sync_current_folder_was_removed">Priečinok %1$s už existuje</string>
<string name="foreign_files_move">Premiestniť všetko</string>
<string name="foreign_files_success">Všetky súbory boli premiestnené</string>
@ -239,9 +249,12 @@
<string name="preview_image_description">Ukážka obrazu</string>
<string name="preview_image_error_unknown_format">Obrázok nemožno zobraziť</string>
<string name="error__upload__local_file_not_copied">%1$s nemožno skopírovať do lokálneho priečinka %2$s</string>
<string name="prefs_instant_upload_path_title">Cesta pre nahrávanie</string>
<string name="share_link_no_support_share_api">Je nám to ľúto, ale zdieľanie nie je na vašom serveri povolené. Prosím kontaktujte vášho
administrátora.</string>
<string name="share_link_file_no_exist">Nemožno zdieľať. Skontrolujte, či súbor existuje</string>
<string name="share_link_file_error">Pri pokuse o zdieľanie tohto súboru alebo priečinka došlo k chybe</string>
<string name="unshare_link_file_no_exist">Nemožno ukončiť zdieľanie. Skontrolujte, či súbor existuje</string>
<string name="unshare_link_file_error">Pri pokuse zrušiť zdieľanie tohto súboru alebo priečinka došlo k chybe</string>
<string name="activity_chooser_send_file_title">Odoslať</string>
<string name="copy_link">Kopíruj odkaz</string>
@ -262,9 +275,21 @@
<string name="downloader_download_file_not_found">Súbor už na serveri nie je dostupný</string>
<string name="prefs_category_accounts">Účty</string>
<string name="prefs_add_account">Pridať účet</string>
<string name="auth_redirect_non_secure_connection_title">Zabezpečené pripojenie je presmerované na nezabezpečenú trasu.</string>
<string name="actionbar_logger">Logy</string>
<string name="log_send_history_button">Odoslať históriu</string>
<string name="log_mail_subject">Logy aplikácie ownCloud pre Android</string>
<string name="log_progress_dialog_text">Nahrávam dáta...</string>
<string name="saml_authentication_required_text">Vyžaduje sa overenie</string>
<string name="saml_authentication_wrong_pass">Nesprávne heslo</string>
<string name="actionbar_move">Presunúť</string>
<string name="file_list_empty_moving">Nič tu nie je. Pridajte priečinok!</string>
<string name="move_choose_button_text">Vybrať</string>
<string name="move_file_not_found">Nemožno presunúť. Skontrolujte, či súbor existuje</string>
<string name="move_file_invalid_into_descendent">Priečinok nemožno presunúť do vlastného podpriečinka</string>
<string name="move_file_invalid_overwrite">Súbor už v cieľovom priečinku existuje</string>
<string name="move_file_error">Pri pokuse o presun tohoto súboru alebo priečinka nastala chyba</string>
<string name="forbidden_permissions_move">pre presun tohoto súboru</string>
<string name="prefs_category_instant_uploading">Okamžité nahratie</string>
<string name="prefs_category_security">Zabezpečenie</string>
</resources>

1
res/values-sq/strings.xml
View file

@ -32,6 +32,7 @@
<string name="filedetails_created">Krijuar:</string>
<string name="filedetails_modified">Modifikuar:</string>
<string name="filedetails_download">Shkarko</string>
<string name="action_share_file">Ndaje lidhjen</string>
<string name="common_yes">Po</string>
<string name="common_no">Jo</string>
<string name="common_ok">Ok</string>

41
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
View file

@ -77,8 +77,6 @@ public class UploadFilesActivity extends FileActivity implements
private static final String WAIT_DIALOG_TAG = "WAIT";
private static final String QUERY_TO_MOVE_DIALOG_TAG = "QUERY_TO_MOVE";
private boolean selectAllToggled = false;
private Menu menu;
@Override
public void onCreate(Bundle savedInstanceState) {
@ -125,7 +123,6 @@ public class UploadFilesActivity extends FileActivity implements
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
actionBar.setListNavigationCallbacks(mDirectories, this);
// wait dialog
if (mCurrentDialog != null) {
mCurrentDialog.dismiss();
@ -134,15 +131,8 @@ public class UploadFilesActivity extends FileActivity implements
Log_OC.d(TAG, "onCreate() end");
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu items for use in the action bar
MenuInflater inflater = getSherlock().getMenuInflater();
inflater.inflate(R.menu.file_select_all, menu);
this.menu = menu;
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
boolean retval = true;
@ -153,33 +143,12 @@ public class UploadFilesActivity extends FileActivity implements
}
break;
}
case R.id.actionbar_select_all:{
if(selectAllToggled){
toggleOffSelectAll();
}else{
toggleOnSelectAll(item);
}
break;
}
default:
retval = super.onOptionsItemSelected(item);
}
return retval;
}
public void toggleOffSelectAll(MenuItem item){
selectAllToggled = false;
item.setIcon(android.R.drawable.checkbox_off_background);
mFileListFragment.deselectAll();
}
public void toggleOffSelectAll(){
MenuItem item = menu.findItem(R.id.actionbar_select_all);
toggleOffSelectAll(item);
}
public void toggleOnSelectAll(MenuItem item){
selectAllToggled = true;
item.setIcon(android.R.drawable.checkbox_on_background);
mFileListFragment.selectAll();
}
@Override
public boolean onNavigationItemSelected(int itemPosition, long itemId) {
@ -210,7 +179,6 @@ public class UploadFilesActivity extends FileActivity implements
ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayHomeAsUpEnabled(false);
}
toggleOffSelectAll();
}
@ -278,11 +246,10 @@ public class UploadFilesActivity extends FileActivity implements
* {@inheritDoc}
*/
@Override
public void onDirectoryClick(File directory) {
public void onDirectoryClick(File directory) {
pushDirname(directory);
ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayHomeAsUpEnabled(true);
toggleOffSelectAll();
}

2
src/com/owncloud/android/ui/activity/Uploader.java
View file

@ -170,7 +170,7 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene
case DIALOG_MULTIPLE_ACCOUNT:
CharSequence ac[] = new CharSequence[mAccountManager.getAccountsByType(MainApp.getAccountType()).length];
for (int i = 0; i < ac.length; ++i) {
ac[i] = mAccountManager.getAccountsByType(MainApp.getAccountType())[i].name;
ac[i] = DisplayUtils.convertIdn(mAccountManager.getAccountsByType(MainApp.getAccountType())[i].name, false);
}
builder.setTitle(R.string.common_choose_account);
builder.setItems(ac, new OnClickListener() {

22
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
View file

@ -98,33 +98,13 @@ public class LocalFileListFragment extends ExtendedListFragment {
Log_OC.i(TAG, "onActivityCreated() stop");
}
public void selectAll(){
int numberOfFiles = mAdapter.getCount();
for(int i = 0; i < numberOfFiles; i++){
File file = (File) mAdapter.getItem(i);
if (file != null) {
if (!file.isDirectory()) {
/// Click on a file
getListView().setItemChecked(i, true);
// notify the change to the container Activity
mContainerActivity.onFileClick(file);
}
}
}
}
public void deselectAll(){
mAdapter = new LocalFileListAdapter(mContainerActivity.getInitialDirectory(), getActivity());
setListAdapter(mAdapter);
}
/**
* Checks the file clicked over. Browses inside if it is a directory. Notifies the container activity in any case.
*/
@Override
public void onItemClick(AdapterView<?> l, View v, int position, long id) {
File file = (File) mAdapter.getItem(position);
File file = (File) mAdapter.getItem(position);
if (file != null) {
/// Click on a directory
if (file.isDirectory()) {

4
tests/.classpath
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry combineaccessrules="false" kind="src" path="/owncloud-android"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>