Skip to content
Snippets Groups Projects
  1. Mar 28, 2016
  2. Mar 22, 2016
  3. Mar 16, 2016
  4. Mar 15, 2016
    • akwizgran's avatar
    • akwizgran's avatar
      Reverted text colour to black. · d605e1ca
      akwizgran authored
      @color/briar_text_primary is used in a lot of places other than the settings screen - if we want to use grey text in the settings screen we'll need to find another way.
      
      Also fixed some misspelled resource names and included the colours from the Briar palette in color.xml.
    • akwizgran's avatar
      Fixed merge issues. · 3d575162
      akwizgran authored
    • akwizgran's avatar
      Merge branch '247-dagger-2' into 'master' · c2a1cc1e
      akwizgran authored
      247 dagger 2
      
      This MR in a nutshell replaces Guice and Roboguice with Dagger 2, which offers a lot more possibilities than is implemented in this branch, such as using lazy injections for performance purposes. With Dagger 2 all the magic happens at compile time, so no need to worry about unfulfilled injections at runtime, but due to restrictions I was forced to put injected test code into an Android module. We therefore have a new test module, `android-test`.
      
      A consequence of using Dagger 2 is that we no longer have a view injector and I therefore had to replace those with manual references. 
      
      Closes #247 
      
      See merge request !118
      c2a1cc1e
  5. Mar 14, 2016
  6. Mar 11, 2016
  7. Mar 09, 2016
    • akwizgran's avatar
      Merge branch 'bluetooth-race' into 'master' · c615dd1e
      akwizgran authored
      Fix race condition when closing redundant Bluetooth sockets
      
      The Bluetooth invitation code has a race condition: if Alice and Bob connect to each other at roughly the same time, they each consider their outgoing socket to be redundant and close it, resulting in both sockets being closed. This can be triggered pretty reliably by using two phones of the same model and pressing 'Continue' at the same time on both phones.
      
      When more than one invitation socket is opened, Alice should pick which one to use and Bob should use whichever one Alice picks, which Bob can detect by trying to read from both sockets.
      
      Hopefully the Bluetooth invitation code will be retired when #117 is merged, but I'm putting this up for review in case we need to keep Bluetooth as a fallback method.
      
      See merge request !120
      c615dd1e
  8. Mar 08, 2016
  9. Mar 07, 2016
Loading