Commit Graph

66 Commits

Author SHA1 Message Date
akwizgran 3bfef877ec Upgraded support library. 2016-04-27 18:17:50 +01:00
akwizgran efd9976ade Upgraded Gradle to 2.10, Android plugin to 2.1.0. 2016-04-27 18:03:00 +01:00
akwizgran 4464a66463 Upgrade to Java 1.7 where possible. 2016-04-27 13:18:55 +01:00
akwizgran e9f77ecd37 Use assertEquals() for more informative failure messages. 2016-04-25 17:05:22 +01:00
Torsten Grote 11e6d64e4d Show relevant 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 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.

Messages an introducee receives in a `FINISHED` state are now being
ignored and deleted.

Closes #295
2016-04-21 11:08:15 -03:00
akwizgran 5457588dbd Placeholder test was causing tests to fail in AS 2.0. 2016-04-21 12:20:26 +01:00
Torsten Grote 36ef536e82 Integration Tests for Introduction Client
* normal session where both introducees accept
* normal session where the first introducee declines
* normal session where the second introducee declines
* one session where a contact is introduced to herself
* one session where two identities of the same contact
  are introduced to each other

This introduces a new IntroductionAbortedEvent to signal when the
protocol was aborted. It is not yet used in the UI.

It closes #276
2016-04-20 11:35:51 -03:00
akwizgran 205dc66572 Test cleanup. #280 2016-04-05 14:19:10 +01:00
akwizgran 9714713d73 Add transports to DB during startup. #269 2016-03-28 13:47:23 +01:00
Ernir Erlingsson 11bfa212cc minor tweaks 2016-03-14 21:02:51 +01:00
Ernir Erlingsson 10764d727b rebased with master 2016-03-14 21:02:51 +01:00
Ernir Erlingsson 5aba1d79f1 Fixes after comments, also removed the CryptoComoponent from the IdentIcons 2016-03-14 21:02:51 +01:00
Ernir Erlingsson 95d89553d5 merged with master 2016-03-14 21:02:51 +01:00
Ernir Erlingsson ac5d68df81 Added dependency verifications and removed Splash header 2016-03-14 21:01:21 +01:00
Ernir Erlingsson 25324697ac cleanup and added missing desktop modules 2016-03-14 21:01:21 +01:00
Ernir Erlingsson 1be400eb84 Switched Roboguice/Guice out for Dagger 2 2016-03-14 21:01:21 +01:00