Skip to content
Snippets Groups Projects
  1. Oct 31, 2016
    • Torsten Grote's avatar
    • akwizgran's avatar
      Merge branch '707-implement-ux-for-showing-and-answering-private-group-invitations' into 'master' · 1e36f21c
      akwizgran authored
      Implement UX for showing and answering private group invitations
      
      As usual, this MR contains several logically separate commits that could be split out into smaller MRs if desired. It consists of two main parts:
      * Showing open invitations in the list of private groups with a snackbar
      * Showing invitations and responses in the private conversation
      
      For both parts, the existing code was refactored to allow for a smooth implementation and to leave maintainable code behind.
      
      ![device-2016-10-18-101549](/uploads/66582dbe97736fdcd2498e87e1c7dfd1/device-2016-10-18-101549.png)
      ![device-2016-10-18-101612](/uploads/8c25eff8171f330796a55cb27cdb2552/device-2016-10-18-101612.png)
      ![device-2016-10-18-101534](/uploads/ebba4c0a2c0f727dcadac8c2ec57b48f/device-2016-10-18-101534.png)
      
      Closes #707
      
      See merge request !357
      1e36f21c
  2. Oct 28, 2016
  3. Oct 27, 2016
  4. Oct 26, 2016
  5. Oct 25, 2016
  6. Oct 24, 2016
  7. Oct 21, 2016
    • akwizgran's avatar
      Merge branch '705-adapter-revisions' into 'master' · df44015c
      akwizgran authored
      Fix race conditions when updating UI from events (again)
      
      This is my second attempt at fixing race conditions caused by updating the UI from events while background tasks are loading data from the DB. Unlike my first attempt, this one is pretty simple and doesn't require too much reasoning about possible races.
      
      The first commit fixes a few list loading bugs I found while working on this problem, and moves the lifecycle callbacks from resume/pause to start/stop, closing #609. The second commit contains the fix for #705, which works as follows:
      
      * Each BriarAdapter has a revision counter
      * Before making a change to the adapter that could be overwritten by a background task, increment the revision
      * Before starting a background task that could overwrite other changes, get the current revision
      * Before applying changes from a background task that could overwrite other changes, check whether the revision has changed
      * If the revision has changed, restart the background task
      * Otherwise apply the changes
      
      Closes #609. #705 remains open because the PagerAdapters for blogs need to be updated.
      
      See merge request !356
      df44015c
  8. Oct 20, 2016
Loading