Skip to content
Snippets Groups Projects
  1. May 03, 2016
    • akwizgran's avatar
      Merge branch '322-prepare-new-forum-sharing' into 'master' · a655df73
      akwizgran authored
      Prepare for new Forum Sharing Client
      
      Methods for creating, adding and removing forums have been moved to the
      `ForumManager`. In order to still handle removing forums properly, a
      `RemoveForumHook` has been introduced.
      
      Methods for sharing forums with all current and future contacts have
      been removed along with the localGroup where this information was saved.
      
      The `ShareForumActivity` now has the proper label.
      
      The `SessionId` and the `ProtocolEngine` have been moved to the
      `clients` package.
      
      This addresses part of #322 and part of what has been discussed in #320.
      
      See merge request !156
      a655df73
    • Torsten Grote's avatar
      Prepare for new Forum Sharing Client · 9f9a2163
      Torsten Grote authored
      Methods for creating, adding and removing forums have been moved to the
      `ForumManager`. In order to still handle removing forums properly, a
      `RemoveForumHook` has been introduced.
      
      Methods for sharing forums with all current and future contacts have
      been removed along with the localGroup where this information was saved.
      
      The `ShareForumActivity` now has the proper label.
      
      The `SessionId` and the `ProtocolEngine` have been moved to the
      `clients` package.
      
      This addresses part of #322 and part of what has been discussed in #320.
      Verified
      9f9a2163
    • akwizgran's avatar
      Merge branch '314-tor-sleep' into 'master' · bba99947
      akwizgran authored
      Hold a wake lock while Tor is connected to the internet
      
      This is a partial fix for #314. As noted on that ticket, if a Tor connection is lost for any reason other than the device sleeping, the plugin won't try to replace the lost connection. I'm leaving the ticket open until that more general issue is solved.
      
      The Tor plugin uses several variables to keep track of its connectivity status. This patch refactors those variables into an inner class to improve readability and ensure they're accessed atomically. However, it's still possible for the plugin's state to become inconsistent with the state of the Tor process. For example, calls to updateConnectionStatus() may run concurrently on the IO executor, so their calls to enableNetwork() may be interleaved. As usual, locking would solve this problem but create the potential for deadlock, so I won't try to solve it in this patch.
      
      See merge request !168
      bba99947
    • akwizgran's avatar
      Renamed circuit status method. · 400a11e3
      akwizgran authored
    • akwizgran's avatar
      Merge branch '316-mobile-data-setting' into 'master' · 189efe8d
      akwizgran authored
      Fix name of Tor mobile data setting
      
      Closes #316.
      
      See merge request !167
      189efe8d
    • akwizgran's avatar
      Merge branch '331-viewfinder' into 'master' · b57b65e8
      akwizgran authored
      Reinitialise viewfinder when camera view is shown
      
      Thanks to @str4d for finding the cause of the bug. Closes #331.
      
      See merge request !165
      b57b65e8
    • akwizgran's avatar
      Merge branch 'use-android-executor' into 'master' · 160adca1
      akwizgran authored
      Use Android executor for background API calls
      
      Some Android API calls need to be made from a thread with a message queue, but to keep the UI responsive they shouldn't be made from the UI thread.
      
      This patch gives AndroidExecutor a captive thread with a message queue to execute tasks, and converts various background tasks from creating their own threads to using AndroidExecutor and IoExecutor.
      
      This allows us to upgrade the support library to 23.2.1. Fixes #332.
      
      See merge request !161
      160adca1
    • akwizgran's avatar
      Merge branch '305-forum-list-snackbar' into 'master' · 3d4abee1
      akwizgran authored
      Add Snackbar and Toolbar Button to Forum List
      
      This MR is a small change that replaces the custom UI elements in
      the forum list with a Snackbar and a Toolbar menu.
      
      It also fixes a background color that was still present with fragment from the NavDrawer.
      
      Before:
      
      ![before](/uploads/6dcc545827c035dcffcdf7863893753e/before.png)
      
      After:
      
      ![after](/uploads/427de01d8bec779ee81e6ebded3fcd2b/after.png)
      
      It addresses one part (2b) of #305 and is part of #121.
      
      
      See merge request !163
      3d4abee1
    • akwizgran's avatar
    • akwizgran's avatar
    • akwizgran's avatar
    • akwizgran's avatar
    • akwizgran's avatar
  2. May 02, 2016
  3. Apr 29, 2016
  4. Apr 28, 2016
  5. Apr 27, 2016
  6. Apr 26, 2016
  7. Apr 25, 2016
    • akwizgran's avatar
      Merge branch '292-reuse-contact-selector' into 'master' · 5a13739c
      akwizgran authored
      Refactor `ContactListAdapter` to be used for Introductions and Forum Sharing
      
      This MR introduces an abstract `BaseContactListAdapter` which provides
      most of the adapter logic. The original `ContactListAdapter` extends it to
      show date and online status of the contacts.
      
      The new `ContactChooserAdapter` which is used for introductions extends
      the `ContactListAdapter` and adds logic for graying out contacts from
      different identities than the currently used one.
      
      A new `ContactSelectorAdapter` extends the `BaseContactListAdapter` and
      allows to select multiple contacts. It offers a method to return a
      collection of all selected `ContactId`s.
      
      Closes #292
      
      See merge request !151
      5a13739c
    • Torsten Grote's avatar
      Refactor `ContactListAdapter` to be reusable for other use cases. · 9ea71134
      Torsten Grote authored
      This commit introduces an abstract `BaseContactListAdapter` which provides
      most of the adapter logic. The original `ContactListAdapter` extends it to
      show date and online status of the contacts.
      
      The new `ContactChooserAdapter` which is used for introductions extends
      the `ContactListAdapter` and adds logic for graying out contacts from
      different identities than the currently used one.
      
      A new `ContactSelectorAdapter` extends the `BaseContactListAdapter` and
      allows to select multiple contacts. It offers a method to return a
      collection of all selected `ContactId`s.
      
      This commit also sneaks in an animation when the 'Share Forum' button
      is clicked.
      
      Closes #292
      Verified
      9ea71134
Loading