Daniel Gultsch
9e54fd5c92
don't use sending state on muc pms without smacks
2016-10-09 19:40:30 +02:00
Daniel Gultsch
9efef24a04
reset sending to waiting on every error
2016-10-07 14:54:35 +02:00
Daniel Gultsch
1f7f82da7b
respond to chat marker request only when mutual presence subscription exists
2016-10-07 10:05:08 +02:00
Daniel Gultsch
6d5f23213b
refresh error notification after 'try again'
2016-10-06 22:05:40 +02:00
Daniel Gultsch
40e5090bdd
issue ping after push was received
2016-10-06 18:09:55 +02:00
Daniel Gultsch
8d8cb92e43
try to fix messages stuck at sending
2016-10-06 17:23:35 +02:00
Daniel Gultsch
082c06a486
make error notification dismissable. fixes #1815
2016-10-04 11:16:59 +02:00
Daniele Gobbetti
41db773b08
Allow to dismiss the notification from a wear reply.
...
- use different IDs in the same method for the PendingIntent
- fix reply for GPG encrypted replies (untested)
2016-09-27 17:39:23 +02:00
Daniel Gultsch
1339b9c464
don't reset encryption choice to auto on archiving
2016-09-24 21:29:00 +02:00
Daniel Gultsch
343d895a26
don't react to null and empty voice replies
2016-09-21 19:04:16 +02:00
Daniel Gultsch
7eac903277
add support for XEP-0377: Spam Reporting
2016-09-18 23:21:05 +02:00
Daniel Gultsch
7b445bc4c7
use history clear date as minimum date for mam
2016-09-16 11:07:52 +02:00
Daniele Gobbetti
e6e46651c9
Use the last message in the content text instead of the first.
...
This fixes the issue where the first message in the notification was sent to pebble
(and possibly to other wear devices) for every update in the conversation, as
reported in #1249 .
This is the same patch propoed in https://github.com/siacs/Conversations/issues/1249#issuecomment-245878335
2016-09-11 18:42:05 +02:00
Daniel Gultsch
c3b11e515e
download own vcard avatar if none is set. fixes #2008
2016-09-09 11:04:05 +02:00
Daniel Gultsch
416481bb65
be a bit more careful when deleting and deactivating accounts
2016-09-07 14:34:58 +02:00
Daniel Gultsch
e1d2c32e63
show server not found muc error
2016-09-06 12:15:08 +02:00
Daniel Gultsch
257d1e42d8
remove explicit pebble support. treat as wear device
2016-09-06 12:14:49 +02:00
Daniel Gultsch
7e81149869
show reply action on wear devices
2016-09-06 12:13:50 +02:00
Daniel Gultsch
d2c475d501
don't crash when correcting waiting pgp encrypted messages
2016-09-04 22:59:15 +02:00
Daniel Gultsch
f14ab4c391
don't show duplicate nofications on android 4
2016-08-31 17:02:42 +02:00
Daniel Gultsch
2c187d0e7c
mark conversation as read when swiping a notification with quick reply away
2016-08-27 15:25:37 +02:00
Daniel Gultsch
caafd03130
don't automatically download files and avatars when datasaver is on
2016-08-27 13:35:52 +02:00
Daniel Gultsch
3d5940cb76
bring back connectivity changed events on android n
2016-08-27 12:15:25 +02:00
Daniel Gultsch
e33d8451a8
attach contact to notification
2016-08-26 13:35:01 +02:00
Daniel Gultsch
910b38ec13
add file provider to share files on android n
2016-08-25 22:41:33 +02:00
Daniel Gultsch
2e4713897d
offer quick reply on android N
2016-08-25 17:30:44 +02:00
Daniel Gultsch
542626758d
use N style stacked notifications
2016-08-25 15:20:06 +02:00
Daniel Gultsch
0b9d38cf32
send register IQs without full from
2016-08-25 13:50:54 +02:00
Daniel Gultsch
343bb7ff28
don't close otr session on every presence change
2016-08-13 12:43:06 +02:00
Daniel Gultsch
94aee445e7
start file observer in background
2016-08-13 12:40:48 +02:00
Daniel Gultsch
9bfdbc708e
close tcp connection after 30s of inactivity when in push_mode
2016-08-09 19:21:54 +02:00
Daniel Gultsch
856029a611
don't do idle ping if close_tcp option is set
2016-08-09 17:26:18 +02:00
Daniel Gultsch
d02e24248f
catch platform bug when getting ringer mode
2016-08-02 10:58:31 +02:00
Daniel Gultsch
1b114beb0b
add logging when swiping away from recents is being ignored
2016-07-31 22:32:10 +02:00
Daniel Gultsch
0e96e0a796
show identity type for device selection
2016-07-28 22:58:37 +02:00
Daniel Gultsch
dbab43e423
fixed rare null pointer in avatar creation
2016-07-27 20:11:22 +02:00
Daniel Gultsch
58a3ef46ce
fixed regression in file delete detection due to missing !
2016-07-26 20:44:28 +02:00
Daniel Gultsch
82908fb54b
added more logging for file deletion
2016-07-26 20:43:05 +02:00
Daniel Gultsch
198a9f2226
refactored how view intents are handled
...
processing view intents before saved instance caused troubles when the activity was destroyed
fixes #1969
2016-07-25 14:16:09 +02:00
Daniel Gultsch
89a05265ea
refactored deleted file detection to monitor entire sd card. fixes #1968
2016-07-23 16:12:45 +02:00
Daniel Gultsch
e90e333f29
allow message correction by default since security implications are negligible
...
Conversations only allows correction of the *last* message. so nudging a message into oblivion by adding a message correction doesn't work. also conversations checks the fingerprint for encrypted messages
2016-07-17 22:42:37 +02:00
Daniel Gultsch
ff1b23b4d9
call update file params from thread
...
now that file params has more work to do we should make sure we always call it from a sperate thread
2016-07-13 00:20:38 +02:00
Daniel Gultsch
28dc888159
display toast on pgp error
2016-06-19 11:08:17 +02:00
Daniel Gultsch
37e7175a86
log reason for not showing notification
2016-06-19 11:04:59 +02:00
Daniel Gultsch
49de43b364
clear muc tiles when avatar of member changes
2016-06-14 17:11:31 +02:00
Daniel Gultsch
587fb3cca3
refactored pgp decryption
2016-06-13 13:32:14 +02:00
Daniel Gultsch
4bf9a1e809
use darker colors for actionbar on dark theme
2016-06-10 20:15:09 +02:00
Daniel Gultsch
cb7c47bc62
catch conversations sort exception. not vital at this point
2016-06-09 14:50:13 +02:00
Daniel Gultsch
7a97da6d21
swap sending presence and csi
2016-06-04 22:42:12 +02:00
Daniel Gultsch
71e9117176
opt-in to send last userinteraction in presence
2016-06-04 16:16:14 +02:00
Daniel Gultsch
e402348f9b
disconnect account in background after deletion. fixes #1861
2016-06-03 14:18:43 +02:00
Daniel Gultsch
e43a01159c
deactive grace period when receiving screen on action
2016-06-01 21:51:46 +02:00
Daniel Gultsch
45cc33ca36
deactivate grace period when coming to foreground
2016-06-01 21:30:50 +02:00
Daniel Gultsch
ea6a008b39
execute phone contact changes in singlethreadexecutor
2016-05-31 17:20:21 +02:00
Daniel Gultsch
9321ccc775
handle app links for conferences
2016-05-30 21:12:04 +02:00
Daniel Gultsch
bc326efd2c
schedule first idle ping on service creation
2016-05-28 16:07:16 +02:00
Daniel Gultsch
bc36f1950f
added idle ping in 10min intervals
2016-05-28 14:44:22 +02:00
Daniel Gultsch
f70fcc7bb8
use first letter to draw tiles for avatars
...
some users or conferences might have emojis in their names
2016-05-27 11:34:12 +02:00
Daniel Gultsch
44833c1499
don't push default muc conf twice
2016-05-27 10:35:00 +02:00
Daniel Gultsch
21ebb35e44
add 'create conference' dialog
2016-05-26 22:53:55 +02:00
Daniel Gultsch
d9ff61ea2e
show contact avatar in muc users unless that contact has its own avatar
2016-05-26 22:37:00 +02:00
Daniel Gultsch
841e718d6a
make newly created conferences private by default
2016-05-26 12:39:31 +02:00
Daniel Gultsch
277e3d59c8
update ui after affiliation changes
2016-05-21 09:25:37 +02:00
Daniel Gultsch
0eb8d4226e
also save form elements in disco storage
2016-05-19 10:41:56 +02:00
Daniel Gultsch
61726f4994
refactored muc item parsing to also parse muc status messages
2016-05-17 14:25:58 +02:00
Daniel Gultsch
fc5304c6fe
change affiliation for in memory users that are currently not joined in a conference
2016-05-16 19:58:36 +02:00
Daniel Gultsch
8d0693ed6a
keep conference members in memory and show them in conference details
2016-05-16 19:58:36 +02:00
Daniel Gultsch
540f6f3d7a
send caps hash in muc join
...
this prevents desktop clients from iq'ing use when they join
2016-05-15 09:54:49 +02:00
Daniel Gultsch
b756d61c45
show presence of other resources as template
2016-05-13 10:45:30 +02:00
Daniel Gultsch
b8c1bd2cba
reset attempt count when reconnecting because of timeout
2016-05-12 21:57:07 +02:00
Daniel Gultsch
7113e21a43
use 'phone' or 'tablet' as default resource
2016-05-12 18:47:41 +02:00
Daniel Gultsch
c37b5af2ca
add lock domain and magic create domain to known hosts
2016-05-10 10:53:44 +02:00
Daniel Gultsch
27b245ac35
do not show last-seen metric in UI
2016-05-10 09:41:30 +02:00
Daniel Gultsch
6e0ec9b924
republish pgp signature when changing status
2016-05-05 13:17:04 +02:00
Daniel Gultsch
12704fa640
refactor captcha response handling to avoid network on main thread exception
2016-05-05 09:58:35 +02:00
klemens
7047d68165
spelling fixes
2016-05-04 10:29:29 +02:00
Daniel Gultsch
06a561743a
ping all accounts at the same time
2016-05-02 14:31:30 +02:00
Daniel Gultsch
9c3e910dc4
prevent user from accidentally changing password after using magic create
2016-04-26 23:23:48 +02:00
Daniel Gultsch
a363e0a5d8
don't create templates for empty status messages
2016-04-23 15:10:35 +02:00
Daniel Gultsch
1901abd05f
expert setting to manually change presence
2016-04-22 21:25:06 +02:00
Daniel Gultsch
1a073ca454
added magic create welcome screen
2016-04-19 18:03:24 +02:00
Daniel Gultsch
eb63cdb9ad
removed unnecessary call to stopSelf() after logging out
2016-04-14 21:45:36 +02:00
Daniel Gultsch
39e717ed94
removed unused call to cancel events
2016-04-14 00:16:59 +02:00
Daniel Gultsch
c53c6cb6b6
create Config varibale to show the disable foreground service button
2016-04-13 18:00:12 +02:00
Daniel Gultsch
594e65bb2b
hacky workaround to determine if uri points to private file on < lolipop
2016-04-13 11:14:36 +02:00
Daniel Gultsch
2a4db01709
reverse order in contact chooser
2016-04-12 18:29:41 +02:00
Daniel Gultsch
7223b5b274
minor code cleanup
2016-04-12 17:52:58 +02:00
Daniel Gultsch
7ff890e513
republish avatar if server offers non-persistent pep :-(
2016-04-11 22:20:32 +02:00
Daniel Gultsch
83fab06508
introduced setting to turn of notification led
2016-04-09 21:48:06 +02:00
Daniel Gultsch
65548ddccb
use startdate as lower bound when querying archive with after=x
2016-04-09 12:31:08 +02:00
Daniel Gultsch
2713fd50c8
use last received message id when querying archive
2016-04-09 10:29:34 +02:00
Daniel Gultsch
0460702710
check file owner when attaching files or using them as avatar
2016-04-07 20:29:40 +02:00
Daniel Gultsch
ecaf75e5ec
better detect broken pep
...
mark pep as broken when publishing bundle or device list failed
reset 'brokenness' when account is getting disabled
2016-04-05 13:31:03 +02:00
Daniel Gultsch
5787687997
removed unnecessary wait for disconnect
2016-04-04 20:07:09 +02:00
Daniel Gultsch
2549ce89b0
check max http file size when attaching files
2016-04-01 00:03:14 +02:00
Daniel Gultsch
74c496fe3e
add methods to check max file size for http upload
2016-03-31 21:56:59 +02:00
Daniel Gultsch
e074104004
save otr fingerprint in message
2016-03-31 21:15:49 +02:00
Christian S
1d458e8ab3
Update ShortcutBadger to version 1.1.4
2016-03-27 20:17:51 +02:00
licaon-kter
6ba90ec43c
Typo attempt
2016-03-22 11:54:45 +02:00
Daniel Gultsch
7df24407dc
be more careful to avoid creating multiple connections
2016-03-20 17:24:41 +01:00
Daniel Gultsch
bc5f64bffe
moved avatarfetcher reset code to bind
2016-03-03 13:33:02 +01:00
Daniel Gultsch
4cb2d0ca93
avoid unnecessary disconnect. prevent NetworkOnMainThreadException
2016-03-03 13:31:59 +01:00
Daniel Gultsch
aaf64732b0
expert option to treat vibrate as silent mode for XA. fixes #1530
2016-03-01 19:00:18 +01:00
Daniel Gultsch
134c75ae01
use correct jid when leaving a conference. fixes #1732
2016-02-29 16:32:24 +01:00
Daniel Gultsch
9e0466d1e6
refactored omemo to take multiple recipients
2016-02-29 13:18:07 +01:00
Daniel Gultsch
3cf21e2d37
Merge pull request #1721 from fiaxh/export_logs_storage_permission
...
Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M
2016-02-27 11:25:56 +01:00
Daniel Gultsch
7fd6a37e67
disallow message correction by default. fixes #1720
2016-02-26 09:48:58 +01:00
Daniel Gultsch
dc00a92499
execute pending mam queries every time we come online
2016-02-26 09:46:25 +01:00
fiaxh
a88c2d48c0
No possibility of multiple invocation of log export
2016-02-24 15:10:41 +01:00
Daniel Gultsch
d1a456f3e3
made hard coded choice for encryptions more flexible and disable parsing
2016-02-24 14:47:49 +01:00
Daniel Gultsch
17b1fcc3ea
set noMessagesLeftOnServer before conference configuration fetch
2016-02-23 16:15:55 +01:00
Daniel Gultsch
a0d0ed34ae
turned muc errors into enum. added error codes for service shutdown
2016-02-22 20:19:58 +01:00
Daniel Gultsch
d2cfac222e
show load more messages when auto loading is disabled and messages are still left on server
2016-02-21 17:32:46 +01:00
Daniel Gultsch
3bde4dbedb
change uuid when replacing messages
2016-02-20 00:01:39 +01:00
Daniel Gultsch
ac687d6bbd
don't log start reason
2016-02-17 16:52:57 +01:00
Daniel Gultsch
3626e4b3a0
fixed regression that caused messages in muc not being send
2016-02-17 16:50:48 +01:00
Daniel Gultsch
86b1865eec
fixed regression that caused ui to redraw a lot
2016-02-16 14:22:21 +01:00
Daniel Gultsch
a9b957e8a2
added setting to opt-out of message correction. renamed preferences and options to settings
2016-02-16 09:57:59 +01:00
Daniel Gultsch
0ca4a33bfb
added some OTR logging
2016-02-16 09:15:41 +01:00
Daniel Gultsch
c0b3a3ff0c
basic support for XEP-0308: Last Message Correction. fixes #864
2016-02-15 23:15:04 +01:00
Daniel Gultsch
251f2479c2
optional mode to close tcp connection when going into background
...
acts only when push is available. disable all non-push accounts to test properly
2016-02-14 13:20:23 +01:00
Daniel Gultsch
c7a14092a8
fixed compile bug in free version
2016-02-13 00:03:57 +01:00
Daniel Gultsch
c430848ade
push gcm token on bind instead of every connect
2016-02-12 23:37:42 +01:00
Daniel Gultsch
32da65f910
client side support for XEP-0357: Push Notifications
2016-02-12 11:39:27 +01:00
Daniel Gultsch
1bb38e25f2
send muc messages after join
2016-02-10 09:53:48 +01:00
Daniel Gultsch
f16690ae1f
allow user to set MAM preferences
2016-02-09 13:01:17 +01:00
Daniel Gultsch
28733e052f
fixed performance regression in on scroll listener
2016-02-04 16:29:17 +01:00
Daniel Gultsch
4fdb0d92fe
prevent previoulsly cleared messages from reloading. fixes #1110
2016-02-04 14:39:16 +01:00
Daniel Gultsch
f88b8c703e
add more fault tolerant checks for messages left on server
2016-02-04 11:55:42 +01:00
Daniel Gultsch
0911669b07
count all messages in a query
2016-02-03 16:04:21 +01:00
Daniel Gultsch
1274b0ef39
Revert "get rid of broken totalMessageCount for mam queries"
...
This reverts commit 58c6f9bfb2
.
2016-02-03 10:40:44 +01:00
Daniel Gultsch
f0798216d5
refactored disco cache. avoid making duplicate call. check hash
2016-02-03 10:40:02 +01:00
Daniel Gultsch
4a1a59f0c8
Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into singpolyma-disco-caps
2016-02-02 18:19:26 +01:00
Daniel Gultsch
58c6f9bfb2
get rid of broken totalMessageCount for mam queries
2016-02-02 15:39:46 +01:00
Daniel Gultsch
ba9ba8ffe2
avoid npe when accessing the pgp connection service
2016-02-02 11:21:29 +01:00
Daniel Gultsch
1e7647e385
opt out handling of the autojoin flag. fixes #1666
2016-02-01 13:54:08 +01:00
Daniel Gultsch
7c0eae8059
expert setting to trigger extended connection options
2016-01-25 21:17:53 +01:00
Stephen Paul Weber
bf5b2f73f5
Use a Presence class for presence information
...
Only has status for now, but doing it so I can add disco to it
2016-01-24 17:46:08 -05:00
Daniel Gultsch
7b1efe15cd
reuse same xmppconnection for reconnects
2016-01-16 19:21:11 +01:00
Daniel Gultsch
c5743067ad
nimbuzz.com: don't wait for disco replies to set account to online
2016-01-15 14:26:23 +01:00
Daniel Gultsch
12fd5c46ef
show /me messages in conference notifications without the name of the sender
2016-01-13 17:36:04 +01:00
Daniel Gultsch
4ab8fe13de
let the user decide on whether or not to compress pictures
2016-01-09 16:17:39 +01:00
Daniel Gultsch
a3e136b550
show per conference notification settings in details activity
2016-01-08 21:30:46 +01:00
Daniel Gultsch
c3e2d2cfba
added missing synchronize when pushing messages from mam backlog
2016-01-04 20:14:29 +01:00
Daniel Gultsch
f815a7cd26
properly rotate avatars
2016-01-04 15:17:02 +01:00
Daniel Gultsch
c3bdec1ce9
dedublicate bookmarks
2015-12-27 17:29:32 +01:00
Daniel Gultsch
43dd681239
timeout service discovery after 20s
2015-12-15 19:24:05 +01:00
Daniel Gultsch
f6b22dad20
splite PARANOIA_MODE into three different options
2015-12-14 10:54:55 +01:00
Daniel Gultsch
50817956c2
changed order of send presence and execute mam queries
2015-12-12 16:01:33 +01:00
Daniel Gultsch
5e4b55a0ff
notfiy after mam catchup only if message count > 0
2015-12-11 20:43:50 +01:00
Daniel Gultsch
a1ac4fd665
fix cancelation of http downloads and enable resume
2015-12-11 20:33:41 +01:00
Daniel Gultsch
b2c278c91b
set bookmark name to room subject if no subject has been set before
2015-12-11 19:28:44 +01:00
Daniel Gultsch
293e820a58
get rid of lastMessageTransmitted in favor of db query
2015-12-11 13:52:04 +01:00
Daniel Gultsch
55c1129a65
notify on mam catchup messages
2015-12-10 23:05:11 +01:00
Daniel Gultsch
2262921ff4
properly clean up timed out mam queries
2015-12-10 18:28:47 +01:00
Daniel Gultsch
11e58607c9
when no avatar found show avatar of contact and not the muc user in conferences
2015-12-09 10:30:26 +01:00
Daniel Gultsch
aea664a0ec
show sender name for notications in conferences. fixes #1581
2015-12-09 10:26:30 +01:00
Daniel Gultsch
739648e909
ask for contact permissions when first opening StartConversationActivity
2015-12-07 13:24:41 +01:00
Daniel Gultsch
c3e8fb3446
request storage permission when needed on Android 6.0
2015-12-07 13:24:41 +01:00
Daniel Gultsch
739a2d609d
implement direct sharing in android 6.0. fixes #1321
2015-12-07 13:24:41 +01:00
Daniel Gultsch
cd9a29718b
properly clear muc user avatar caches
2015-12-04 21:36:48 +01:00
Daniel Gultsch
9d1e8a34b2
fixed showing avatars for contacts in muc
2015-12-04 18:39:09 +01:00
Daniel Gultsch
242887447c
use proposed nick as default nick in mucoptions
2015-12-04 14:07:16 +01:00
Daniel Gultsch
6b592435cd
parse vcard avatars from muc presences
2015-12-03 18:18:34 +01:00
Daniel Gultsch
0eaf7669f7
Merge pull request #1545 from SamWhited/show_new_contact_request_messages
...
Show status message when contact requests presence
2015-12-02 16:38:08 +01:00
Sam Whited
a3eb540f05
Show status message when contact requests presence
...
Remove presence when conversation closed
2015-12-02 08:50:52 -06:00
Daniel Gultsch
8455e5b5dd
hide message content in notifications in paranoia mode
2015-12-02 12:54:55 +01:00
Daniel Gultsch
dc8967d8fc
introduced build-time paranoia mode that disables unencrypted chats and forces TOR
2015-12-01 22:41:58 +01:00
Daniel Gultsch
65b5504e68
introduce config.java variable to optionally show number of connected accounts in notification
2015-12-01 17:15:36 +01:00
Daniel Gultsch
f0b1761ec3
initial tor support
2015-12-01 12:00:50 +01:00
Daniel Gultsch
60211a315e
hide subject edit button if not editable by user
2015-11-26 17:44:29 +01:00
Daniel Gultsch
fd6ed5b989
detect server identity and added muc-workaround for slack
2015-11-26 06:55:57 +01:00
Daniel Gultsch
84120a341a
removed unnecessary configuration fetch after join
2015-11-26 06:53:24 +01:00
Daniel Gultsch
a557d38e4d
pgp fixes and revert configuration changes
2015-11-25 20:47:02 +01:00
Daniel Gultsch
8228e82f51
Merge pull request #1569 from fiaxh/conference_one_other_occupant
...
Show own avatar in tile for conferences with only one other occupant next to theirs
2015-11-24 07:09:12 +01:00
fiaxh
724ca8c9a9
Own contact picture in tile for conferences with only one other occupant
2015-11-15 10:34:10 +00:00
fiaxh
fac1d4e0bd
Use OpenPGP-API 9.0
2015-11-09 13:49:57 +00:00
Daniel Gultsch
34bcc59f72
fixed session objects not being build on start up
2015-10-30 12:05:21 +01:00
Daniel Gultsch
6a458b853c
Merge pull request #1513 from fiaxh/pgp_background_decryption
...
PGP messages background decryption
2015-10-30 10:18:27 +01:00
Daniel Gultsch
8553d5a563
moved db calls made from UI into serial background thread
2015-10-29 17:20:01 +01:00
Daniel Gultsch
c7ff196f58
push CN into nick pep node when uploading certificate. subscribe to nick node
2015-10-29 13:41:08 +01:00
Daniel Gultsch
1221cff561
load avatars in message adapter in background task
2015-10-29 12:08:15 +01:00
fiaxh
29a849cb92
Decrypt PGP messages in background
2015-10-28 19:57:11 +00:00
Daniel Gultsch
1bd68a42b2
join muc even if initial conference configuration fetch failed
2015-10-22 11:20:36 +02:00
Daniel Gultsch
53125dbccc
move chat state reset from background switch to foreground switch to account for chat states sent in the mean time
2015-10-19 23:22:29 +02:00
Daniel Gultsch
be38b1e5f4
disconnet in background thread
2015-10-17 16:10:56 +02:00
Daniel Gultsch
a83aae341f
improved error reporting in trust keys activity
2015-10-17 14:09:26 +02:00
Daniel Gultsch
cfeb67d71d
introduced code to verify omemo device keys with x509 certificates.
...
cleaned up TrustKeysActivity to automatically close if there is nothing to do
2015-10-16 23:48:42 +02:00
Daniel Gultsch
fb7359e6a3
block code when doing unforced disconnect
2015-10-16 09:58:31 +02:00
Daniel Gultsch
30dbf97a1c
clear bitmap cache before running out of memory
2015-10-14 22:55:59 +02:00
Daniel Gultsch
5f9476448f
make unread status and notifications presistent across restarts
2015-10-14 21:18:34 +02:00
Daniel Gultsch
212d1a8c91
add config variable to enable x509 verification
2015-10-12 13:18:20 +02:00
Daniel Gultsch
7be331bbb2
add menu item in account details to renew certificate
2015-10-11 16:10:52 +02:00
Armin Novak
6a6cb43b17
Captcha support.
2015-10-11 13:11:50 +02:00
Daniel Gultsch
b23cb5a9e4
initial UI work to allow setting up accounts from certifcates
2015-10-09 13:37:08 +02:00
Daniel Gultsch
e65068d226
catch exception when unregistering receivers that have not been registered before
2015-10-08 00:52:04 +02:00
Daniel Gultsch
52a5e72b02
introduced expert options to set status to away and xa if screen is off or if phone is silenced
2015-10-08 00:35:04 +02:00
Daniel Gultsch
8f066d00e0
do mam query after join
2015-10-06 16:58:56 +02:00
saqura
fd61d67dab
Use MAM for MUC initial history retrieval
...
If the MUC supports MAM (XEP-0313), use it to retrieve the history
when joining.
2015-10-06 16:23:45 +02:00
saqura
05d0c9f4fe
Properly check for MUC MAM support
...
Only use MAM (XEP-0313) in MUCs if it is supported.
This should fix #1264
2015-10-06 16:23:18 +02:00
Daniel Gultsch
1d2a24c9c0
clean up log exporting service. properly end service after exporting
2015-10-06 14:13:07 +02:00
Daniel Gultsch
2b9b700c96
don't put conference joins into pending on initial bind
2015-10-01 16:01:19 +02:00
Daniel Gultsch
6a0b9971aa
reset muc options immediately befor join
2015-10-01 13:03:15 +02:00
Daniel Gultsch
648e29db2c
only invoke MTM in interactive mode after direct user input
...
fixes #1027
fixes #792
fixes #1439
2015-09-29 19:24:52 +02:00
Daniel Gultsch
8d90b3fbf1
swapped icons for foreground services
2015-09-22 08:50:54 +02:00
fiaxh
a3a13dd9dc
Export logs to SD card preference
2015-09-21 18:53:29 +01:00
Daniel Gultsch
b9002d7fd5
added missing type='submit' to mam queries
...
fixed some nasty inheritance problems along the way
fixes #1411
2015-09-15 22:52:39 +02:00
Andreas Straub
a95c451f1e
Only show that have sessions in fingerprint list
...
Doesn't access database directly anymore but goes through AxolotlService
now to obtain list of fingerprints associated with an Account/Contact.
This should prevent orphaned keys littering the UI which previously
couldn't be removed through the Clear Devices function.
Together with 1c79982da84964c1d81179a0927d9cd1eadf53de this fixes #1393
2015-09-06 15:15:57 +02:00
Daniel Gultsch
fc594e249a
added special error state for dns timeout
2015-09-01 22:37:52 +02:00
Daniel Gultsch
b0c19d6bac
fixed bug that prevented newly opened conversations to load the entire history via mam. fixes #1328
2015-08-30 11:24:37 +02:00
Daniel Gultsch
eff9e417e0
use dedicated colors for primary and primary_dark
2015-08-26 21:17:29 +02:00
Andreas Straub
c4a548ada0
Only announce device after publishing bundle
2015-08-26 15:45:21 +02:00
Daniel Gultsch
ea2ce78d6e
be more restrictive about marking messages as sent_received in muc parser
2015-08-26 12:11:12 +02:00
Michael
ae9de26f59
remove unused imports.
2015-08-25 12:40:22 +02:00
Daniel Gultsch
7bd0f31244
Merge branch 'master' into development
2015-08-23 17:57:53 +02:00
Daniel Gultsch
0dfb9bd1a0
introduce special iq type for internal timeouts. always use != result to check for error in callbacks
2015-08-23 17:53:23 +02:00
Daniel Gultsch
b0710cdf04
Merge branch 'master' into development
2015-08-23 13:57:14 +02:00
Daniel Gultsch
1688b65965
don't make subsequent iq request when original stanza returned an error
2015-08-23 08:27:05 +02:00
Daniel Gultsch
9e26375d2f
simulate old behaviour with messages being set to waiting while offline
2015-08-19 13:00:52 +02:00
Daniel Gultsch
c9b2638778
Merge branch 'master' into development
2015-08-19 12:49:24 +02:00
Daniel Gultsch
52f0622dd3
fixed nasty 'stuck at sending' bug that got introduced in 32826ec29d
2015-08-19 12:47:50 +02:00
Daniel Gultsch
83e1e6468e
fully depend on sm
2015-08-15 16:57:07 +02:00
Daniel Gultsch
32826ec29d
provide extra interface to close sockets. fixes #1330
2015-08-15 14:14:33 +02:00
Daniel Gultsch
dad90762b4
do not touch pictures that are already in the right format
...
fixed #522
2015-08-11 16:50:00 +02:00
Daniel Gultsch
fd81491b05
put wake locks on out of band file transfers
2015-08-10 19:48:36 +02:00
Daniel Gultsch
d30515a85a
report wrong file size in otr encrypted jingle file transfers to be compatible with conversations > 1.6
2015-08-10 12:55:37 +02:00
Daniel Gultsch
60cd307f73
enable axolotl encryption for jingle supported file transfers
2015-08-01 01:19:16 +02:00
Andreas Straub
909f761ca1
Refactor axolotl message processing workflow
...
XmppAxolotlMessage is now entirely responsible for handling encryption
and decryption of messages, only leveraging XmppAxolotlSession as a
packing/unpacking primitive for payload keys.
Removed pseudo-dead session generation code step from prepareMessage
function, as sessions have been created by invoking the
TrustKeysActivity for a while now.
Added prepareKeyTransportMessage function, which creates a message with
no payload. The key that is packed into the header keyElements can then
be used for other purposes (e.g. encrypted file transfer).
2015-07-31 21:31:45 +02:00
Daniel Gultsch
658919f239
improved 'next encryption' selection
2015-07-31 00:52:46 +02:00
Daniel Gultsch
17bc4fb6cd
show http downloaded images in notification
2015-07-29 01:57:08 +02:00
Daniel Gultsch
ff0c114cd6
set time on resend to current time
...
fixes #1298
fixes #919
2015-07-28 12:54:54 +02:00
Daniel Gultsch
f7634a85be
treat private, non-anonymous mucs like 1:1 chats notification wise
2015-07-22 15:31:00 +02:00
Andreas Straub
92b5081b5e
Add INACTIVE state for removed keys
...
We introduce a new trust state: INACTIVE. This state is intended for
old keys that have been removed.
When a TRUSTED device is removed from the PEP devicelist, it's status
will be set to INACTIVE. INACTIVE keys are shown in the UI as greyed
out, non-interactible key rows. Messages are not encrypted for INACTIVE
devices.
When an INACTIVE device reappears in PEP, or a message is received from
an INACTIVE device, it is set back to trusted.
2015-07-21 14:24:59 +02:00
Andreas Straub
d2845e9ac1
Refactor axolotl send processing/caching flow
2015-07-20 23:13:28 +02:00
Daniel Gultsch
e79f82ca72
attempt to fix the delay problem
2015-07-20 18:11:33 +02:00
Andreas Straub
012f036840
Optimize imports
2015-07-20 14:26:29 +02:00
Andreas Straub
e9d7d7e12a
Fix set/remove OnUpdateBlocklistListener
2015-07-20 14:12:24 +02:00
Andreas Straub
14010bf5a6
Ask for key trust when sending messages
...
If the contact (or the own account) has keys that have UNDECIDED trust,
we now drop the user into the new TrustKeysActivity, where they have to
decide for each new key whether it should be TRUSTED or UNTRUSTED.
2015-07-19 22:27:26 +02:00
Andreas Straub
2045a71262
Handle file transmission properly in axolotl
2015-07-19 22:23:28 +02:00
Andreas Straub
43703870e8
Remove unneccessary code
2015-07-19 22:23:28 +02:00
Andreas Straub
4038af2f47
Fix trust status for outgoing messages
...
Tag sent messages with own fingerprint, set own fingerprint as always
trusted, include own fingerprint in database trust search, explicitly
reset trust colorfilter
2015-07-19 22:23:28 +02:00
Andreas Straub
7f918542c8
Postpone initAccountService until roster loaded
...
The AxolotlService depends on the roster being loaded when it is
initialized so that it can fill its in-memory SessionMap.
2015-07-19 22:17:57 +02:00
Andreas Straub
69600502d2
Fix asynchronous axolotl message sending
...
XmppConnectionService.sendMessage() now dispatches messages to the
AxolotlService, where they only are prepared for sending and cached.
AxolotlService now triggers a XmppConnectionService.resendMessage(),
which then handles sending the cached message packet.
This transparently fixes, e.g., handling of messages sent while we are
offline.
2015-07-19 21:32:27 +02:00
Andreas Straub
3815d4efa3
Fetch bundles on-demand, encrypt in background
...
Bundles are now fetched on demand when a session needs to be
established. This should lessen the chance of changes to the bundles
occuring before they're used, as well as lessen the load of fetching
bundles.
Also, the message encryption is now done in a background thread, as this
can be somewhat costly if many sessions are present. This is probably
not going to be an issue in real use, but it's good practice anyway.
2015-07-19 21:32:26 +02:00
Andreas Straub
c1d23b2395
Migrate to new PEP layout
...
Merge prekeys into bundle node
2015-07-19 21:32:26 +02:00
Andreas Straub
299bbdf27f
Reformat code to use tabs
...
This really sucks to do it like this. Sorry. :(
2015-07-19 21:32:26 +02:00
Andreas Straub
065519d3f3
Added axolotl activation code to UI
2015-07-19 21:32:26 +02:00
Andreas Straub
f73aa1a200
Reworked axolotl protocol layer
...
Numerous fixes
2015-07-19 21:32:25 +02:00
Daniel Gultsch
5c017e5186
bugfix: use sendIqPacket method in service instead of invoking XmppConnection directly
2015-07-19 14:25:30 +02:00
Daniel Gultsch
ffffca10f0
renamed colors
2015-07-13 12:55:13 +02:00
Daniel Gultsch
58bc4cba06
only try to change affilations for known jids
2015-07-11 21:24:51 +02:00
Daniel Gultsch
ce79f4bbe3
renamed downloadable to transferable
2015-07-10 15:11:03 +02:00
Daniel Gultsch
0f5c87ca1f
display toast in ui on failed http download
...
fixes #954
2015-07-10 13:28:50 +02:00
Daniel Gultsch
bef731a3c8
refactored sendMessage and merged with resendMessage
2015-07-05 11:59:38 +02:00
Daniel Gultsch
2fbeb0bbb2
make sure unread count is initialized as 0. fixes #1270
2015-07-03 22:08:23 +02:00
Daniel Gultsch
c745fbb562
fixed share with activity to account for http file upload
2015-07-02 23:51:59 +02:00
Daniel Gultsch
7e11570f2c
show attach button in conferences when http upload is available
2015-06-29 15:21:41 +02:00
Daniel Gultsch
9eb9a52205
initial http upload support
...
be careful: little error handling and no encryption
2015-06-29 15:21:41 +02:00
Daniel Gultsch
9d1e8205a2
made i/o and memory intensive operations execute in serial order
2015-06-05 08:46:06 +02:00
Daniel Gultsch
53e8964dc1
reworked handeling of system contacts
2015-06-03 14:05:54 +02:00
Daniel Gultsch
0f6f6adca0
removed unnecessary / inacurate debug logging
2015-05-26 13:04:22 +02:00
Daniel Gultsch
6059ed4738
update unread count badge only when necessary
2015-05-26 12:00:38 +02:00
Daniel Gultsch
9debf8037b
added default iq handler to print some iq error messages
2015-05-26 11:31:33 +02:00
Daniel Gultsch
dc91ff8f29
renamed OtrEngine to OtrService
2015-05-26 04:36:32 +02:00
Daniel Gultsch
f579602456
Merge branch 'master' into development
2015-05-25 11:15:14 +02:00
Daniel Gultsch
a535d45ec3
log connection age and reshedule ping check
2015-05-25 04:49:36 +02:00
Daniel Gultsch
2364710afb
added ShortcutBadger as a dependency to create unread counts on launcher icon
2015-05-20 12:47:04 +02:00
Daniel Gultsch
1b5631c835
fixed muc mam. added a few security checks
2015-05-20 03:48:14 +02:00
Daniel Gultsch
e32f380dae
provide helper function for getting the content of a child directly
2015-05-20 03:48:14 +02:00
Daniel Gultsch
4151b72a6e
let jingle connection and manager handle message status
2015-05-16 04:12:53 +02:00
Daniel Gultsch
6489ddac6c
clear avatar cache when uploading new avatar
2015-05-13 14:33:52 +02:00
Daniel Gultsch
d3a6aa9f7a
handle conference invites differently to deal with killed activities. fixes #1188
2015-05-12 04:33:04 +02:00
Andreas Shimokawa
9e78e3e09d
only forward incoming chat messages to Pebble App and Gadgetbridge
2015-05-08 21:36:20 +02:00
Daniel Gultsch
d9e5035c08
config option to reset attempt counts when changing network (default=true)
2015-05-08 06:50:28 +02:00
Daniel Gultsch
05f0aa614f
fixed npe when binval value of vcard avatar is null
2015-05-07 11:07:15 +02:00
Daniel Gultsch
b7c672e10e
avoid fetching avatars multiple times in parallel
2015-05-05 10:29:41 +02:00
Daniel Gultsch
5136bf9832
r/o support for vcard avatars. pep avatars will be prefered
2015-05-05 06:17:34 +02:00
Daniel Gultsch
93e942f96d
made material icons smaller (24dp)
2015-04-28 14:28:51 +02:00
Daniel Gultsch
b10b8e2c50
escape nick in highlight regex pattern
2015-04-28 09:32:58 +02:00
Daniel Gultsch
77caf73103
Merge pull request #1146 from BrianBlade/minor_otr_tweaks
...
OTR: Fix onContactStatusChanged & dont archive OTR
2015-04-25 14:09:38 +02:00
Daniel Gultsch
5e1492fbff
send invite to other instanzes after creating ad hoc conference. fixes #1136
2015-04-23 17:37:47 +02:00
BrianBlade
d6443d9b2f
OTR: Fix onContactStatusChanged & dont archive OTR
...
- Fix session handling on contact status change: Do not reset
potentially active sessions; check peer's OTR-resource on disconnect
- use no-permanent-store hint instead of no-store to ensure
finished messages are delivered to offline/disconnected clients
- add no-permanent-store to ask compliant servers not to archive
OTR messages
2015-04-21 22:35:35 +02:00
iNPUTmice
defb127d6e
Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference
...
Conflicts:
src/main/res/values-de/strings.xml
src/main/res/values/strings.xml
2015-04-14 15:17:06 +02:00
BrianBlade
878066ca99
Add option to use MTM without default TrustManager
...
Add a new "Don't trust system CAs" preference under advanced options
that will change the behaviour of the MemorizingTrustManager. All
formerly unknown certificates will raise a warning if checked.
2015-04-11 15:13:42 +02:00
iNPUTmice
332fe0fd19
don't resume old session when changing resource
2015-04-09 12:46:54 +02:00
BrianBlade
dace8ba3d3
Enable end-conversation by swipe gesture
...
Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4
to enable swipe-out for ListViews
Re-enable selectableItemBackground
Dont end selectedConversation on swipe
Call mConversationFragment.reinit() instead.
Add separate undo string for swipe MUC.
Add blacklistedConversation for undo swipe
Update title_undo_swipe_* strings
Fix undo(), rename blacklistedConversation
Fix discardUndo(); re-init selectedConversation
maintain scroll position after undo
clear notification when dismissing a conversation
modified / simplified maintain scroll position code
simplify handling of selectedConversation
change undo_muc string, remove notifyDataSetChanged()
2015-04-08 23:29:52 +02:00
Daniel Gultsch
382bcc4cb5
Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen
...
add delivery receipts for private muc msgs & enable update last-seen for muc-msgs
2015-03-19 18:47:33 +01:00
BrianBlade
1c600fefcf
# add delivery receipts for private muc msgs
...
# enable update last-seen for muc-msgs
2015-03-18 21:49:41 +01:00
Daniel Gultsch
7ae357f863
Merge pull request #1036 from QuentinC/development
...
Green led color is better with "full-green"
2015-03-18 17:11:43 +01:00
iNPUTmice
db6a63bcf6
open location directly from notification
2015-03-10 21:46:13 +01:00
iNPUTmice
87a048fe6f
display geo uris as location. show 'send loction' in share menu if request location intent can be resolved
2015-03-07 14:15:38 +01:00
iNPUTmice
f25a824610
avoid unnecessary thread creation
2015-03-05 15:46:33 +01:00
Quentin
fb3740f07b
Green led color is better with "full-green"
2015-03-04 00:57:34 +01:00
Daniel Gultsch
ac577fe4fd
added methods to count number of unread messages
2015-03-02 11:53:15 +01:00
Daniel Gultsch
ff86fa6049
mark all sent messages up to a marker as displayed
2015-03-01 14:15:40 +01:00
iNPUTmice
98df008bce
use conversations green in notification led
2015-02-27 17:16:28 +01:00
QuentinC
c67a481e4b
Update NotificationService.java
...
Revert led light color
2015-02-27 11:18:15 +01:00
Quentin
71ce73a271
- Update mBuilder in NotificationService.java to ensure that the led is displayed at the right color.
...
CF: http://stackoverflow.com/questions/14953793/android-notification-led-doesnt-use-my-color#comment20991762_14953793
- Changed led Color to green to remember the icon color and led times
2015-02-27 00:33:49 +01:00
iNPUTmice
8319446c03
reset incoming chat state when going into background
2015-02-23 21:47:35 +01:00
iNPUTmice
7a62fbbeae
get rid of some useless debugging
2015-02-23 12:05:18 +01:00
iNPUTmice
7ee5e95959
added typing notifications through XEP-0085. fixed #210
2015-02-21 11:06:52 +01:00
iNPUTmice
b128b33e56
always go through reconnect method instead of just starting XmppConnection threads
2015-02-18 13:37:26 +01:00
iNPUTmice
67d5ee6b71
moved roster loading to async task as well
2015-02-17 11:51:11 +01:00
iNPUTmice
0485da8488
loading avatars in seperate tasks
2015-02-15 18:48:05 +01:00
iNPUTmice
e68c6a1b74
load messages asynchronously
2015-02-12 18:53:00 +01:00
iNPUTmice
44ee746681
added actions to error notification
2015-02-10 17:13:34 +01:00
Sam Whited
48604a6620
Use Material Design Icons on API 21+
2015-01-29 15:28:26 -05:00
iNPUTmice
91e85d2faf
adapt caps on whether or not message confirmation is on
2015-01-26 00:48:56 +01:00
iNPUTmice
f0d428a56d
made connect time out more failsave
2015-01-25 20:52:53 +01:00
iNPUTmice
b9af38464e
fixed mam to work with muc
2015-01-24 00:22:51 +01:00
iNPUTmice
00c74503ab
deal with user entering full jids in join conference dialog
2015-01-21 16:18:38 +01:00
Daniel Gultsch
818c0e609c
Merge pull request #908 from betheg/otr4j
...
otr4j: update to 0.22
2015-01-21 11:48:42 +01:00
Sam Whited
e42e0f88e1
Add color / category to foreground notification
2015-01-20 20:32:27 -05:00
Michael
fa7d748c3f
otr4j: update to 0.22
2015-01-20 18:01:39 +01:00
iNPUTmice
4cbf8120f5
fixed legacy translation of image received
2015-01-19 12:14:30 +01:00
iNPUTmice
100ba6e7e7
check for deleted files when loading more messages from history
2015-01-19 11:23:05 +01:00
iNPUTmice
7af588c8b3
account for rounding errors when rescheduling wake up
2015-01-19 11:17:27 +01:00
Sam Whited
99989cd1d5
Add some Android 21 notification features
2015-01-17 23:41:57 -05:00
Sam Whited
dfc1cea882
Correct the download file string on notifications
...
Fixes #896
2015-01-17 09:11:04 -05:00
Sam Whited
edd58f19b4
Add download button on notification if applicable
2015-01-16 01:10:01 -05:00
iNPUTmice
994c9495ba
added dedicated button to disable foreground service in perma notification
2015-01-15 16:17:55 +01:00
iNPUTmice
351e5d7065
fixed #888
2015-01-15 15:45:11 +01:00
iNPUTmice
a6a9ed4877
handle muc nicks with white spaces. fixed #884
2015-01-14 22:48:14 +01:00
Sam Whited
caf861d96f
Ensure type safety in Pebble notifications
...
Also use forward-compatible screen-on detection
2015-01-13 23:18:35 -05:00
Daniel Gultsch
77e4e1c2ac
reworked message preview / message meta information (ie file offered, received * file)
...
fixed #837
2015-01-12 16:09:39 +01:00
Daniel Gultsch
18eb187949
make room persistant when changing subject or other muc options
2015-01-10 23:10:32 +01:00
Daniel Gultsch
d9f88c4669
ensure that everyone is member before making a room private
2015-01-09 13:28:01 +01:00
Daniel Gultsch
a9159568b9
allow for very basic muc configuration
2015-01-08 21:29:26 +01:00
Daniel Gultsch
0fe193b027
code cleanup
2015-01-08 14:45:44 +01:00
Daniel Gultsch
f8aa1bfec4
kick after ban
2015-01-08 01:23:53 +01:00
Daniel Gultsch
8d655f445a
more muc options
...
* show invite button only with admin privileges or on public conferences
* Offer to ban user in public conferences.
Thanks to @betheg for the awesome ground work for this
2015-01-07 18:34:24 +01:00
Daniel Gultsch
ef525fb10e
basic affiliation changes in muc
2015-01-07 15:03:29 +01:00
Daniel Gultsch
81e9afdf19
reset next encryption when archiving conversations
2015-01-07 12:20:39 +01:00
Daniel Gultsch
a22c8c04d8
use copyonwritearraylist in for phone helper
2015-01-07 01:01:15 +01:00
Daniel Gultsch
f02f510c18
fixed bug in new ping strategy
2015-01-06 19:46:52 +01:00
Daniel Gultsch
0c51245ff5
reworked ping scheduling strategy. very experimental
2015-01-05 18:45:39 +01:00
Olivier Mehani
f1ebece866
Send notification to Pebble on new message
...
This implements basic notifications to the Pebble through the app (using
an intent). This simply hooks into NotificationService.notify().
This is pretty basic, but it works (I haven't tested to see how the
intent is received when the Pebble app is not around, though). More
fancy stuff could probably be added to avoid getting flooded, but the
Pebble app already does a good job a filtering notification (e.g.,
screen on or quiet times).
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2015-01-05 23:06:46 +11:00
Daniel Gultsch
3522243835
do not run mam queries in findOrCreateConversation() when isn't available
2015-01-04 18:16:55 +01:00
Sam Whited
88704ce5cd
Verify IQ responses
...
Fixes #20
Move fromServer/toServer to AbstractStanza
2015-01-04 08:28:13 -05:00
Sam Whited
eb7e683403
Make IqPacket type an enum
2015-01-04 08:20:30 -05:00
Daniel Gultsch
e32a927300
Use packet callbacks only for IqPackets. Removed unnecessary code
2015-01-04 12:09:39 +01:00
Daniel Gultsch
fc8bd64bfd
void messages getting reloaded through mam after clear history
2015-01-03 18:22:26 +01:00
Daniel Gultsch
8bda54d48c
code cleanup
2015-01-03 00:47:22 +01:00
Daniel Gultsch
bcd3be59ce
put Conversations into background mode earlier
2015-01-02 12:04:33 +01:00
Daniel Gultsch
0c22a8d1c6
added callback to change account password to notify UI on success / failure
2014-12-25 22:08:13 +01:00
Sam Whited
e4d9dca2fe
Add ability to change password on server
...
Fixes #260
2014-12-25 21:38:55 +01:00
Sam Whited
e152ed1e07
Simplify roster handling code
...
Merge result handling code into IqParser
Fixes #20
2014-12-22 12:53:31 -05:00
Sam Whited
af7a64491f
Add support for XEP-0191 (Blocking command)
...
Fixes #791
Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1
2014-12-22 08:19:00 -05:00
iNPUTmice
1517641713
get rid of special self presence object and incorporate that into roster
2014-12-20 17:23:03 +01:00
iNPUTmice
6b047bed97
fixed another break continue bug
2014-12-20 12:52:45 +01:00