Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reliable uploads #919

Closed
wants to merge 86 commits into from
Closed

Reliable uploads #919

wants to merge 86 commits into from

Commits on Oct 31, 2014

  1. cleanup uploader. add comments. uncomment unused functions. rename.

    Luke Owncloud committed Oct 31, 2014
    Configuration menu
    Copy the full SHA
    5af3c6d View commit details
    Browse the repository at this point in the history

  2. rename DbHandler to UploadDbHandler. Increase DB version. Fix UploadS… 

    …tatus enum.
    Luke Owncloud committed Oct 31, 2014
    Configuration menu
    Copy the full SHA
    ac002ce View commit details
    Browse the repository at this point in the history

  3. refactoring, commenting, understanding code. added TODO for FileUploa… 

    …dService.
    Luke Owncloud committed Oct 31, 2014
    Configuration menu
    Copy the full SHA
    64827cf View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2014

  1. using enums 

    cleaning up FileUploadService.onStartCommand
preparing persistant uploads
    Luke Owncloud committed Nov 4, 2014
    Configuration menu
    Copy the full SHA
    efe1849 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2014

  1. made UploadDbObject serializable

    Luke Owncloud committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    1369ef8 View commit details
    Browse the repository at this point in the history

  2. mActiveUploads

    Luke Owncloud committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    87d1c0e View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/develop' into retry_uploads

    Luke Owncloud committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    0d12225 View commit details
    Browse the repository at this point in the history

  4. test commit

    Luke Owncloud committed Nov 5, 2014
    Configuration menu
    Copy the full SHA
    05d29d9 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2014

  1. test commit

    Luke Owncloud committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    8ddb9db View commit details
    Browse the repository at this point in the history

  2. commenting, commenting, commenting!

    Luke Owncloud committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    9d28e9e View commit details
    Browse the repository at this point in the history

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

    Luke Owncloud committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    6d3a3e2 View commit details
    Browse the repository at this point in the history

  4. now upload works again as good (or as bad) as before. 

    check FileUploadService.java:

            //How does this work? Is it thread-safe to set mCurrentUpload here?
            //What happens if other mCurrentUpload is currently in progress?
            //
            //It seems that upload does work, however the upload state is not set
            //back of the first upload when a second upload starts while first is
            //in progress (yellow up-arrow does not disappear of first upload)
    Luke Owncloud committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    3e9ecca View commit details
    Browse the repository at this point in the history

  5. remove mDb.recreateDb()

    Luke Owncloud committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    503bcc3 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2014

  1. added first draft of uploadListActivity

    Luke Owncloud committed Nov 7, 2014
    Configuration menu
    Copy the full SHA
    ba7e62e View commit details
    Browse the repository at this point in the history

  2. undo unintended change

    Luke Owncloud committed Nov 7, 2014
    Configuration menu
    Copy the full SHA
    79c3756 View commit details
    Browse the repository at this point in the history

  3. consistently use UploadList (instead UploadsList)

    Luke Owncloud committed Nov 7, 2014
    Configuration menu
    Copy the full SHA
    d59fd3b View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2014

  1. Merge branch 'develop' of github.com:owncloud/android into reliable_u… 

    …ploads

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
    Luke Owncloud committed Nov 14, 2014
    Configuration menu
    Copy the full SHA
    1664d9e View commit details
    Browse the repository at this point in the history

  2. working on UploadListActivity

    Luke Owncloud committed Nov 14, 2014
    Configuration menu
    Copy the full SHA
    2b85ed5 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2014

  1. fix: do upload removed files

    Luke Owncloud committed Nov 16, 2014
    Configuration menu
    Copy the full SHA
    263164a View commit details
    Browse the repository at this point in the history

  2. sort by date

    Luke Owncloud committed Nov 16, 2014
    Configuration menu
    Copy the full SHA
    b2d8cec View commit details
    Browse the repository at this point in the history

  3. fix onclick

    Luke Owncloud committed Nov 16, 2014
    Configuration menu
    Copy the full SHA
    2ec1c65 View commit details
    Browse the repository at this point in the history

  4. use file icon

    Luke Owncloud committed Nov 16, 2014
    Configuration menu
    Copy the full SHA
    537434d View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2014

  1. Merge branch 'develop' of github.com:owncloud/android into reliable_u… 

    …ploads

Conflicts:
	src/com/owncloud/android/files/services/FileUploadService.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
    Luke Owncloud committed Nov 20, 2014
    Configuration menu
    Copy the full SHA
    97aa4e2 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2014

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

    Conflicts:
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
    Luke Owncloud committed Nov 25, 2014
    Configuration menu
    Copy the full SHA
    4d07fcc View commit details
    Browse the repository at this point in the history

  2. making UploadService an IntentService 

    added menu for uploadListActivity
created separate ConnectivityActionReceiver
    Luke Owncloud committed Nov 25, 2014
    Configuration menu
    Copy the full SHA
    1096f40 View commit details
    Browse the repository at this point in the history

  3. removed obsolete file

    Luke Owncloud committed Nov 25, 2014
    Configuration menu
    Copy the full SHA
    71c1bfb View commit details
    Browse the repository at this point in the history

  4. undo classpath change

    Luke Owncloud committed Nov 25, 2014
    Configuration menu
    Copy the full SHA
    b1e5654 View commit details
    Browse the repository at this point in the history

  5. fixing double upload issues

    Luke Owncloud committed Nov 25, 2014
    Configuration menu
    Copy the full SHA
    df7ca60 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2014

  1. start FileUploadService on app start 

    add comments
filter duplicate photos in InstantUploadBroadcastReceiver
    Luke Owncloud committed Nov 26, 2014
    Configuration menu
    Copy the full SHA
    07147e8 View commit details
    Browse the repository at this point in the history

  2. remove debug cmd

    Luke Owncloud committed Nov 26, 2014
    Configuration menu
    Copy the full SHA
    e0e9a7c View commit details
    Browse the repository at this point in the history

  3. added click action for UploadListActivity

    Luke Owncloud committed Nov 26, 2014
    Configuration menu
    Copy the full SHA
    8f768d8 View commit details
    Browse the repository at this point in the history

  4. use FileStorageUtils.fillOCFile in SynchronizeFolderOperation

    Luke Owncloud committed Nov 26, 2014
    Configuration menu
    Copy the full SHA
    d3be204 View commit details
    Browse the repository at this point in the history

  5. added log output 

    fix multiple calls of ConnectivityActionReceiver
    Luke Owncloud committed Nov 26, 2014
    Configuration menu
    Copy the full SHA
    8e9cf48 View commit details
    Browse the repository at this point in the history

  6. fixed multiple calls of ConnectivityActionReceiver

    Luke Owncloud committed Nov 26, 2014
    Configuration menu
    Copy the full SHA
    39abd71 View commit details
    Browse the repository at this point in the history

  7. Use OCFile inside UploadDbObject, 

    made OCFile serializable (requires casts to make invocation of Intent.putExtra() unambiguous)
    Luke Owncloud committed Nov 26, 2014
    Configuration menu
    Copy the full SHA
    d1386ea View commit details
    Browse the repository at this point in the history

  8. remove debug tag

    Luke Owncloud committed Nov 26, 2014
    Configuration menu
    Copy the full SHA
    6ca1c34 View commit details
    Browse the repository at this point in the history

  9. open UploadListActivity on click on upload failure notification

    Luke Owncloud committed Nov 26, 2014
    Configuration menu
    Copy the full SHA
    d08e436 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2014

  1. restructuring 

    added for uploading KEY_WHILE_CHARGING_ONLY
    Luke Owncloud committed Nov 27, 2014
    Configuration menu
    Copy the full SHA
    949c2ae View commit details
    Browse the repository at this point in the history

  2. moved upload helpers to UploadUtils

    Luke Owncloud committed Nov 27, 2014
    Configuration menu
    Copy the full SHA
    d7499fd View commit details
    Browse the repository at this point in the history

  3. prepare delayed uploads 

    commenting
    Luke Owncloud committed Nov 27, 2014
    Configuration menu
    Copy the full SHA
    28de702 View commit details
    Browse the repository at this point in the history

  4. commenting

    Luke Owncloud committed Nov 27, 2014
    Configuration menu
    Copy the full SHA
    4018af1 View commit details
    Browse the repository at this point in the history

  5. add ExpandableListFragment which is inherits from ExtendedListFragment 

    Only difference: it uses an ExpandableListView which supports dividing list into groups
    Luke Owncloud committed Nov 27, 2014
    Configuration menu
    Copy the full SHA
    37d3a72 View commit details
    Browse the repository at this point in the history

  6. introduce divisions in upload list view

    Luke Owncloud committed Nov 27, 2014
    Configuration menu
    Copy the full SHA
    eaab185 View commit details
    Browse the repository at this point in the history

  7. fix on click handler 

    added on long click handler
    Luke Owncloud committed Nov 27, 2014
    Configuration menu
    Copy the full SHA
    397dd7b View commit details
    Browse the repository at this point in the history

  8. remove on long click, add context menu instead

    Luke Owncloud committed Nov 27, 2014
    Configuration menu
    Copy the full SHA
    cf63d7c View commit details
    Browse the repository at this point in the history

  9. show details on simple click

    Luke Owncloud committed Nov 27, 2014
    Configuration menu
    Copy the full SHA
    86eccab View commit details
    Browse the repository at this point in the history

  10. added debug output

    Luke Owncloud committed Nov 27, 2014
    Configuration menu
    Copy the full SHA
    7d2f573 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2014

  1. fix progress notifications 

    fix handling multiple uploads with same filepath key
    Luke Owncloud committed Nov 28, 2014
    Configuration menu
    Copy the full SHA
    4518da5 View commit details
    Browse the repository at this point in the history

  2. fix cancel upload 

    add remove single upload from list
add retry upload
    Luke Owncloud committed Nov 28, 2014
    Configuration menu
    Copy the full SHA
    9445692 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2014

  1. set charging only default to false 

    add message for LATER status
enable retry option for all not-succeeded uploads
    Luke Owncloud committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    9e6d8c1 View commit details
    Browse the repository at this point in the history

  2. update db when retrying upload 

    allow LATER upload to be cancelled
    Luke Owncloud committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    3dacd24 View commit details
    Browse the repository at this point in the history

  3. remove not needed service looper

    Luke Owncloud committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    7428485 View commit details
    Browse the repository at this point in the history

  4. display complete LATER reason

    Luke Owncloud committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    142b894 View commit details
    Browse the repository at this point in the history

  5. git added filesize 

    improving status messages
    Luke Owncloud committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    0ff6921 View commit details
    Browse the repository at this point in the history

  6. fix store upload debug msg

    Luke Owncloud committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    34b630b View commit details
    Browse the repository at this point in the history

  7. fix GUI output

    Luke Owncloud committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    982befe View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2014

  1. Merge branch 'develop' of github.com:owncloud/android into reliable_u… 

    …ploads

Conflicts:
	SETUP.md
	owncloud-android-library
	src/com/owncloud/android/datamodel/OCFile.java
    Luke Owncloud committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    99d8243 View commit details
    Browse the repository at this point in the history

  2. fix GUI options

    Luke Owncloud committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    6ce8112 View commit details
    Browse the repository at this point in the history

  3. comments and less debug output

    Luke Owncloud committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    82c7771 View commit details
    Browse the repository at this point in the history

  4. comment

    Luke Owncloud committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    30f9abb View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2014

  1. Merge remote-tracking branch 'upstream/develop' into HEAD 

    Conflicts:
	owncloud-android-library
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
	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/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
    Luke Owncloud committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    2d0c347 View commit details
    Browse the repository at this point in the history

  2. change upload list layout according to #765 (comment)

    Luke Owncloud committed Dec 8, 2014
    Configuration menu
    Copy the full SHA
    0c0ef54 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2014

  1. removed unnecessary items from upload_list_item

    Luke Owncloud committed Dec 10, 2014
    Configuration menu
    Copy the full SHA
    fd6d57f View commit details
    Browse the repository at this point in the history

  2. use settings layout for upload list (remove group header background, … 

    …add underline, remove group icons)
    Luke Owncloud committed Dec 10, 2014
    Configuration menu
    Copy the full SHA
    11efd02 View commit details
    Browse the repository at this point in the history

  3. hide empty upload groups

    Luke Owncloud committed Dec 10, 2014
    Configuration menu
    Copy the full SHA
    61de793 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2014

  1. added right button for items in upload list (for cancel, retry, and r… 

    …emove)
    Luke Owncloud committed Dec 12, 2014
    Configuration menu
    Copy the full SHA
    3fdb78d View commit details
    Browse the repository at this point in the history

  2. give upload items as much vertical space as they need (wrap content)

    Luke Owncloud committed Dec 12, 2014
    Configuration menu
    Copy the full SHA
    0da591d View commit details
    Browse the repository at this point in the history

  3. refresh upload list on swipe down (this refreshes shown (relative) up… 

    …load times)
    Luke Owncloud committed Dec 12, 2014
    Configuration menu
    Copy the full SHA
    5632045 View commit details
    Browse the repository at this point in the history

  4. allow separately clearing failed and finished uploads

    Luke Owncloud committed Dec 12, 2014
    Configuration menu
    Copy the full SHA
    6dae38c View commit details
    Browse the repository at this point in the history

  5. tried to add clear button for upload groups. would be too much.

    Luke Owncloud committed Dec 12, 2014
    Configuration menu
    Copy the full SHA
    a8e2cf6 View commit details
    Browse the repository at this point in the history

  6. allow user to force uploads which are delayed (due to wifi-only, char… 

    …ge-only, or schedule for a later timestamp)
    Luke Owncloud committed Dec 12, 2014
    Configuration menu
    Copy the full SHA
    b8db750 View commit details
    Browse the repository at this point in the history

  7. added laterReason for once failed uploads

    Luke Owncloud committed Dec 12, 2014
    Configuration menu
    Copy the full SHA
    5879e1b View commit details
    Browse the repository at this point in the history

  8. typo

    Luke Owncloud committed Dec 12, 2014
    Configuration menu
    Copy the full SHA
    1922752 View commit details
    Browse the repository at this point in the history

  9. on click on item in upload list: open with default app

    Luke Owncloud committed Dec 12, 2014
    Configuration menu
    Copy the full SHA
    64c07f6 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2014

  1. make FileUploadService a Service (instead of IntentService)

    Luke Owncloud committed Dec 14, 2014
    Configuration menu
    Copy the full SHA
    a22fbdf View commit details
    Browse the repository at this point in the history

  2. move uploading to separate thread

    Luke Owncloud committed Dec 14, 2014
    Configuration menu
    Copy the full SHA
    875589a View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2014

  1. service.stopself after uploads done

    Luke Owncloud committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    5afd94b View commit details
    Browse the repository at this point in the history

  2. added cancel debug output

    Luke Owncloud committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    a690877 View commit details
    Browse the repository at this point in the history

  3. added progressbar for current item in upload list

    Luke Owncloud committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    e764c7d View commit details
    Browse the repository at this point in the history

  4. fix

    Luke Owncloud committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    0e05a97 View commit details
    Browse the repository at this point in the history

  5. fix progressbar issues

    Luke Owncloud committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    7741bd2 View commit details
    Browse the repository at this point in the history

  6. fix progress notification

    Luke Owncloud committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    d6625ee View commit details
    Browse the repository at this point in the history

  7. checks and debug output

    Luke Owncloud committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    2ad3ef2 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2015

  1. Merge branch 'develop' into reliable_uploads 

    Conflicts:
	SETUP.md
	owncloud-android-library
	res/menu/main_menu.xml
	res/values/strings.xml
	src/com/owncloud/android/db/DbHandler.java
	src/com/owncloud/android/db/ProviderMeta.java
	src/com/owncloud/android/files/FileMenuFilter.java
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/SynchronizeFileOperation.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/ComponentsGetter.java
	src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
	src/com/owncloud/android/ui/activity/FileActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
	src/com/owncloud/android/ui/activity/Uploader.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
    masensio committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    e5e5b36 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2015

  1. Merge branch 'develop' into reliable_uploads 

    Conflicts:
	src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
	src/com/owncloud/android/ui/activity/FileActivity.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/fragment/ExtendedListFragment.java
    masensio committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    3e6bcda View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2015

  1. Merge branch 'master' into reliable_uploads

    masensio committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    3c2da89 View commit details
    Browse the repository at this point in the history