Skip to content
Snippets Groups Projects
  1. Mar 31, 2016
    • akwizgran's avatar
      Merge branch '118-contact-introductions' into 'master' · 4393517f
      akwizgran authored
      Contact Introduction Backend
      
      This MR allows you to introduce two of your contacts to each other. They both will receive an introduction with an optional message and then can accept or refuse the introduction which is presented as a notification.
      
      When reviewing, I propose to review the individual commits separately as I took great care to split functional independent parts into separate commits. You might also want to have a look at the [Introduction Client Wiki page](https://code.briarproject.org/akwizgran/briar/wikis/IntroductionClient) to better understand what is going on before looking into the actual code.
      
      Protocol sessions and states are not yet deleted and the UI is still missing (#253). In order to practically test this feature, the UI from !122 is needed.
      
      See merge request !116
      4393517f
    • akwizgran's avatar
      Merge branch '117-qr-contacts' into 'master' · db6c8135
      akwizgran authored
      BQP with QR codes
      
      This MR implements BQP for key agreement over short-range transports. It also implements the Android UI for using BQP with QR codes.
      
      Closes #117.
      
      See merge request !84
      db6c8135
    • akwizgran's avatar
      Fixed a stupid forum post validation bug. · 5d1084ae
      akwizgran authored
      The signature covers the forum post body, not the message body.
      5d1084ae
  2. Mar 30, 2016
  3. Mar 29, 2016
  4. Mar 28, 2016
  5. Mar 26, 2016
  6. Mar 22, 2016
  7. Mar 16, 2016
  8. Mar 15, 2016
    • akwizgran's avatar
      e39a74bd
    • 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.
      d605e1ca
    • akwizgran's avatar
      Fixed merge issues. · 3d575162
      akwizgran authored
      3d575162
    • 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
  9. Mar 14, 2016
Loading