Commit graph

2572 commits

Author SHA1 Message Date
David A. Velasco
f440d30e42 Code ready to provide different icons for well-known MIME types 2013-01-24 13:34:27 +01:00
David A. Velasco
088b1e83a4 Cleaning-up AuthenticatorActivty code 2013-01-24 10:29:11 +01:00
David A. Velasco
2b5785556e Merge branch 'master' into oauth_login
Conflicts:
	AndroidManifest.xml
	res/values-de-rDE/strings.xml
	res/values-de/strings.xml
	res/values/strings.xml
	src/com/owncloud/android/Uploader.java
	src/com/owncloud/android/datamodel/FileDataStorageManager.java
	src/com/owncloud/android/files/OwnCloudFileObserver.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/RemoteOperationResult.java
	src/com/owncloud/android/syncadapter/FileSyncAdapter.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2013-01-17 14:25:49 +01:00
F.T.
2ed5f33d95 Italian strings for narrow screens; fixed version string. 2013-01-12 18:37:10 +01:00
David A. Velasco
bc1591da6c Translations update 2013-01-11 13:26:34 +01:00
David A. Velasco
75c84c7b06 German translation updated 2013-01-11 12:45:10 +01:00
David A. Velasco
7239b9eb9d Translations update 2013-01-10 18:38:41 +01:00
David A. Velasco
c38a3b2ef1 Merge master into oauth_login 2012-12-18 11:20:03 +01:00
David A. Velasco
279670c303 Merge remote-tracking branch 'origin/sync_review_2' 2012-12-05 23:23:10 +01:00
David A. Velasco
4558866223 Give the user a chance to move the files selected for an upload when there is not space enough to copy them into the ownCloud folder 2012-12-04 14:20:02 +01:00
David A. Velasco
f68d10abc7 Give the user the option to move all the foreign files into the ownCloud local folder when the try to copy them during an account synchronization failed 2012-12-04 12:49:18 +01:00
David A. Velasco
a7535406d4 Customized error message for uploads when the local file cannot by copied to the ownCloud local directory 2012-11-30 14:39:31 +01:00
David A. Velasco
3ef64834e9 Added scroll to generic explanation activity. Enabled the copy of past uploads into ownCloud folder during synchronization. 2012-11-30 11:58:46 +01:00
David A. Velasco
2a913bfbeb Files uploaded in the past are copied to the local ownCloud directory during account synchronization 2012-11-30 11:29:18 +01:00
David A. Velasco
a2f48dc563 New German update 2012-11-29 16:52:29 +01:00
David A. Velasco
5dec5264b2 Updated some languages (remaining coming soon) 2012-11-29 16:01:53 +01:00
David A. Velasco
236895e7f8 Refactored app name in strings.xml 2012-11-29 12:26:55 +01:00
David A. Velasco
757f9027f5 Updating language strings; some hardcoded strings moved to strings.xml; workaround for bug in error popup 2012-11-29 11:28:34 +01:00
David A. Velasco
4c50eb4d2d Merge of master after sync_review was merged into it 2012-11-23 10:25:06 +01:00
David A. Velasco
d49bfd0c77 Added title to rename dialog; and some cleaning 2012-11-22 10:24:26 +01:00
David A. Velasco
38a80be828 Fixed lock of buttons in details view when the 'Keep both' option in conflicts dialog is used 2012-11-20 14:41:04 +01:00
David A. Velasco
c301865c35 Synchronize kept-in-sync files during account synchronization, in both directions and considering conflicts 2012-11-16 16:23:45 +01:00
David A. Velasco
a7ee15e023 Renaming confussing token 2012-11-16 09:42:51 +01:00
David A. Velasco
ff2271a8c5 Download button in file details view upgraded to sync file content in both directions 2012-11-15 17:18:04 +01:00
David A. Velasco
500cbf9cea New items in the context menu for files (not folders), depending upon its state 2012-11-06 15:13:27 +01:00
David A. Velasco
b27ebf0310 Removal of folders completed 2012-11-05 15:44:09 +01:00
David A. Velasco
cab55a8edd Login page updated to get OAuth2 access token 2012-10-31 18:59:43 +01:00
David A. Velasco
454f15138e Rename and remove operations connected to the contextual menu over items at the list of files 2012-10-31 17:41:57 +01:00
David A. Velasco
3d72058691 Quick fix to avoid two lines in button 2012-10-30 11:24:30 +01:00
David A. Velasco
cc1eb7a352 SSL warning with more information about certificate, accessible through a new 'Details' button 2012-10-29 15:03:34 +01:00
Bartek Przybylski
6c32365704 Solving modified date and length conflicts 2012-10-27 12:20:52 +02:00
Bartek Przybylski
4a737cb71c updated translations 2012-10-22 21:18:20 +02:00
David A. Velasco
8f2314d80e Improved explanation in PIN code view 2012-10-19 09:24:34 +02:00
David A. Velasco
adcb8d924b Fixed typo in German translation 2012-10-18 17:02:43 +02:00
David A. Velasco
7c8214f096 Same text in the cancel button in PIN code activity than in all the other cancel buttons in the app 2012-10-18 16:11:29 +02:00
David A. Velasco
0514b1ba19 Added German string for PIN code explanation 2012-10-18 10:02:33 +02:00
David A. Velasco
97f21ee7be About message moved to strings.xml 2012-10-17 19:34:31 +02:00
David A. Velasco
d0f7de3ce0 Added help text in background of empty files list 2012-10-17 19:22:40 +02:00
David A. Velasco
d193e0031b Added explanation in the view for PIN Code creation 2012-10-17 11:04:27 +02:00
David A. Velasco
6eff1c94be Updated text in 'Remote and local' option offered when removing a downloaded file to fit the button size' (just some languages) 2012-10-17 10:14:14 +02:00
Bartek Przybylski
e962c41aa9 updated translations 2012-10-15 17:44:19 +02:00
Bartek Przybylski
671cb91cef add upload via wifi only option 2012-10-08 21:26:18 +02:00
Bartek Przybylski
c72f89c4ba add no suggestion in horizontal mode in account setup activity 2012-10-08 18:31:02 +02:00
David A. Velasco
7edbe05bb5 Merge remote-tracking branch 'origin/master'
Conflicts:
	res/values-ca/strings.xml
	res/values-el/strings.xml
2012-10-08 09:10:37 +02:00
David A. Velasco
76ba00b2b2 Cancellation of current download in details view - UI changes 2012-10-08 09:03:12 +02:00
Bartek Przybylski
826c7405f6 dont suggest username in account setup screen 2012-10-07 21:43:40 +02:00
Bartek Przybylski
63da5e3b6d correct languages mapping 2012-10-06 11:28:51 +02:00
Bartek Przybylski
0caca3fc85 upating localization strings 2012-10-05 16:09:30 +02:00
David A. Velasco
0c3aaf3c5a Fixed typo in link to owncloud.com 2012-10-03 11:52:54 +02:00
David A. Velasco
131d97d74d A new string 2012-09-13 17:08:00 +02:00
David A. Velasco
261aaf5001 Improvements in SSL certifcates checking: URL is checked with the hostname in the certificate and all the problems are shown in the same dialog 2012-09-07 14:11:08 +02:00
David A. Velasco
48f13c8adc SSL connections update: notice about untrusted certificates and allow the user save them as reliable 2012-09-05 13:46:30 +02:00
David A. Velasco
91bc3fdb1e Added notification for failures in manual synchronizations; some improvements in the management of exceptions occurred while synchronizing (more TODO) 2012-08-23 17:09:05 +02:00
David A. Velasco
4e57c008b7 Fixed crash when sending nothing to the Uploader activity; slightly more prettier UI 2012-08-22 13:53:03 +02:00
David A. Velasco
3e6a936bd4 Added link to register new user in landscape view 2012-08-21 13:25:40 +02:00
David A. Velasco
081b333eb1 Added link to register a new user at owncloud.com ; fixed cancel button in account creation for SGS3 2012-08-20 14:36:46 +02:00
David A. Velasco
1ecd2b61c5 Multiple upload available from the app 2012-08-14 12:37:08 +02:00
David A. Velasco
58ebd9d7e1 FIleDisplayActivity refactored to fix view never updated after installation in some devices and problems when all the accounts are deleted 2012-08-08 12:30:11 +02:00
David A. Velasco
532492bf9b Fixed crashed when the user tries to upload to ownCloud some content for wich the client does not have enough permissions; such as a contact. 2012-08-03 11:39:08 +02:00
David A. Velasco
38ece35da5 Fixed crash by URL with whitespaces in login page; reviewed error handling and user info in connection checking 2012-08-02 13:28:33 +02:00
Bartek Przybylski
a4ba6170ea moving from eu.alefzero.eu to com.owncloud.android 2012-07-31 17:43:37 +02:00
David A. Velasco
6a9eaaf9aa Better failure handling in files renaming and removal 2012-07-30 15:11:59 +02:00
David A. Velasco
76a123fc35 Added failure handling to directory creation 2012-07-30 14:06:53 +02:00
David A. Velasco
9ae0e1746a Fixed cancel button in landscape account activity 2012-07-30 13:14:28 +02:00
David A. Velasco
3ab381f0e0 More hardcoded strings passed to string resources 2012-07-30 12:58:36 +02:00
David A. Velasco
e8852fa725 Fixed compatibility issue in local deletion and text typo 2012-07-30 09:46:24 +02:00
Bartek Przybylski
f0fb5848f2 updated translations 2012-07-29 10:23:03 +02:00
Bartek Przybylski
0cced280a4 allow removing local file only 2012-07-28 21:15:41 +02:00
David A. Velasco
7c93676d6f Make resource values for some hardcoded string 2012-07-27 15:02:03 +02:00
David A. Velasco
275eb1f8f8 Fixed: problems in handling a file that is still uploading but in the files list because a synchronization was triggered and finished; problems in UI refresh after removing or renaming a file, while in double pane mode 2012-07-27 14:29:46 +02:00
David A. Velasco
f3ba107585 Upload improvements: better control of errors, updated use of status notifications, removed toast notifications, new isUploading(...) mehtod 2012-07-26 18:35:09 +02:00
David A. Velasco
81970c8131 Reviewed error handling and notifications in downloads 2012-07-25 12:04:08 +02:00
David A. Velasco
20c5767a04 Minor typos and spelling corrected 2012-07-24 09:08:29 +02:00
Bartek Przybylski
7f75f13f0c make confirmation dialog more universal 2012-07-23 19:09:44 +02:00
David A. Velasco
eb2a7bcec2 Replaced strings in two pieces with formatted string 2012-07-23 14:38:16 +02:00
Bartek Przybylski
53bc15cdbf allow username with @, hide search menu item until sherlockactionbar wont put it to master 2012-07-22 09:01:22 +02:00
Bartek Przybylski
3c0e72c400 show buttons in two lines, they get squeezed when button text is too long 2012-07-21 22:31:18 +02:00
Bartek Przybylski
adf87805bb adding translations and transifex third party tool 2012-07-21 22:10:36 +02:00
David A. Velasco
c175ba68cd Forgot the new icon! 2012-07-20 10:14:27 +02:00
David A. Velasco
2a04c6ae5d Some fixes about downloads and how the detals view and list view is updated when downloads start and finish 2012-07-20 10:13:50 +02:00
Bartek Przybylski
f8e0f7a582 use star instead of heart, download while if its marked as favorite,ignoring last update 2012-07-19 00:04:37 +02:00
David A. Velasco
0583bc8b33 Pin code messages update 2012-07-17 15:16:27 +02:00
David A. Velasco
463b30c46a Avoid crashes when an external app makes a bad response for the selection of a file to upload 2012-07-17 14:51:36 +02:00
David A. Velasco
c0645e6832 Trigger synchronization when current account is changed; remove redundant accounts list in preferences 2012-07-16 11:34:37 +02:00
David A. Velasco
91b1728493 More fixes to PIN code 2012-07-13 14:46:40 +02:00
David A. Velasco
50d8905f00 File removal in server completed 2012-07-12 13:49:21 +02:00
David A. Velasco
8b24606331 Fixed confirmation dialog for deletion 2012-07-12 10:55:47 +02:00
David A. Velasco
6701c9842d Delete remote file - confirmation dialog added 2012-07-12 09:48:55 +02:00
Bartek Przybylski
a70c4c658f addming missing file, show softkeyborad on pin activity and change name activity 2012-07-11 17:23:50 +02:00
David A. Velasco
10f07d62f5 Temporal layout for rename 2012-07-11 10:47:15 +02:00
Bartek Przybylski
02610cad7d messy rename file 2012-07-10 22:52:31 +02:00
David A. Velasco
de5d818781 Strings extracted from PinCodeActivity to resources 2012-07-09 15:19:44 +02:00
David A. Velasco
3e4f8b4f0d Better policy to show PIN Code 2012-07-09 15:10:26 +02:00
David A. Velasco
93de9f91d5 Pin code 2012-07-09 11:11:44 +02:00
Bartek Przybylski
3113c45909 keep file in sync and initial commit for file sharing 2012-07-08 16:57:48 +02:00
Bartek Przybylski
3e9d818a08 revert icon to old one 2012-07-07 19:54:46 +02:00
Lennart Rosam
5e5cd7f889 Merge branch 'master' of ssh://git@gitorious.org/owncloud/android-devel.git 2012-07-03 22:50:52 +02:00
Bartek Przybylski
9650ce5cf8 change string from location to URL 2012-07-02 19:08:54 +02:00
David A. Velasco
41f2cf1169 Download failures not treated as successes 2012-07-02 10:41:56 +02:00
Lennart Rosam
678aeb2d37 Updated app icon 2012-06-29 16:16:26 +02:00
David A. Velasco
72141b60fb Update of messages when uploads finish 2012-06-29 10:36:25 +02:00
David A. Velasco
49c1f9e318 Better file opening; new ownCloud logo in account settings page 2012-06-27 18:32:20 +02:00
David A. Velasco
2a61a59a09 Fixed visibility problems of menu icons (sizes, and color in 2.3.x) 2012-06-27 17:05:00 +02:00
Bartek Przybylski
f7fb16963b always show image preview if there is only enough memory 2012-06-25 20:55:34 +02:00
Bartek Przybylski
832c1f4842 make cancel button usable on account create activity 2012-06-21 20:02:33 +02:00
Bartek Przybylski
5fc8be29f9 about dialog with version 2012-06-21 19:37:33 +02:00
Bartek Przybylski
b55f321125 add manage accounts to preference screen 2012-06-18 18:39:11 +02:00
Bartek Przybylski
6e3b5f488c dummy crash upload dialog 2012-06-13 20:47:38 +02:00
Bartek Przybylski
9dd2cf294a instant uploading, first attempt 2012-05-27 15:57:18 +02:00
Bartek Przybylski
78faee207b removing fancy upload bar for now 2012-05-26 21:23:01 +02:00
Bartek Przybylski
21980deb38 fix filename display 2012-05-26 20:59:46 +02:00
Bartek Przybylski
e759addf42 show modification timestamp and size of file 2012-05-26 14:56:30 +02:00
Bartek Przybylski
24a1111aa1 making file download using progressbar view 2012-05-26 13:47:26 +02:00
Bartek Przybylski
63f68f1020 use view instead of dialog about no setup account 2012-05-25 21:32:20 +02:00
Lennart Rosam
b735fc9458 Fixed navigation behaviour: HomeAsUp takes you up a dir 2012-05-25 07:01:12 +02:00
Lennart Rosam
39307229cd Hide creation info when the uses ownCloud version is affected by oc-764 2012-05-23 23:50:59 +02:00
Lennart Rosam
62908d1755 Merge branch 'master' of ssh://git@gitorious.org/owncloud/android-devel.git 2012-05-23 19:59:51 +02:00
Lennart Rosam
e8c9e5b09a Filelisting using intents and OCFile.getId() instead of string matching
in db which can be very very slow if there are lots of files
2012-05-23 19:59:29 +02:00
Bartek Przybylski
50695f6f5b removing filedrag for now 2012-05-23 19:10:12 +02:00
Bartek Przybylski
684ae90ca7 making icons bit smaller, making upload progressbar less cpu eating 2012-05-22 22:44:57 +02:00
Lennart Rosam
d722fe8229 Fix layout: Missing label, fix for smaller screens 2012-05-22 18:15:56 +02:00
Bartek Przybylski
4ee419da91 remove preferences its not needed for now 2012-05-21 22:57:17 +02:00
Lennart Rosam
38683b9143 Layout reworked to relative 2012-05-18 14:40:46 +02:00
Lennart Rosam
cb8761f66f New Layout for FileDetailsFragment (needs to be redone with
RelativeLayout for better performance), Fix AppCrashes on rotation
change
2012-05-18 14:05:21 +02:00
Lennart Rosam
3727806652 Intermediate commit: Work on new FileDetailFragment layout, simplified
it's code a bit and renamed a color. Layout is WIP
2012-05-18 08:09:31 +02:00
Lennart Rosam
ffc941e440 FileDetailsFragment now working on tablets 2012-05-18 00:37:53 +02:00
Bartek Przybylski
b56c8e05d8 holo icons 2012-05-16 18:52:45 +02:00
Lennart Rosam
020d2885ce Tablet fixes. Goal is to get tapping on a file to display its details.
Does not work yet - WIP. Also code optimization: Make
FileDetailFragment less complex by passing in a OCFile directly instead
of reconstructing it.
2012-05-15 23:12:07 +02:00
Bartek Przybylski
b999f542c0 new icons, new uploader 2012-05-15 21:52:59 +02:00
Bartek Przybylski
2c9b84a862 allow account deleting from account picker 2012-05-13 22:28:44 +02:00
Bartek Przybylski
0aeb425885 adjusting design to holo, stability for account setup 2012-05-13 16:13:13 +02:00
Bartek Przybylski
fae44486b9 sync option in filelist menu 2012-05-04 20:34:05 +02:00
Bartek Przybylski
10c04c6d77 new stuff for account authenticator 2012-05-03 15:37:30 +02:00
Bartek Przybylski
fc49e582c5 fix white text on configuration screen 2012-05-03 12:14:44 +02:00
Bartek Przybylski
a10efb1229 making callback to context not view 2012-05-02 00:04:17 +02:00
Bartek Przybylski
dc7cafe677 initial commit of editbox with badge 2012-05-01 23:37:37 +02:00
Lennart Rosam
6e43d84b17 Started working on the "Where is my device?" feature 2012-04-15 17:31:08 +02:00
Bartek Przybylski
ff36d90802 adding use ssl mode 2012-04-15 09:54:21 +02:00
Lennart Rosam
a29469016e More cleanup / refactoring: Name Fragments consistantly way 2012-04-14 18:55:15 +02:00
Lennart Rosam
8f2840fe11 Incorporated the ownCloud Blue into the ActionBar 2012-04-12 00:34:07 +02:00
Lennart Rosam
30c2ede8e5 Migration to ActionBarSherlock 4.0.1 / Custom Adapter to override text
colors in the ListNavigation Dropdown spinner
2012-04-10 04:40:53 +02:00
Bartek Przybylski
cf2c2eedc5 send contacts to oc instance 2012-04-08 18:41:23 +02:00
Bartek Przybylski
d8d535a0a2 handle dir creation from filelist 2012-04-08 00:25:51 +02:00
Bartek Przybylski
198c31f9b0 fix of filedisplay for phones 2012-04-07 12:47:26 +02:00
Lennart Rosam
320e446748 FileDetail fragement is now showing a text hint if there is no file
selected.
2012-04-07 02:52:50 +02:00
Lennart Rosam
4cbe903b8a Make account selectable from preferences 2012-04-07 02:15:38 +02:00
Lennart Rosam
9996436ccc Merged request #3 2012-04-01 15:06:23 +02:00
Bartek Przybylski
1083eb8683 warnging and legacy class removing 2012-02-25 18:35:54 +01:00
Bartek Przybylski
007edfe102 first download & preview scratch, removing unused code, changing noncompatible code 2012-02-19 16:06:00 +01:00
Bartek Przybylski
dbaff80211 proper file list handling, file basic stuff dispaying 2012-02-18 16:38:36 +01:00
Bartek Przybylski
e28442c87d bit better handling of filelist 2012-02-12 14:43:09 +01:00
Bartek Przybylski
6deca0f9b1 some file list handling, action bar added 2012-02-11 23:11:57 +01:00
Lennart Rosam
ca5455e88d Started swapping our ActionBar in favor of ActionBarSherlock 2012-02-05 22:47:25 +01:00
Lennart Rosam
a941af2ec2 - Easier to enter account information. (Input-Types, singleLine = true)
- XML pretty print
2012-02-04 17:55:17 +01:00
Lennart Rosam
dc8c32fb3f Refactoring: Added comments to every class, as well as a copyright
notice. Also, some classes were moved to packages where they make sense
2012-02-04 17:41:28 +01:00
Lennart Rosam
db0f0001f9 More refactoring 2012-02-04 16:23:41 +01:00
Lennart Rosam
896f145cf6 Improved first run experience and added additional icons 2012-02-01 00:43:28 +01:00
Lennart Rosam
32ce46d9d8 Added a landing page for the app. 2012-01-22 21:08:47 +01:00
Lennart Rosam
0a97bf3a39 Portrait layout was broken after refactoring 2012-01-22 21:05:10 +01:00
Lennart Rosam
30734a9404 Heavy refactoring: Moved UI things to UI packages 2012-01-22 19:05:47 +01:00
Lennart Rosam
09cbb3d20e Adjusted resolution according to googles specs 2012-01-22 13:03:28 +01:00
Bartek Przybylski
17455f57d2 fragments branch initial commit 2012-01-14 00:31:56 +01:00
Bartek Przybylski
8f9a9a8694 first run setup fix 2011-10-07 17:54:28 +02:00
Sven Aßmann
86cc60bc12 changing the syncadapter target model authority to android contacts 2011-09-27 11:28:23 +02:00
Bartek Przybylski
86261ea6e6 added syncadapter for xml 2011-09-17 17:10:32 +02:00
Bartek Przybylski
9ca5cc327d adding specified adapter for contacts and files 2011-09-17 16:03:05 +02:00
Bartek Przybylski
55bcc455d2 contentprovider for contacts added 2011-09-17 15:41:44 +02:00
Sven Aßmann
ae68956174 change the display text of sync account to: "Sync Files&Contacts" 2011-09-15 21:37:19 +02:00
Bartek Przybylski
6f16202543 proper filename displaying, bigger icons 2011-09-04 22:46:53 +02:00
Bartek Przybylski
7e20e39f25 missing files 2011-09-04 13:47:06 +02:00
Bartek Przybylski
769fe95791 new path style in main window 2011-09-04 13:35:27 +02:00
Bartek Przybylski
154bb85cf1 initial commit 2011-08-19 22:37:35 +02:00