Commit graph

224 commits

Author SHA1 Message Date
ec6aeeb78f Added .apk files to .gitignore. 2016-01-25 22:47:20 +01:00
d2dab0121c Changed name of server package. 2016-01-25 22:46:48 +01:00
0d56efc232 Don't close app when pressing app icon in main activity. 2016-01-25 22:46:26 +01:00
5e00a2341c Bumped version to 0.2.0 2016-01-25 22:27:13 +01:00
6e12494c2c Merge branch 'internet-transport' 2016-01-25 22:19:09 +01:00
ddb3d64708 Added user option for server. 2016-01-25 22:17:56 +01:00
1df3d9a46f Changed command line formant for gradle. 2016-01-24 23:44:04 +01:00
d2f497d4de Log username and status on start. 2016-01-24 23:43:10 +01:00
6cf8a3c0b8 Allow setting status via command line. 2016-01-24 23:42:56 +01:00
dc55d74f9b Log address with username on connect if we know the name. 2016-01-24 14:03:07 +01:00
3cbba72117 Updated server address, improved documentation. 2016-01-24 13:45:43 +01:00
d3c2b5ee26 Properly check if user is a contact. 2016-01-24 13:17:02 +01:00
244fd32762 Catch InvalidKeyException when receiving messages. 2016-01-19 00:08:53 +01:00
c424bed315 Fixed potential crash. 2016-01-18 18:19:42 +01:00
ac12941ea8 Fixed service being started when it should be disabled. 2016-01-18 18:19:42 +01:00
39a2120300 Revert "Don't close app when clicking app icon in MainActivity."
This was also breaking the back button.

This reverts commit 9b5175114f.
2016-01-18 18:19:42 +01:00
514827ad8f Allow adding user by ID or QR code (fixes #36). 2016-01-18 18:19:42 +01:00
1a8ae49f79 Handle null intent in onStartCommand(). 2016-01-18 18:19:41 +01:00
b21cf17cea Make Bluetooth an optional requirement. 2016-01-18 18:19:41 +01:00
199b185861 Added server project for internet routing.
Also adjusted Log trait and visibility of library classes.
2016-01-18 18:19:41 +01:00
28cb4f15d9 Added option to start on boot (fixes #19).
This does not trigger the "enable Bluetooth" dialog, which means
Bluetooth won't be enabled. Even if Bluetooth was already active,
we might not have the necessary permissions. Internet will work
fine though.
2016-01-18 18:16:55 +01:00
6867b19380 Added floating action button to add contacts (fixes #40). 2015-12-03 20:15:26 +01:00
1942986962 Removed guava dependency. 2015-11-21 21:54:23 +01:00
49293e259e Cleaned build scripts. 2015-11-21 21:29:14 +01:00
925eb2d5c5 Use encrypt-then-mac instead of mac-and-encrypt. 2015-11-19 22:43:46 +01:00
9b5175114f Don't close app when clicking app icon in MainActivity. 2015-11-12 01:57:45 +01:00
f5ee0996eb Force close app when exception occurs in FutureHelper. 2015-10-29 14:42:31 +01:00
a951b05965 Improved documentation for Crypto class. 2015-10-18 22:40:01 +02:00
269fe41ebf Split project into seperate modules for core and android (fixes #18). 2015-10-18 22:39:51 +02:00
8c84cb2924 Updated license text for launcher icon (ref #2). 2015-09-27 16:28:57 +02:00
67091caa5d Merge pull request #39 from twzkxkan/patch-1
fix typo, clarify that messages are encrypted
2015-09-24 15:56:25 +02:00
twzkxkan
7d1beeff24 fix typo, clarify that messages are encrypted 2015-09-24 09:52:39 -04:00
86d9275dcf Added launcher icon (fixes #2). 2015-09-24 15:29:40 +02:00
90069917b0 Bumped version to 0.1.7 2015-09-23 01:07:04 +02:00
d64bf41813 Fixed username and status not being updated on other devices. 2015-09-23 01:01:25 +02:00
10066b2c83 Set input type for name and status. 2015-09-23 00:54:22 +02:00
b11bf85d90 Changed AddContactsActivity to ConnectionsActivity.
This means all neighbors are shown, not just non-contacts.

Also fixed a bug where the list would not be refreshed when
first opened.
2015-09-23 00:46:38 +02:00
123c56c322 Removed add contact menu item. 2015-09-23 00:33:45 +02:00
6042c3fb11 EnsichatActivity.service should return option. 2015-09-23 00:31:40 +02:00
e66bccc044 Show connections in actionbar. 2015-09-23 00:26:41 +02:00
87632b6225 Added parent activity reference in manifest. 2015-09-23 00:21:20 +02:00
cdcf0ace01 Remvoed count parameter from getMessagesCursor. 2015-09-19 13:42:57 +02:00
1c48484358 Moved unused method into tests. 2015-09-14 03:15:56 +02:00
284a4ceb02 Added FutureHelper to throw errors in Future. 2015-09-12 20:05:29 +02:00
7ec286a44a Fixed message content types in protocol. 2015-09-11 23:16:32 +02:00
9202289303 Bumped versio nto 0.1.6 2015-09-11 17:11:18 +02:00
f8651ff1c8 Downgraded dependencies to avoid problems with gradle scala plugin. 2015-09-11 17:10:42 +02:00
d8d9eb9c89 Bumped version to 0.1.5 2015-09-11 16:44:00 +02:00
485e7bda2f Updated dependencies. 2015-09-11 16:43:36 +02:00
6463559726 Show ok button in identicon fragment. 2015-09-11 16:36:08 +02:00