1. 27 Apr, 2016 6 commits
  2. 26 Apr, 2016 2 commits
  3. 25 Apr, 2016 14 commits
    • 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
      9ea71134
    • Santiago Torres-Arias's avatar
      WIP: Converts the splash screen to XML format · e535be6d
      Santiago Torres-Arias authored
      Removes all programatic calls that modify the layout and uses the XML
      resource instead.
      e535be6d
    • akwizgran's avatar
      e9f77ecd
    • akwizgran's avatar
      Merge branch 'inactive-contacts' into 'master' · b17575bf
      akwizgran authored
      Don't connect to inactive contacts
      
      Two changes:
      
      1. Don't use remote transport properties for contacts that are in the process of being introduced - this avoids wasted connection attempts, as we can't create stream contexts for such contacts.
      
      2. Don't activate contacts when receiving incoming streams - doing so was meant as a workaround for newly introduced contacts having inconsistent views of their introduction status if the introducer was offline. But it just shifted the inconsistency elsewhee, so this change removes the workaround.
      
      
      See merge request !153
      b17575bf
    • akwizgran's avatar
      Merge branch '296-dialog-styling' into 'master' · 9918e93c
      akwizgran authored
      Use consistent styling for dialogs. #296
      
      Converted all dialogs to use the support library and the Briar theme, so they have a consistent Material Design appearance across all Android versions.
      
      See merge request !152
      9918e93c
    • akwizgran's avatar
      Don't return transport properties for inactive contacts. · d414e12f
      akwizgran authored
      This avoids wasted connection attempts to contacts that are in the process of being introduced.
      d414e12f
    • akwizgran's avatar
      Don't activate contacts on incoming streams. · 2fddec85
      akwizgran authored
      This leaves the contact and the introduction session in inconsistent states.
      2fddec85
    • akwizgran's avatar
      Merge branch '313-move-forum-buttons-to-toolbar' into 'master' · 3200a9f8
      akwizgran authored
      Move create forum post and share forum buttons in action bar
      
      According to the designs in #305, the 'create forum post' and 'share forum' buttons will go into the in action bar.
      
      In the spirit of keeping MRs small and to avoid conflicts with #306, I did this first and independently of future work.
      
      This also introduces constants for the `GROUP_ID`, `FORUM_NAME` and `MIN_TIMESTAMP` as they were used for the two buttons.
      
      Closes #313
      
      See merge request !150
      3200a9f8
    • akwizgran's avatar
      Merge branch '293-remove-avatar-from-conversation' into 'master' · 41c9916e
      akwizgran authored
      Remove avatar code and layout from ConversationActivity and ConversationAdapter
      
      Please note that I have not been able to test this MR on an actual device as I have none at the moment :(
      
      Closes #293
      
      See merge request !148
      41c9916e
    • akwizgran's avatar
      3b8689f8
    • akwizgran's avatar
      Merge branch '295-show-declined-introductions' into 'master' · 7779319f
      akwizgran authored
      Show relevant introduction decline responses in the conversation
      
      * If the user has already declined, we don't show that the other
        introducee has declined as well. The backend doesn't have that information, so
        this is compatible with the principle of showing what we know.
      * If the user has already accepted or hasn't yet responded, we now show the
        decline response in the private conversation with the introducer. If
        the user hasn't yet responded, we hide the accept/decline buttons
        in the introduction request message.
      
      Please note that I do not have three devices at the moment to test this MR in its entirety in practice. I created another test which is hopefully sufficient to ensure that the modifications are correct.
      
      Closes #295 
      
      See merge request !149
      7779319f
    • akwizgran's avatar
      Use consistent styling for dialogs. #296 · b5fc7cf7
      akwizgran authored
      b5fc7cf7
    • akwizgran's avatar
      Merge branch '123-encrypted-crash-reports' into 'master' · 1b087202
      akwizgran authored
      Encrypted crash reports
      
      Part of #123.
      
      See merge request !128
      1b087202
  4. 21 Apr, 2016 6 commits
  5. 20 Apr, 2016 8 commits
  6. 19 Apr, 2016 1 commit
  7. 18 Apr, 2016 3 commits