mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 16:24:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
2812 commits 220 branches 1588 tags 639 MiB
Commit graph

1624 commits

Author SHA1 Message Date
Jorge Antonio Diaz-Benito Soriano
b22dc8bce6 Minor updates 2014-10-28 18:43:10 +01:00
MMMarcy
2cad715525 Commit for the PR 
The pull request targets:

	1) Introduces Gradle support
	2) Updates maven support (even thou the apk generated is not
stable)
	3) Updates the setup_env.* scripts to support different building
tools
	4) Removes non UTF-8 characters
	5) Removes switches on R.id entries (not supported anymore from
ADT >= 14)
	6) Introduced a binary dependency (.aar) that replace the actionbarsherlock
sub-module

Remainders:

	1) Change the sub-module back to the owncloud android library
once the PR will be merge
 2014-10-28 16:09:34 +01:00
tobiasKaminsky
f46dd624f7 - added Comment 2014-10-28 14:27:03 +01:00
jabarros
d9604bf99e Merge branch 'develop' into idn_hosts 2014-10-28 13:27:32 +01:00
jabarros
dcb985481b Merge branch 'develop' into thumbnails_from_server 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-10-27 15:12:48 +01:00
jabarros
13fab9321e Add check of server version before requesting remote thumbnails 2014-10-27 12:36:11 +01:00
tobiasKaminsky
56d9529b14 - beautify Timestamps 2014-10-26 21:12:45 +01:00
tobiasKaminsky
c779c7c6ed - obey exif orientation tag 2014-10-25 16:51:49 +02:00
tobiasKaminsky
ec19a11a38 Merge remote-tracking branch 'upstream/develop' into 
bugfixMultipleSelect

Conflicts:
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
 2014-10-24 18:44:04 +02:00
tobiasKaminsky
13758253ca -rebase on develop 2014-10-24 18:34:39 +02:00
tobiasKaminsky
fbc3d970c5 Merge remote-tracking branch 'upstream/develop' into fileCount 
Conflicts:
	res/layout/list_fragment.xml
	res/values/strings.xml
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2014-10-24 18:18:06 +02:00
David A. Velasco
8d3a956c97 Merge branch 'master' into develop 2014-10-24 15:24:50 +02:00
jabarros
2e47071c9c Merge branch 'thumbnails_from_server' of https://github.com/tobiasKaminsky/android into thumbnails_from_server 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-10-24 13:38:03 +02:00
David A. Velasco
ee6f2e7217 Full-account synchronization should never fetch the contents of a folder 
if its eTag did not change
 2014-10-24 10:13:43 +02:00
jabarros
c8d2d46627 Fixed. When trying to open the app in Galaxy mini 2, a crash appears 2014-10-23 18:06:59 +02:00
jabarros
69320c8805 Merge branch 'develop' into idn_hosts 2014-10-23 11:20:09 +02:00
jabarros
583194a19a Add comment removed when fixing conflict in merge 2014-10-23 11:16:31 +02:00
jabarros
6970560d2f Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files_2 
Conflicts:
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2014-10-23 11:06:05 +02:00
jabarros
2fad1e1a99 Merge branch 'develop' into sorting_files_2 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-10-23 10:18:20 +02:00
tobiasKaminsky
4bbb4846bb - clean up 2 2014-10-22 12:41:56 +02:00
tobiasKaminsky
fd12caf9ae - cleaned up 2014-10-22 12:40:17 +02:00
tobiasKaminsky
b6f773bf8c - moved MediaScan to DownloadFileOperation. 2014-10-22 11:20:08 +02:00
tobiasKaminsky
c505977cb8 - update to obey non-image files 2014-10-22 09:07:08 +02:00
tobiasKaminsky
d7b32ecc17 Merge remote-tracking branch 'upstream/develop' into triggerMediaScan 
Conflicts:
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
 2014-10-22 08:09:47 +02:00
Magnus Sjoqvist
52bf54a00d Removes remember last share location setting 2014-10-21 17:27:47 +02:00
tobiasKaminsky
bc4a7bfe43 - added requested changes 2014-10-20 19:52:12 +02:00
jabarros
3a8ff76d0a Merge branch 'master' into develop 
Conflicts:
	owncloud-android-library
 2014-10-20 14:54:46 +02:00
Magnus Sjoqvist
dedd5bb36b Fixed log import 2014-10-20 14:48:06 +02:00
Magnus Sjoqvist
844790057b Merge with develop 2014-10-20 14:38:13 +02:00
tobiasKaminsky
712a513532 - bugfix 2014-10-19 19:36:04 +02:00
tobiasKaminsky
697719ce0e - fix bug 2014-10-19 19:33:31 +02:00
tobiasKaminsky
635394f2a2 - minor design changes 2014-10-19 08:56:57 +02:00
tobiasKaminsky
524a6e2bdd - added lgpgl 2014-10-18 10:47:36 +02:00
tobiasKaminsky
4e960eafeb added "x folders and y files" to end of list 2014-10-18 10:47:08 +02:00
tobiasKaminsky
effa6908b0 - Using Uri.encode... 
- Thumbnail size is set to 32dp
 2014-10-17 21:54:01 +02:00
tobiasKaminsky
bc3f8b3354 - requested changes by review by davivel 2014-10-17 21:28:48 +02:00
Magnus Sjoqvist
b6c7719415 Merge with develop 2014-10-17 11:06:30 +02:00
Magnus Sjoqvist
89627024b1 Added check for that the last upload folder still exists 2014-10-17 10:35:57 +02:00
tobiasKaminsky
e5515c1a2d trigger Media Scan on: 
- download
- delete local (on list and details)
- delete local & remote (on list and details)
 2014-10-17 09:35:25 +02:00
David A. Velasco
e3e5c205b6 Fix thumbnail generation after successful upload 2014-10-16 16:14:03 +02:00
David A. Velasco
d7de54a6a5 Fix glitch in reuse of thumbnails after crossed rename of files in the server side 2014-10-16 16:13:17 +02:00
jabarros
8859ba3971 Fixed. File is not downloaded in the end, when adding a slash at the end of the path 2014-10-16 14:13:09 +02:00
David A. Velasco
fe2f7ce8a6 Fix lost update of remoteId when file is sync'ed after being replaced in server by other one 2014-10-16 13:11:32 +02:00
jabarros
ad291624a3 Fixed. App crashes when changing the path and not going to the file list. Rename some methods. 2014-10-16 09:49:00 +02:00
jabarros
e4c77cabcb Fixed. The thumbnail of the just uploaded image is refreshed when it is not necessary 2014-10-15 18:36:39 +02:00
David A. Velasco
299ad36bb8 Thumbnails cache initialized in MainApp context to grant it is done even if the app wasn't opened, for the case of background synchronizations 2014-10-15 12:29:41 +02:00
jabarros
2910b00673 Merge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts 
Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2014-10-15 12:20:49 +02:00
David A. Velasco
395ad3248e Creation of ThumbnailsCacheManager class, grouping all the methods needed to access the thumbnails cache 2014-10-15 11:25:29 +02:00
jabarros
f68139619b Fixed. When define as instant upload path a path that does not exist, a crash is gotten 2014-10-15 11:21:37 +02:00
jabarros
d5625e6ccc Fixed. App crash when setting a path without slash 2014-10-15 08:21:24 +02:00
David A. Velasco
778ed30b58 Removed unused import 2014-10-14 13:19:56 +02:00
David A. Velasco
a04e5382b5 Fixed indention, log and copyright issues in DiskLruImageCache 2014-10-14 13:18:30 +02:00
David A. Velasco
0675834231 Use hash ok keys as actual key in thumbnails cache instead of custom transformed key 2014-10-14 13:16:32 +02:00
Sam
4275f02cab Fixed imports and added comments 2014-10-14 09:37:50 +02:00
Magnus Sjoqvist
dd80754057 Fixed merge 2014-10-14 09:37:27 +02:00
Magnus Sjoqvist
ebe0f73068 Added feature for remembering last upload location when sharing a file. Also added an option to turn it off in prefrences. 2014-10-14 09:34:49 +02:00
tobiasKaminsky
706a769e30 - disabled sort by size until server supports server-side folder size 
calculation
 2014-10-11 09:14:14 +02:00
jabarros
8f1045de2b Fixed. When removing a file inside a folder and then upload another, thumbnails are not shown correctly 2014-10-10 15:10:39 +02:00
grecep
df4f60dda4 select all / deselect all file in upload menu 2014-10-10 14:05:49 +02:00
jabarros
7d9fc6857e Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files 
Conflicts:
	res/menu/main_menu.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2014-10-09 17:26:02 +02:00
jabarros
cbea96e563 Fixed bug. Thmumbnail is not correct when uploading a file in another folder 2014-10-09 13:21:50 +02:00
jabarros
3b79715686 Fixed bug. When previewing a big image, sometimes it is not possible load it because there is an out of memory error 2014-10-08 13:50:19 +02:00
David A. Velasco
1a98e798a0 Some indentation updates 2014-10-07 15:04:16 +02:00
David A. Velasco
a2a34ebf09 Consider possible trailing / in input URL in login view 2014-10-07 15:03:54 +02:00
David A. Velasco
fe176bed6e Some indentation updates 2014-10-07 13:11:23 +02:00
David A. Velasco
363cad2add On refersh of a folder, remove from the local file system the child folders that were deleted in the server 2014-10-07 12:54:31 +02:00
jabarros
1e7e893321 Merge branch 'master' of https://github.com/loripino21/android into instant_upload_path_chooseable 2014-10-06 14:58:34 +02:00
tobiasKaminsky
be7eb6e932 - sort dialog shows the right selected item 2014-10-04 12:40:35 +02:00
tobiasKaminsky
703187ea09 - persist settings for sort order 2014-10-04 12:23:16 +02:00
jabarros
2e472998c1 Merge branch 'develop' into release-1.6.0 2014-10-02 09:04:11 +02:00
jabarros
b5ae527bff Update Log_OC import reference 2014-10-02 09:00:21 +02:00
Javier Gonzalez
d456e2fb6c Merge pull request #641 from owncloud/thumbnails_for_downloaded_images 
Thumbnails for downloaded images
 2014-10-01 11:35:50 +02:00
jabarros
b9b0a753e0 Changes after CR 2014-10-01 09:03:15 +02:00
jabarros
2e0376e67d Fixed bug. Video files not previewed on accounts whose id has an space 2014-10-01 08:34:14 +02:00
jabarros
97d611aec3 Add column 'update_thumbnail' to the local files db for controlling the update of the thumbnails when images are updated on the server 2014-09-29 13:55:28 +02:00
jabarros
496c96223a Fixed bug related with refreshing when moving files 2014-09-24 12:22:06 +02:00
David A. Velasco
e72555f2bd Protect the app against crashes when opening the thumbnails cache 2014-09-23 14:28:23 +02:00
David A. Velasco
53740c0a8c Protect the app against crashes due to fails in creation of thumbnails 2014-09-23 13:43:30 +02:00
David A. Velasco
63de8e9229 Minimized memory use in load of bitmaps for thumbnails generated from local files 2014-09-23 13:34:25 +02:00
jabarros
96ba3bcdfc Fixed bug. Change way of decoding pictures from decodeFile to decodeStream and add FlushedInputStream class 2014-09-22 14:36:54 +02:00
jabarros
cf97936b76 Add customize Imageview and TouchImageView for fixing problem of seeing big pictures on nexus 7 
:q
exit
:q
 2014-09-22 09:27:23 +02:00
tobiasKaminsky
013542d5aa - removed help function 2014-09-21 19:29:33 +02:00
tobiasKaminsky
ff5795f281 Download thumbnails from server with rest api 2014-09-21 19:25:54 +02:00
tobiasKaminsky
800562383c new url 2014-09-21 19:14:06 +02:00
tobiasKaminsky
eb1e911457 update 2014-09-21 17:47:28 +02:00
jabarros
c376eef2e7 Fixed bug. Check if bitmap exceed the 2048x2048 size and set the imageview layer type to software one in order to avoid problems with OpenGL texture 2014-09-19 15:13:30 +02:00
David A. Velasco
7a345cf83b Work around constaint in valid key for DiskLruCache (capital letters are not allowed) 2014-09-19 14:14:30 +02:00
David A. Velasco
aa354e5d73 Merge branch 'develop' into release-1.6.0 2014-09-18 14:27:13 +02:00
David A. Velasco
02d085ed0e Hotfix for setups without new mail_logger string 2014-09-18 13:23:50 +02:00
jabarros
6c55a20389 Fixed bug. When there is a downloaded file which is not support as tiff, app crashes 2014-09-18 12:44:42 +02:00
jabarros
592761eafc Fixed bug. Image zoomed is not shown property 2014-09-18 10:46:12 +02:00
jabarros
c3e3160727 Fixed bug. When downloading two files, it is not possible to come back to the file list. Bars does not appear. 2014-09-18 09:36:35 +02:00
David A. Velasco
ea5c4760c2 Fixed conflict - Merge branch 'develop' into better_loggin_system 2014-09-18 09:31:24 +02:00
jabarros
6da86f04f6 Update with changes after CR 2014-09-17 17:10:20 +02:00
jabarros
74c29e1ce1 Changes after CR 2014-09-17 16:46:11 +02:00
jabarros
2ef886af31 Merge branch 'develop' into better_loggin_system 2014-09-17 09:47:34 +02:00
Oliver Gasser
b20ace9185 Add code to handle ownCloud servers running on IDN 
ownCloud instances can run on servers having an internationalized domain
name. This commit adds a conversion function between ASCII and Unicode.
The conversion function is used in the Authenticator and Preferences
activities.

See issue #469.
 2014-09-17 03:31:14 +02:00
jabarros
31bd59d681 Fix bug. App crashes when installing it 2014-09-16 13:48:17 +02:00
jabarros
6a297ebe91 Fix bug. Etag is been ignored when navigating through folders 2014-09-16 12:48:24 +02:00
jabarros
f029363e47 Fixed bug related with app crashes when opening the logs and rotate the device 2014-09-16 09:19:30 +02:00
tobiasKaminsky
a622b1dcfb - Only three orders: A-Z, Big-Small, New-Old. 
- Folder size is computed locally (therefore only downloaded files are
obeyed)
 2014-09-15 16:04:46 +02:00
jabarros
e549254059 Add boolean parameter 'ignoreTag' to SyncronizeFolderOperation constructor and pass ignoreTag = true in calls to #startSyncFolderOperation at FileDisplayActivity and MoveActivity in #onRefresh() 2014-09-15 13:14:32 +02:00
tobiasKaminsky
0523ec4e88 Keep folders on top 2014-09-15 12:00:19 +02:00
David A. Velasco
aae90eb1aa Merge branch 'develop' of https://github.com/tobiasKaminsky/android into thumbnails_for_downloaded_images 2014-09-15 09:41:25 +02:00
tobiasKaminsky
1df7a8c062 Added forgotten Comparator 2014-09-14 16:05:34 +02:00
tobiasKaminsky
20cd00b22c Added sorting by name, date or size ascending/descending 2014-09-14 15:51:09 +02:00
tobiasKaminsky
3ace32e9ae Removed accidently added remote thumbnail generation. 2014-09-13 10:15:00 +02:00
tobiasKaminsky
2e5d99463d Re-added thumbnail generation for files that are not images. 2014-09-13 10:10:57 +02:00
jabarros
a720d1a049 Merge pull request #619 from owncloud/fix_crash_when_connecting_to_wifi 
FileUploader service checks existance of account before accepting an upload
 2014-09-12 13:55:03 +02:00
jabarros
87de2db17d Set the log folder path before starting logging 2014-09-12 11:24:12 +02:00
jabarros
4599553545 Move Logger class to owncloud library and update references. Add async task for loading log info into LogHistoryActivity 2014-09-11 18:26:52 +02:00
jabarros
c8fe95b914 Set maximum file size for logs and format logs info 2014-09-11 12:39:24 +02:00
jabarros
c281aaeb01 Add delete history login and chang the date format in logs 2014-09-11 11:00:40 +02:00
jabarros
c7263a2cb4 Visualize both older and current log files info in the log history view and send both attached in the mail 2014-09-11 09:33:40 +02:00
jabarros
9c65f99338 Manage size of log file automatically, handling two log files with a maximun size 2014-09-10 18:17:49 +02:00
jabarros
650ffdd13f Remove unused code for accesing to log file from Preferences class 2014-09-10 08:59:52 +02:00
jabarros
57d4ac96d9 Change log messages for using our logger in all logs 2014-09-10 08:49:41 +02:00
jabarros
30c00ae9e5 Done some changes for storing the log messages on log file and grant that logs are added to the same log file when the app is killed, then reopened 2014-09-10 08:46:38 +02:00
jabarros
7dd567050a Merge pull request #615 from owncloud/fast_account_selection 
When an account is clicked, the app immediately shows its contents
 2014-09-09 15:06:09 +02:00
David A. Velasco
f1fdfecb82 Changed title of settings activity to 'Settings' 2014-09-09 14:50:53 +02:00
jabarros
62fc78754e Changes after CR 2014-09-09 13:42:01 +02:00
jabarros
ba6c6375cf Merge branch 'develop' into ADFS_auth_support 
Conflicts:
	res/values/strings.xml
 2014-09-09 13:17:41 +02:00
David A. Velasco
3fac2e01a1 FileUploader service checks existance of account when receives an upload request 2014-09-09 13:03:00 +02:00
David A. Velasco
a34a2cac8a When an account is clicked, the app immediately shows its contents 2014-09-09 12:23:09 +02:00
jabarros
3e196f1f7d First changes for saving logs 2014-09-05 12:08:37 +02:00
jabarros
d3a99fff00 Fixed bug it is not possible to login using two accounts in saml server. Clear webview cache. 2014-09-04 13:13:07 +02:00
jabarros
2ada53c99b Enable log into text file automatically when BuildConfig.DEBUG is true. Open log activity when user clicks on action bar menu option. Add button to send email with log file attached. 2014-09-04 09:06:14 +02:00
jabarros
f94781b459 Fixed message when trying to move to a folder which does not exist anymore 2014-09-02 14:30:28 +02:00
jabarros
85f63a0ff4 Create dialog fragment for showing authentication dialog 2014-09-02 14:03:56 +02:00
David A. Velasco
1dbba08c7b Improved messages for operations on files not existing anymore in the server 2014-09-02 10:13:14 +02:00
tobiasKaminsky
db4ccec8ee Added requested changes. 2014-09-01 21:12:51 +02:00
loripino21
b4974653a9 Update FileStorageUtils.java 2014-09-01 12:24:10 +02:00
loripino21
a6290e06c5 Update FileStorageUtils.java 
Forget import.
 2014-09-01 12:18:15 +02:00
loripino21
3f8a56274e Update FileStorageUtils.java 2014-09-01 11:58:53 +02:00
David A. Velasco
679c7ed157 Fixed lost local copy of file when moved into a folder that is not created in the local file system yet 2014-09-01 10:35:47 +02:00
jabarros
baf4d6a627 Add menu restrictions for not showing move option on the Preview and details fragments 2014-09-01 09:03:15 +02:00
David A. Velasco
24ffdc2c2f Fixed crash when selecting a folder to move file into after rotating the device in the selection view 2014-08-28 18:44:15 +02:00
jabarros
622523b3e3 Show alert message when user or password in authentication is not correct 2014-08-28 16:03:03 +02:00
jabarros
28614af18d Merge branch 'develop' into move_files_and_folders 2014-08-28 12:32:39 +02:00
jabarros
d3d0816ed7 Show a dialog to request username and password to the user on authentication request 2014-08-28 12:30:32 +02:00
jabarros
8188d4fa92 Update messages for moving files operation results 2014-08-27 10:01:28 +02:00
David A. Velasco
c928626bfa Merge remote-tracking branch 'origin/move_files_and_folders' into move_files_and_folders 2014-08-26 19:32:41 +02:00
David A. Velasco
8cfafef514 Completed update of local database and storage after a successful remote move 2014-08-26 19:31:50 +02:00
jabarros
622d78906b Show an alert message when user tries to move a file or folder to a location where its name is used by other file or folder and when it is forbidden to move it 2014-08-26 18:44:14 +02:00
jabarros
872bdc822b Pass info of target file that is going to be moved 2014-08-26 18:03:38 +02:00
jabarros
a6afe6efd2 Add gestion for errors when moving files 2014-08-26 17:44:18 +02:00
David A. Velasco
5480c0b52f Refactored MoveFileOperation to handle local update after remote move (WIP) 2014-08-26 16:11:52 +02:00
jabarros
59c0d67e68 Trigger MoveFileOperation when 'Choose' button is clicked 2014-08-26 16:00:42 +02:00
David A. Velasco
7d0e39f730 Start MoveFileOperation when 'Choose' button is clicked [Work In 
Progress!]
 2014-08-26 10:58:47 +02:00
David A. Velasco
e050da1009 Added MoveFileOperation to move OCFiles 2014-08-26 10:57:25 +02:00