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

2374 commits

Author SHA1 Message Date
Andy Scherzinger
d24b396d54 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-20 13:50:44 +02:00
Andy Scherzinger
a46eb270ab further m-prefixing 2015-08-20 13:46:27 +02:00
Andy Scherzinger
ee85bf9e8c fixed m-Prefixing 2015-08-20 13:39:59 +02:00
Andy Scherzinger
8db8b07be0 NullCheck for drawer 2015-08-20 12:47:31 +02:00
Andy Scherzinger
6219397371 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-20 11:39:25 +02:00
Andy Scherzinger
8b55e8b35c prefixed variables with 'm' 2015-08-20 11:35:40 +02:00
Jorge Antonio Diaz-Benito Soriano
ae0e116ffc Fixes the text preview issue 2015-08-19 21:07:14 +02:00
Andy Scherzinger
d83ca06e51 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-19 19:18:00 +02:00
Andy Scherzinger
2ce3e2707a NPE Fix for setting the color on the IndeterminateProgressDialog 2015-08-19 19:17:09 +02:00
Andy Scherzinger
7f13b98cc0 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	res/layout-land/account_setup.xml
	res/layout/account_setup.xml
 2015-08-18 23:20:01 +02:00
Andy Scherzinger
cbb0f8743f Fix for long click menue for account management in preferences screen 2015-08-18 23:13:10 +02:00
Andy Scherzinger
dbed65610b fix for the progress bar on pre lollipop devices via manipulating windowFrame, windowBackground and windowTitleBackgroundStyle 2015-08-18 22:09:53 +02:00
Jorge Antonio Diaz-Benito Soriano
97da4d5c8a Fixes the last reported bugs 2015-08-18 18:05:20 +02:00
Andy Scherzinger
da89715045 reverted back to light colored login 2015-08-18 17:48:10 +02:00
Jorge Antonio Diaz-Benito Soriano
21c391c0b2 Removes a static modifier that sneaked in 2015-08-18 17:39:50 +02:00
Jorge Antonio Diaz-Benito Soriano
3b2f51b5a5 Refactored functionality to use the new FolderPickerActivity class 2015-08-18 17:36:08 +02:00
Jorge Antonio Diaz-Benito Soriano
4fc0ef5abb Updated copy action 2015-08-18 17:20:56 +02:00
Jorge Antonio Diaz-Benito Soriano
ccf8741fab Added copy action 2015-08-18 17:00:51 +02:00
Jorge Antonio Diaz-Benito Soriano
bc50129881 Fixed 'Move' action 2015-08-18 16:21:39 +02:00
Jorge Antonio Diaz-Benito Soriano
db40d1ad68 Added 'ACTION_COPY_FILES'. 2015-08-18 16:15:00 +02:00
Jorge Antonio Diaz-Benito Soriano
dcffd79b60 Tweaks for source 1.5 2015-08-18 15:55:00 +02:00
Andy Scherzinger
e79f92f566 Conflict Dialog Fix 2015-08-18 13:57:09 +02:00
Jorge Antonio Diaz-Benito Soriano
fe5b6aa4a8 Added copy action 2015-08-18 13:35:28 +02:00
Andy Scherzinger
a393531774 visual fix for Progress DialogFragment(s) 2015-08-18 13:08:58 +02:00
Jorge Antonio Diaz-Benito Soriano
c7205b8f56 Added CopyActivity 2015-08-18 11:39:18 +02:00
Jorge Antonio Diaz-Benito Soriano
dc8ceffddc Fixed 'Move' action 2015-08-18 11:37:23 +02:00
Jorge Antonio Diaz-Benito Soriano
d9db150a31 Added 'ACTION_COPY_FILES'. 2015-08-18 11:17:54 +02:00
Andy Scherzinger
b669bd7737 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-17 16:04:17 +02:00
Andy Scherzinger
4ff231f256 Java Doc added 2015-08-17 16:00:16 +02:00
Andy Scherzinger
ba80646e4e Fix for 4.0 file action context menu (re-implement it via DialogFragment) 2015-08-17 15:58:03 +02:00
Andy Scherzinger
172767d391 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-14 19:34:08 +02:00
Andy Scherzinger
66bae3914c read cover art for audio file (works for mp3) and displays it in the media player, sets the default logo (as before) in case it couldn't read and convert a cover art. 2015-08-14 19:33:23 +02:00
Andy Scherzinger
267179ef2e Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-14 18:55:58 +02:00
Andy Scherzinger
71f68b4c8c fix for progressbars on pre lollipop and post ics for seekbar thumbs 2015-08-14 18:55:31 +02:00
Andy Scherzinger
92af92ee3b merged part of the fixes from material buttons branch to fix bugs reported in PR #1076 2015-08-14 17:18:36 +02:00
Andy Scherzinger
abb6e2dbd5 Move to AppCompat AlertDialog for proper rendering on pre-lollipop devices 2015-08-14 15:29:22 +02:00
Andy Scherzinger
607fb6f587 group change data and size together and calculate decimals based on total size see comment in PR #1090 2015-08-14 10:05:26 +02:00
tobiasKaminsky
be5dbcbb2e fixed bug caused by rotating the device 2015-08-13 20:11:58 +02:00
Andy Scherzinger
414f43f326 fixed arrow coloring on the pull to refresh on the file list 2015-08-13 19:28:44 +02:00
Andy Scherzinger
1c7de5c7a5 coloring the progress wheel 2015-08-13 19:16:11 +02:00
Andy Scherzinger
455b349c08 moved everything to AppCompatActivity since ActionBarActivity is deprecated 2015-08-13 18:46:19 +02:00
Andy Scherzinger
bbd529289c Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-13 17:58:58 +02:00
Andy Scherzinger
bac0fa5f28 move from deprecated ActionBarActivity to AppCompatActivity 2015-08-13 17:54:33 +02:00
Andy Scherzinger
af2af7198b Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	res/layout/ssl_untrusted_cert_layout.xml
	res/layout/ssl_validator_layout.xml
 2015-08-13 15:57:38 +02:00
Andy Scherzinger
60e0f09278 Fix for ssl popups padding, button style changed to borderless, fixed weight on buttons 2015-08-13 15:41:59 +02:00
Andy Scherzinger
05ca0270a8 fixed button style blue/grey 2015-08-12 18:54:27 +02:00
masensio
eda6f71491 Move create folder button to action bar in Uploader 2015-08-11 11:14:26 +02:00
Andy Scherzinger
456647c996 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons 2015-08-10 11:19:23 +02:00
David A. Velasco
64ebb2c1d3 Enforce to recalculate row height when measuring the footer to get it correctly placed in the grid view 2015-08-10 11:12:43 +02:00
Andy Scherzinger
0d75348b30 use custom checkbox images (material design) while toggling 2015-08-07 18:20:51 +02:00
Andy Scherzinger
ddd01569cd Optimized translucence for lollipop on image preview 2015-08-06 19:14:52 +02:00
Andy Scherzinger
6b6227125b added back translucent action bar for image preview 2015-08-06 19:04:22 +02:00
Andy Scherzinger
9d9efd1c1d Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar 
Conflicts:
	owncloud-android-library
 2015-08-06 17:23:02 +02:00
Andy Scherzinger
a257935b8c Bugfix für Lollipop AlertDialog Bug (see styles), moved away from android referenced icon to self-shipped version for design consistency 2015-08-06 17:13:00 +02:00
Andy Scherzinger
1ce7d79ff0 Move alert dialog to material variant and setting the correct accent color for the button texts via styles 2015-08-06 16:27:56 +02:00
David A. Velasco
6a8034ec24 Added username to SAML credentials 2015-08-06 10:23:29 +02:00
purigarcia
91000ba405 change the subject 2015-08-06 10:23:27 +02:00
masensio
d1257b34c0 Fix problems in PreviewTextFragment related with changes in develop 2015-08-05 17:18:17 +02:00
masensio
b694fee63d Merge commit 'refs/pr/707' into text_file_preview_pr_707_with 
Conflicts:
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-08-05 16:48:12 +02:00
Andy Scherzinger
f289998946 removed unused listener (would only be useful in case of using toolbar instead of actionbar) 2015-08-05 13:01:37 +02:00
Andy Scherzinger
3956a50855 fixed deprecated getDrawable call 2015-08-05 12:58:40 +02:00
Andy Scherzinger
7c9c4a4ca6 remove two-times init of the drawer 2015-08-05 12:54:31 +02:00
Andy Scherzinger
e36349f77e fixing the progressbar corner glitch, bumping style of indeterminate animation to material style via appcompat, fixing progress bar for folder picker too, see comment 2015-08-04 18:32:33 +02:00
David A. Velasco
3512eae861 Fixed double request for ConflictsResolveActivity 2015-08-04 16:47:46 +02:00
tobiasKaminsky
e1ab4a41aa download file if "use server version" 2015-08-04 12:39:59 +02:00
tobiasKaminsky
1327ce7315 renamed string values 2015-08-04 12:39:56 +02:00
Andy Scherzinger
a51fcd31a7 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar 2015-08-03 21:39:27 +02:00
Andy Scherzinger
6235022b56 Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar 2015-08-03 21:38:32 +02:00
tobiasKaminsky
8b23c3a7a6 ignore hidden files also if they are images for counting 2015-08-02 08:19:28 +02:00
AndyScherzinger
5b6bde5efc now works for initial opening and browsing down once 2015-07-31 17:22:19 +02:00
gstraube
aec910ff83 Check if ETag for remote folder is null, i.e. it was not received from the server 2015-07-28 22:05:54 +02:00
purigarcia
65fe0be763 merge develop 2015-07-28 10:47:08 +02:00
purigarcia
f068a156c5 merge develop 2015-07-28 10:46:13 +02:00
AndyScherzinger
bfea14e876 setting the username on the drawer header for startup and coming back from the preferences screen for account switching 2015-07-27 20:20:46 +02:00
AndyScherzinger
4b9190baea npe fix for file upload on instance saving since actionbar in list mode doesn't habe a title 2015-07-27 00:25:34 +02:00
AndyScherzinger
77c5ce77b2 removed unused lagacy code 2015-07-26 19:40:53 +02:00
AndyScherzinger
e72caebbce fine tuning icon work on login screen, making landscape visually en par with portrait mode 2015-07-26 18:36:00 +02:00
AndyScherzinger
49b3acd2be added indeterminate progress bar to show activity since this isn't supported by AppCompat anymore 2015-07-26 17:52:29 +02:00
AndyScherzinger
53bbdfb0e8 in case of open drawer close it onBackPressed 2015-07-26 02:25:25 +02:00
AndyScherzinger
d474239b21 initial material design changes for the action bar 2015-07-26 01:49:27 +02:00
David A. Velasco
c21fa6c6e5 Merge pull request #1050 from owncloud/favourites_context_menu 
'Kept-in-sync' renamed as 'Favourites' and added to context menu in list of files
 2015-07-23 09:37:13 +02:00
purigarcia
61e6191342 change the name of the method from keepInSync to favorite. Other changes commented in the review 2015-07-22 18:13:45 +02:00
David A. Velasco
ff82b51e49 Merge pull request #1048 from owncloud/shareWithYou_icon_in_fileList 
ShareWithMe icon in file list
 2015-07-20 12:27:52 +02:00
purigarcia
f7211fe486 remove empty line 2015-07-20 12:20:15 +02:00
purigarcia
5cc79b0919 modify for the review 2015-07-20 12:18:44 +02:00
purigarcia
c7817b9302 modify code to be simpler 2015-07-20 10:57:53 +02:00
masaaki matsuo
a601a0e06e Dispaly thumbnail when file is image 2015-07-17 01:03:49 +09:00
tobiasKaminsky
29156ff73b add checker pattern for FileList 2015-07-11 09:31:35 +02:00
tobiasKaminsky
0527754c50 add checker background pattern for all png images. 2015-07-11 09:18:26 +02:00
purigarcia
6b82b98abf remove a space 2015-07-10 08:49:35 +02:00
purigarcia
066324f60a save the state before rotate 2015-07-09 16:40:29 +02:00
purigarcia
a09e473555 Remove code that should not be in this pr 2015-07-09 09:35:28 +02:00
purigarcia
569625c677 encode the path 2015-07-09 09:30:30 +02:00
purigarcia
a2ac8c19a3 shareByLink in folder in gridview is shown is shown 2015-07-08 18:18:51 +02:00
purigarcia
451513a35d in gridview in the folder, icons are not shown 2015-07-08 18:14:38 +02:00
purigarcia
0e95ee3e67 shareWithMe is shown in the file list 2015-07-08 17:41:41 +02:00
purigarcia
31768aabce update the menu in the preview of the video 2015-07-08 16:54:39 +02:00
purigarcia
c1d4106c71 refresh menu in the preview of an image 2015-07-08 14:40:07 +02:00
purigarcia
782713b391 add action finished in FileActivity 2015-07-08 13:33:14 +02:00
purigarcia
38186052e7 remove a log 2015-07-08 11:15:22 +02:00
purigarcia
354e3aed5c add actions in the preview 2015-07-08 10:57:37 +02:00
purigarcia
4e66d6acd8 Actions in the detail view 2015-07-08 10:32:58 +02:00
purigarcia
96e2a2b97b toggleKeepInSync is moved to FileOperationsHelper 2015-07-08 10:22:41 +02:00
purigarcia
f226b5f93a add the action in the context menu 2015-07-08 10:17:27 +02:00
purigarcia
684104ccb8 reuse a existing method, remove the new one 2015-07-08 09:12:40 +02:00
purigarcia
f0c302b0f8 first step to detect if the file is favorite 2015-07-08 09:08:49 +02:00
purigarcia
d039386831 options are not shown if it is a foler 2015-07-08 08:58:06 +02:00
purigarcia
32346efa62 this two options are not shown if the file is downloading or uploading 2015-07-08 08:55:41 +02:00
David A. Velasco
0f0e210d69 Fixed title in action bar when user clicks on upload notification in progress / failed 2015-07-02 13:03:48 +02:00
David A. Velasco
04d4be82cb Fixed condition to browse up when current file shown is uploading for first time or a failed upload 2015-07-02 12:08:36 +02:00
tobiasKaminsky
57991cb8c4 revert previous commit 2015-06-27 21:48:34 +02:00
tobiasKaminsky
ddb1e41753 enabling video thumbnails 2015-06-27 21:16:03 +02:00
David A. Velasco
bded939b5e Fixed bug in access to same folder than last time when a file is shared with OC to upload 2015-06-26 09:07:51 +02:00
David A. Velasco
9babe1b38c Merge branch 'develop' into release-1.7.2 2015-06-25 14:43:04 +02:00
Jorge Antonio Díaz-Benito Soriano
efbab82a6e Moved text load call to onStart 2015-06-25 12:49:45 +02:00
masensio
a818aaca47 Fixed upload of files into non-root folders 
Fixed condition selecting grid or list mode - at least an image!
 2015-06-25 09:13:37 +02:00
David A. Velasco
907e63a103 Replaced constructor with parameter in FileDetailsFragment with static method and setArguments 2015-06-25 09:10:49 +02:00
David A. Velasco
51a04aa541 Refactored extractions of server version from AccountManager through 
AccountUtils; fixed line lengths and some warnings
 2015-06-25 09:10:48 +02:00
David A. Velasco
1a3a150248 Automatic grid view is only enabled if server supports remote thumbnails and ALL the files in a folder are images 2015-06-25 09:10:47 +02:00
Jorge Antonio Diaz-Benito Soriano
cc0627db93 Implementation of the requested changes to the asynctask that loads the text 2015-06-24 22:38:39 +02:00
Jorge Antonio Diaz-Benito Soriano
1508e99e9a Added exception logging 2015-06-24 22:24:39 +02:00
Jorge Antonio Diaz-Benito Soriano
4c17d77a6c Added braces to single-line if statements 2015-06-24 22:14:58 +02:00
David A. Velasco
8107d9dc4f Fixed wrong format of files & folder count 2015-06-23 14:40:51 +02:00
David A. Velasco
8c5b2b7b13 Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2 2015-06-22 14:56:13 +02:00
masensio
fb57bbc8c8 Merge pull request #1023 from owncloud/fix_issues_from_Transifex 
Message with count of list(s) and folder(s) reestructured for better translations
 2015-06-22 14:14:36 +02:00
masensio
84678c9903 Fix: Import file from other app shows all folders as TextView 2015-06-22 12:58:41 +02:00
David A. Velasco
69a5b6f25d More i18n-friendly format for footer in list of files (no string composition) 
Conflicts FIXED:
	res/values/strings.xml
 2015-06-22 11:42:37 +02:00
masensio
e7710e7383 Update string subject_token and update library reference 2015-06-19 15:11:49 +02:00
Sean
1551a5280a Trigger media scan after file upload 
After a successful upload, the uploaded file is saved locally on the
device but the media scan was not getting triggered.
 2015-06-18 15:42:06 +01:00
masensio
75fd0f40c6 Merge branch 'develop' into forbidden_characters_from_server 
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
	src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
 2015-06-15 14:51:13 +02:00
masensio
fbfb6dee90 Merge remote-tracking branch 'origin/develop' into navigationDrawer_basic 
Conflicts:
	.travis.yml
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2015-06-15 14:07:49 +02:00
David A. Velasco
d4390de111 Save target location of server behind a permanent redirection after password validation 2015-06-11 09:42:21 +02:00
David A. Velasco
5160dc58dc Fixed bug of action bar position in PreviewImageActvitiy in Android <=4.2 2015-06-09 11:17:01 +02:00
masensio
6cf7c72ce3 Fix, Title is not correct when rotating the device 2015-06-05 12:26:12 +02:00
masensio
705d2eb773 Fix, the message is not correct when creating a folder with / 2015-06-04 19:01:13 +02:00
masensio
65ff5a374a Fix, title is not correct when menu is shown and rotate 2015-06-04 18:41:07 +02:00
masensio
b6d7cd73c7 Fix issue #1000 2015-06-04 11:02:21 +02:00
David A. Velasco
88ded5540a Fixed home button in action bar for PreviewImageActvitiy when navigation drawer is shown 2015-06-03 13:36:09 +02:00
David A. Velasco
a45c0f57f9 Refactor method to update title and home (up) button of FileActivity 2015-06-03 13:29:11 +02:00
David A. Velasco
4d7b5a1e50 Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic 2015-06-03 11:09:19 +02:00
David A. Velasco
6779b77f3b Disable navigation drawer in gallery view when system bars are not visible 2015-06-03 11:05:10 +02:00
masensio
d4c13821ef Add new message for Rename, Move and Uploads 2015-06-03 09:46:32 +02:00
masensio
5f47524864 fix, in a tablet, the title is not correct when menu is shown and rotating 2015-06-02 15:26:42 +02:00
masensio
bad83f956d Fix, the correct navigation not shown in the action bar 2015-06-02 14:48:56 +02:00
masensio
b7dfc0aa41 Fix, App crash after rotate the device previewing an image 2015-06-02 14:16:48 +02:00
masensio
d4c14f8b29 Fix: app crash when trying to edit the url. Fix a problem from android support library v7 (19) 2015-06-02 14:01:42 +02:00
masensio
80108e336f Parse and show the error of invalid characters coming from the server side. Show new message in CreationFolder 2015-06-02 13:07:54 +02:00
masensio
afaa2879d1 Filter only '/' character in user input when version of server is 8.1 or later 2015-06-02 09:38:47 +02:00
David A. Velasco
05e2bf041d Close drawer before jumping to other activities so that it's not still open when come back later 2015-06-02 01:41:11 +02:00
David A. Velasco
7a941e0b0b Better swipe from left to open drawer in preview of video files 2015-06-02 01:34:45 +02:00
David A. Velasco
0117006313 Fixed update of id.home action bar button on navigation through FileDisplayActivity 2015-06-02 01:00:14 +02:00
David A. Velasco
bf23f0b5e9 Recover exit on BACK pressed 2015-06-02 00:05:08 +02:00
David A. Velasco
78158aa4a3 Fixed title and up button in Settings activity 2015-06-01 13:52:08 +02:00
masensio
1363f6686d Fix: Folder name is lose when changing the orientation of the device 2015-05-29 15:19:59 +02:00
masensio
d843140686 Fix, Logs option doesn't work 2015-05-29 13:14:42 +02:00
masensio
c66f578ace Change hamburguer icon by arrow when it is needed. Remove some imports 2015-05-29 12:42:53 +02:00
masensio
cf535b70f1 Disable 'Accounts' in Navigation Drawer 2015-05-29 11:32:36 +02:00
masensio
3603c122ff Home button shows an arrow when user is into a folder 2015-05-29 10:57:15 +02:00
masensio
1c3f88c456 Fix refresh folder name in action bar title 2015-05-29 10:51:45 +02:00
masensio
f89e112f14 Remove code related with action bar folder list 2015-05-29 09:33:17 +02:00
masensio
e78102d123 Remove drop-down list in action bar 2015-05-28 18:37:43 +02:00
masensio
d789d304e3 Click on OC icon shows the navigation drawer if the current folder isn't the root folder 2015-05-28 14:43:30 +02:00
masensio
d05160c1e2 Show root folder when click on 'All files' option 2015-05-28 14:27:50 +02:00
masensio
6e2dd6b191 Enable fitsSystemWindows in drawer.xml 2015-05-28 13:18:56 +02:00
masensio
c83925b454 Add license in some files 2015-05-28 11:30:02 +02:00
masensio
db01425a07 Add NavigationDrawer to image preview 2015-05-28 11:07:14 +02:00
tobiasKaminsky
bf880e97cc removed import 2015-05-27 19:16:08 +02:00
tobiasKaminsky
dd1675e925 removed dependency to Hex 2015-05-27 19:07:40 +02:00
tobiasKaminsky
3dc9a78696 Updated to work with latest update 2015-05-27 18:50:09 +02:00
tobiasKaminsky
a75ffde65f Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update 2015-05-27 18:35:39 +02:00
tobiasKaminsky
e80828afed Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update 2015-05-27 18:35:21 +02:00
masensio
7196b88374 Include again 'Refresh account' in the menu 2015-05-27 17:50:34 +02:00
masensio
c20041d157 Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update 
Conflicts:
	res/menu/main_menu.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/FolderPickerActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
 2015-05-27 14:19:30 +02:00
tobiasKaminsky
bc5e05934f added rectangle with first character 2015-05-26 20:49:03 +02:00
masensio
e934f015e8 Enable 'Logs' navigation drawer entry only in DEBUG mode 2015-05-26 12:55:40 +02:00
masensio
a9dad9e480 Add content_description to Navigation Drawer options 2015-05-26 11:46:15 +02:00
masensio
101989b70c Move 'Logs' from Settings to Navigation Drawer 2015-05-26 09:11:27 +02:00
masensio
6d8fc58eab Remove some imports 2015-05-26 08:48:36 +02:00
masensio
015eb6fee9 Disable On Device option in Navigation Drawer 2015-05-26 00:01:39 +02:00
masensio
4f2f0ceb80 Add actionBar 2015-05-25 12:39:05 +02:00
tobiasKaminsky
ed118c952a Changed computing of account name color 2015-05-24 08:53:58 +02:00
tobiasKaminsky
293d636f3a Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update 
# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties
#	owncloud-android-library
#	res/layout-land/account_setup.xml
#	res/layout/account_setup.xml
#	res/layout/list_item.xml
#	res/layout/uploader_list_item_layout.xml
#	res/menu/main_menu.xml
#	res/values/colors.xml
#	res/values/strings.xml
#	src/com/owncloud/android/MainApp.java
#	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
#	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
#	src/com/owncloud/android/ui/activity/Preferences.java
#	src/com/owncloud/android/ui/activity/Uploader.java
#	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
#	src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
#	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
#	src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
#	src/com/owncloud/android/utils/BitmapUtils.java
 2015-05-23 07:44:16 +02:00
tobiasKaminsky
6d4207a06b Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update 2015-05-21 21:12:44 +02:00
masensio
5f2820355d Merge branch 'develop' into navigation_drawer 
Conflicts:
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
 2015-05-21 09:46:59 +02:00
David A. Velasco
a3642ab864 Improved load of images in PreviewImageFragment - no more images in full size by default, up to 3 tries to downScale 2015-05-18 14:29:00 +02:00
masensio
a496f08717 Remove actionbarsherlock , replace it with Android Support Library (v7) 2015-05-18 12:59:46 +02:00
David A. Velasco
c0ef93882e Removed extra public constructor from Fragments handled by PreviewImageActivity 2015-05-14 18:05:12 +02:00
David A. Velasco
7f7af85f12 Better condition 2015-05-12 14:42:57 +02:00
David A. Velasco
dd35ee031b Close that stream... 2015-05-12 14:10:53 +02:00
David A. Velasco
25f5eb193e Merge remote-tracking branch 'origin/thumbnailOOM' into thumbnailOOM 2015-05-12 13:32:56 +02:00
David A. Velasco
10e4373bcf Minor changes after reviewing Bitmaps life cycle in PreviewImageFragment 2015-05-12 13:32:01 +02:00
masensio
e24b31f42d Replace call to get.ResponseBody with get.getReponseBodyAsStream in ThumbnailsCacheManager 2015-05-12 13:25:36 +02:00
masensio
f448a36456 Merge branch 'develop' into thumbnailOOM 2015-05-11 14:58:47 +02:00
David A. Velasco
47343ca299 Merge pull request #973 from owncloud/delete_share_option_in_app 
Make share feature configurable
 2015-05-08 14:55:07 +02:00
David A. Velasco
8d48929f5b Fixed build 2015-05-08 11:27:20 +02:00
masensio
6f3e8fbb85 Merge branch 'develop' into thumbnailOOM 2015-05-06 13:42:43 +02:00
David A. Velasco
5e1f98dcaf Fixes after crossed review 2015-05-06 09:13:10 +02:00
masensio
7d82231809 Merge branch 'develop' into pinEnhancement 2015-05-05 13:56:57 +02:00
masensio
ddbb5d2522 Merge branch 'develop' into thumbnailOOM 2015-05-05 13:53:56 +02:00
David A. Velasco
dcd8dde864 Merge branch 'develop' into pinEnhancement 2015-05-05 13:43:01 +02:00
David A. Velasco
c04d9c2198 Merge remote-tracking branch 'origin/pinEnhancement' into pinEnhancement 2015-05-05 13:42:51 +02:00
masensio
b9c4fab1cb Change message when entering an incorrect pass code 2015-05-05 13:37:18 +02:00
masensio
8debbb5f90 Changes from comments in PR#967, Second part 2015-05-05 13:18:49 +02:00
masensio
3c07444ff7 Changes from comments in PR#967 2015-05-05 12:56:14 +02:00
David A. Velasco
ef034fd6b8 Removed commented code 2015-05-05 12:49:38 +02:00
masensio
7eea2ea507 Merge branch 'develop' into thumbnailOOM 2015-05-05 10:31:46 +02:00
David A. Velasco
930d21dc93 Removed unneeded toggling on 'selected' state 2015-05-05 10:28:49 +02:00
David A. Velasco
4f0cc76a12 Removed unneeded toggling on cursor visibility 2015-05-05 09:54:49 +02:00
David A. Velasco
5aa9789a2e Reduced duplicated code with a common TextWatcher implementation for all the input fields 2015-05-05 09:49:11 +02:00
masensio
20cc8a1551 Trying fix travis fail 2015-05-05 09:32:49 +02:00
David A. Velasco
510c00f66d Cleaned code in PassCodeActivity 2015-05-05 00:07:24 +02:00
masensio
05df07a362 Enable/disable share option in the menu: long press and details menu, using setup option 2015-05-04 14:54:49 +02:00
masensio
50622d6415 Fix bug: Choose account menu doesn't disappear after rotate the device 2015-05-04 13:39:07 +02:00
David A. Velasco
08de1b153d Added license header to PassCodeManager 2015-05-04 11:43:51 +02:00
David A. Velasco
9593b580b7 Replaced 'PIN code' by 'pass code' 2015-05-04 11:41:09 +02:00
David A. Velasco
3eb64bcdd7 When pass code is enabled, the app is sent to background if the screen is turned off and the windows are made secure to prevent they are rendered in the 'recents' menu 2015-05-04 10:52:57 +02:00
masensio
7d33176509 Fix bug: List of files is not the correct one 2015-04-30 18:12:23 +02:00
David A. Velasco
f186149787 Fixed lost uppercase 2015-04-30 16:26:34 +02:00
David A. Velasco
2f97466301 Added pass code protection to AuthenticatorActivity 2015-04-30 16:06:06 +02:00
David A. Velasco
8925a0a7c6 Logs on activities life cycle simplified 2015-04-30 13:30:55 +02:00
David A. Velasco
84e99c3cc7 Prevent that PIN code is requested when system windows partially overlapping the app disappear and the app is resumed 2015-04-30 13:21:28 +02:00
masensio
7d5c573766 Show Waiting dialog, while copy temporal file async task is working 2015-04-30 13:04:51 +02:00
masensio
e242c5a45f Copy file to upload for all kind of files, not only for images. 2015-04-29 18:27:45 +02:00
David A. Velasco
e0867d2b28 Refactored location of passcode check: a callback to rule them all 2015-04-29 16:50:30 +02:00
masensio
b064bd4591 Execute the file to upload copy in an AsyncTask 2015-04-29 12:42:10 +02:00
masensio
42fde39ff1 Get file to upload and copy into a temporal file (Uploads#uploadFiles 2015-04-28 14:22:35 +02:00
David A. Velasco
802a164616 Merge branch 'develop' into pinEnhancement 
Conflicts SOLVED:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/activity/Uploader.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-04-28 14:20:17 +02:00
David A. Velasco
b058d008a1 FileActivity does not need to 'remember' the current account in configuration changes 2015-04-27 12:27:09 +02:00
David A. Velasco
2fcffbd3d5 Merge pull request #957 from owncloud/fix_crash_invalid_server_url 
Fix crash when typed invalid URL
 2015-04-22 11:01:52 +02:00
David A. Velasco
1b628540c9 Fixes after CR 2015-04-22 10:33:58 +02:00
David A. Velasco
968c535e19 Merge branch 'develop' into loging_different_servers_same_pattern 
Conflicts SOLVED in:
	src/com/owncloud/android/ui/activity/FileActivity.java
 2015-04-22 09:35:37 +02:00
masensio
870b8c0726 Filter dots at the beginning of the url 2015-04-21 13:50:13 +02:00
David A. Velasco
21c34ee6d4 Transaction signaled as successful in the right place - and some clean-up 2015-04-21 10:16:11 +02:00
tobiasKaminsky
6b0af82960 HOTFIX: prevent OOM when scrolling Thumbnails 2015-04-19 11:04:32 +02:00
David A. Velasco
5ca1b94865 Fixed now - FileDisplayActivity is not recreated anymore when the user selects another account 2015-04-17 14:32:35 +02:00
masensio
eac77d8749 Show an error message for invalid server url 2015-04-17 14:10:41 +02:00
David A. Velasco
ea14d6247e Got rid of other old dialogs in FileDisplayActivity 2015-04-17 13:49:01 +02:00
David A. Velasco
bed85b265a Some minor clean-up 2015-04-17 13:48:45 +02:00
David A. Velasco
8aa0060f4a Fixed bug: depecrated showdialog should not be used anymore, DialogFragment used instead 2015-04-17 13:45:45 +02:00
masensio
98f73400ca Fix bug: when installing the app for the first time, app crashes 2015-04-17 12:49:39 +02:00
masensio
f12956fe2a Remove comments 2015-04-17 11:05:13 +02:00
masensio
74b8e1a536 Replace rawQuery by query, onUpgrade --> updateDownloadedFiles 2015-04-17 09:00:53 +02:00
masensio
77ed62dbcf Replace account.name by newAccountName in onUpgrade 2015-04-16 17:21:47 +02:00
masensio
27147e5e08 Select * in updateDownloadedFiles 2015-04-15 18:50:59 +02:00
masensio
ab7c998d07 Changes in update for downloaded files 2015-04-15 18:37:12 +02:00
masensio
123c7fc1cd Update downloaded files 2015-04-15 18:15:57 +02:00
masensio
d9e22f0752 Merge pull request #946 from owncloud/upgrading_account_manager 
Upgrading account manager
 2015-04-15 13:07:14 +02:00
David A. Velasco
cc9431feeb Upgraded accounts in AccountManager with new account name 2015-04-15 12:52:07 +02:00
masensio
19be4b4a6f Remove old update sql for 10 version, in onUpgrade method 2015-04-15 12:25:18 +02:00
masensio
ef948a46fd Change update query and add log in onUpgrade (10 DB version) 2015-04-15 10:14:19 +02:00
David A. Velasco
1c579d1eb0 Removed 'support' for WebDAV entry point before OC 4, and dependent unused code 2015-04-14 15:00:43 +02:00
David A. Velasco
28d3b5fdaa Removed unused method 2015-04-14 14:42:39 +02:00
David A. Velasco
47dcbb219e Modify upgrade of account names in database; upgrade of accounts in AccountManager will be done before, not after 2015-04-14 14:34:27 +02:00
masensio
7efd1076aa Upgrade account name in all the rows of files table in database 2015-04-14 11:37:08 +02:00
masensio
56703df78e Udpate imports in MainApp 2015-04-09 13:35:50 +02:00
masensio
7696c08565 Hotfix user_agent 2015-04-09 11:16:13 +02:00
David A. Velasco
340428d820 Once again, disable session based client 2015-03-31 14:29:09 +02:00
David A. Velasco
4fbce341be Fixed crashes in Android 2.x due to accesibility code 2015-03-30 14:38:26 +02:00
masensio
9177f1487a Enable session support ( in MainApp ) 2015-03-26 09:23:46 +01:00
David A. Velasco
fef1f5c31e Emergency fix: accesibility additions break Android 2.x 2015-03-25 11:28:02 +01:00
David A. Velasco
6bef4abf74 Merge pull request #924 from owncloud/add_user_agent_support 
Updated after adding custom user agent support to library
 2015-03-25 10:57:04 +01:00
masensio
90d84ca927 Changes from comments in PR#924 2015-03-25 09:10:32 +01:00
masensio
0de25b228c Update uger agent string 2015-03-24 14:44:05 +01:00
masensio
6af93bfdde Refactor parameter user_agent out of RemoteOperation and children 2015-03-24 14:32:13 +01:00
masensio
6d3bbd8bf3 Modify User Agent string 2015-03-24 13:27:17 +01:00
masensio
c3616e9001 Clean code, after validation 2015-03-24 12:57:35 +01:00
masensio
7c49aa940d fix bug:When rotating the device, alert to choose the account is shown again 2015-03-23 15:01:17 +01:00
masensio
d6701bf8d5 Fix bug: Folder is created in the wrong account 2015-03-20 15:12:33 +01:00
masensio
c0da8a93f2 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-20 14:55:48 +01:00
David A. Velasco
5ebd90ed2d Merge pull request #914 from owncloud/accessibility 
Added accesibility descriptions as a mean to add automatic tests un UI.
 2015-03-19 12:59:17 +01:00
masensio
7a42dc2bf4 Add user-agent string to setup options 2015-03-18 17:08:42 +01:00
masensio
b22e231909 Merge branch 'develop' into add_user_agent_support 2015-03-18 09:37:55 +01:00
masensio
879160bebe Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-18 09:20:02 +01:00
masensio
e230ce33f7 Fix bug: Files/folders shown are not the correct when upload a file from other app and rotate the device 2015-03-17 14:53:18 +01:00
masensio
5d843eec5d Fix bug: App crashes when upload a file from other app, create a folder and rotate the device 2015-03-17 12:46:43 +01:00
masensio
95e5a905cc Fix bug: App crahes after accessing a folder with gridview and then not 2015-03-16 14:27:23 +01:00
masensio
876204faf0 Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop 2015-03-16 11:15:27 +01:00
masensio
06d5cc9477 Add user agent in android project 2015-03-13 14:55:28 +01:00
masensio
d55c21ccfb Fix crash when navigate to upload a file 2015-03-13 12:31:11 +01:00
masensio
5c54df6af0 Reformat some lines 2015-03-13 12:30:47 +01:00
masensio
b3147346eb Fix crash in navigation in FileList 2015-03-12 18:41:03 +01:00
masensio
c963eb0fad Merge branch 'develop' into accessibility 
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
 2015-03-10 14:58:21 +01:00
masensio
88ff4ff910 Fix bug: Permission error is shown when it shouldn't 2015-03-10 14:27:22 +01:00
masensio
40ca3d9b21 Fix bug: After trying to share a file without permission, it's not possible to share a file 2015-03-09 15:16:42 +01:00
masensio
4a47e96bc7 Fix bug: password is shown, when in fact we do not have permission to share 2015-03-09 13:47:52 +01:00
masensio
6f1fe5ad6d Process share with password 2015-03-06 12:48:56 +01:00
masensio
82fa95fe43 Merge branch 'develop' into share_password_support 2015-03-06 10:19:06 +01:00
masensio
9da433bb7b Changes from comments in PR 2015-03-06 09:07:44 +01:00
masensio
9e55ef9585 Show password dialog 2015-03-05 18:02:40 +01:00
masensio
b08e9e35e6 Create password dialog: SharePasswordDialog.java 2015-03-05 17:54:03 +01:00
masensio
0bef9fdedb Update year in license 2015-03-05 13:27:45 +01:00
masensio
3d3046dc26 Add author's line in license 2015-03-05 12:36:30 +01:00
jabarros
21c7755858 Added item name to ContentDescription property in list item linearlayout of FileListListAdapter 2015-03-03 14:12:15 +01:00
masensio
01fc29c892 Bug fixed: Upload fails 2015-02-25 09:09:41 +01:00
masensio
8d773ef002 Merge remote-tracking branch 'origin/cancel_transfer_for_deleted_users' into cancel_transfer_for_deleted_users 2015-02-24 15:09:54 +01:00
David A. Velasco
4d2b382785 Grant that the proper RemoteOperationResult is built when an upload is cancelled while copying to temporary space 2015-02-24 15:02:26 +01:00
masensio
2d697473a1 Merge branch 'develop' into cancel_transfer_for_deleted_users 2015-02-24 14:19:41 +01:00
David A. Velasco
2be8e301e5 Clean-up and minor refactoring 2015-02-23 13:22:44 +01:00
masensio
e3a61d283f Changes from comments, FileUploader and FileDownloader implement OnAccountsUpdateListener 2015-02-20 10:51:18 +01:00
masensio
0f7ea542c9 New method in IndexesForest: remove(Account account). Use this method for cancelling downloads 2015-02-20 10:23:46 +01:00