narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity
5501 commits 6 branches 4 tags 61 MiB
Commit graph

805 commits

Author SHA1 Message Date
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
iNPUTmice 88f43643bf inject ui callback into running mam query 2014-12-20 12:52:08 +01:00
iNPUTmice c30108eb17 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-12-17 10:51:28 +01:00
iNPUTmice 741a0c129d made scroling smoother + bug fixes for history loading 2014-12-17 10:50:51 +01:00
iNPUTmice 80435eca5c smoothed out scrolling a bit 2014-12-17 09:32:51 +01:00
Daniel Gultsch 5603440a91 Merge pull request #783 from SamWhited/quiet-hours 
Update summary in TimePreference change listener
 2014-12-17 07:15:31 +01:00
iNPUTmice 3f6638cb64 properly count mam messages 2014-12-17 06:59:58 +01:00
Sam Whited 0b4987581f Handle time comparisons using longs 2014-12-16 18:03:16 -05:00
iNPUTmice e2f50ab855 go through mam history page by page. load mam dynamically on scroll 2014-12-15 23:06:29 +01:00
Daniel Gultsch 03ca971e2e Merge pull request #782 from SamWhited/quiet-hours 
Make some magic number constants final
 2014-12-15 19:28:21 +01:00
Sam Whited ea61142d7e Make some magic number constants final 2014-12-15 11:39:18 -05:00
iNPUTmice 183e31ade1 Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours 2014-12-15 17:35:29 +01:00
Sam Whited af0f8e87bb Make silent notification when quiet hours are on 
Notify, just don't play a sound or vibrate
Also make the Java annoyingly verbose... I can't help myself... ahh!
 2014-12-15 11:23:50 -05:00
iNPUTmice 25d8546ae8 Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours 2014-12-15 17:16:49 +01:00
iNPUTmice 2bd4621245 fixed history deletion. fixed #780 2014-12-15 17:14:27 +01:00
iNPUTmice f8a496a5f1 run mam queries only when online 2014-12-14 23:23:56 +01:00
Sam Whited a6d4b0aec5 Add quiet hours feature 2014-12-14 15:07:41 -05:00
iNPUTmice de06cb38d1 refactored the way certain messages are being found within a conversation 2014-12-14 18:10:46 +01:00
iNPUTmice fc293aaede avoiding concurrent modification 2014-12-13 22:17:27 +01:00
iNPUTmice 899802646c reverse through mam history when loading larger chuncks 2014-12-13 15:32:11 +01:00
iNPUTmice 02a89f4ce2 Merge branch 'feature/mam' into development 
Conflicts:
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
 2014-12-13 13:55:24 +01:00
iNPUTmice 2368ba518d refactored phone contacts merger 2014-12-13 13:52:57 +01:00
iNPUTmice b523518e4b various mam improvments 2014-12-13 12:25:52 +01:00
iNPUTmice 1dcdc79a71 changed lastMessageReceived into lastMessageTransmitted to account for sent messages as well. (will trigger on sm ack) 2014-12-10 14:08:06 +01:00
iNPUTmice 0ab530932a added max history age (default 1w). automatically sort newly added mam messages 2014-12-10 14:08:06 +01:00
iNPUTmice 4a94389f05 very basic mam support 2014-12-10 14:08:06 +01:00
iNPUTmice 34558cc277 store last message received date in conversation 2014-12-10 14:08:06 +01:00
iNPUTmice 2b958e51df removed unnecessary otr error response 2014-12-10 14:07:56 +01:00
iNPUTmice 46e319b241 more safety checks for listener counts 2014-12-03 14:55:09 +01:00
iNPUTmice eb0f8c08bd safety net in joinMuc 2014-12-03 00:06:57 +01:00
iNPUTmice 241de062da cleaned up avatar / tile creation 2014-12-03 00:06:57 +01:00
iNPUTmice d98486d1ca fixed npe for broken bookmarks 2014-11-29 19:09:28 +01:00
iNPUTmice 1ff9293ee1 fix for concurrency issue 2014-11-29 13:09:56 +01:00
Michael dbe8280662 add an listener for the muc roster update. 
this is for the ConferenceDetailsActivity to show
precence updates immediately.
 2014-11-23 15:19:44 +01:00
Michael febbefefa5 MUC: set from when join muc. 2014-11-21 19:37:50 +01:00
iNPUTmice a142dcc263 import fixes 2014-11-20 18:33:04 +01:00
iNPUTmice 8b10ea676c Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-20 18:20:45 +01:00
iNPUTmice 0ad6d0616f brought ad hoc conferences back. fixed #688 fixed #367 2014-11-20 18:20:42 +01:00
Sam Whited 73d184352e Remove broken / unused imports 2014-11-19 14:57:23 -05:00
iNPUTmice e9948f6b84 sent read marker to full jid 2014-11-19 17:40:42 +01:00
iNPUTmice 66087cb360 put error notification into notification service 2014-11-18 15:26:28 +01:00
iNPUTmice 018a0c7978 better usage of synchronized in some places 2014-11-18 03:10:59 +01:00
iNPUTmice f41c3eee04 context menu for muc participants + refactor trueCounterpart to use Jid class 2014-11-17 20:02:46 +01:00
iNPUTmice 283d5058e5 synchronized around cache clear in avatar service 2014-11-17 20:01:56 +01:00
Daniel Gultsch 155b607f4d Merge pull request #673 from SamWhited/development 
Fix fetching accounts by JIDs
 2014-11-16 17:35:59 +01:00
iNPUTmice cf00f3fade happy hanukkah 2014-11-16 17:21:21 +01:00
Sam Whited 5765a91db6 Fix fetching accounts by JIDs 
Fixes a crash when publishing an avatar
 2014-11-16 10:04:45 -05:00
iNPUTmice 88c3537b68 parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareable uri where ever possible 2014-11-16 00:20:20 +01:00
Sam Whited d94b07c916 Make account status an enum 2014-11-15 11:12:41 -05:00
iNPUTmice 35bf13f5ef Merge branch 'feature/file_transfer' into development 
Conflicts:
	src/main/res/values/strings.xml
 2014-11-15 15:52:15 +01:00
iNPUTmice bdc86bb8e3 added low priority and removed date in foreground noticfication 2014-11-15 15:34:34 +01:00
iNPUTmice 3c6b3506e3 turn on foreground service in expert settings 2014-11-15 15:34:34 +01:00
iNPUTmice 47d44448f3 fixed description in notifications and conversation overview 2014-11-15 15:34:12 +01:00
iNPUTmice e0f012dba1 fixed resending for files as well 2014-11-15 15:34:12 +01:00
iNPUTmice cc4f3702a8 made file transfers cancelable 2014-11-15 15:34:12 +01:00
iNPUTmice 16847a30c8 support for pgp files 2014-11-15 15:34:12 +01:00
iNPUTmice dac12be53e copy non local files to private storage first 2014-11-15 15:34:11 +01:00
iNPUTmice 02cbda68a7 bug fixes and various improvements for file transfer 2014-11-15 15:34:11 +01:00
iNPUTmice 7a90ca429b basic arbitrary file transfer 2014-11-15 15:34:11 +01:00
iNPUTmice fce78abb1c temporarliy got rid of some insane work arounds in favor of some maybe less insane work arounds 2014-11-11 00:16:43 +01:00
iNPUTmice 89ee999e1b more refactoring for presence selection. removed getTo, getFrom and getJid from Element 2014-11-10 01:24:35 +01:00
iNPUTmice 69ef17efc0 migrated some otr stuff to new jid classes 2014-11-09 17:46:00 +01:00
iNPUTmice c310ada8b3 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-09 17:05:20 +01:00
iNPUTmice e9af0d4ca7 Merge branch 'master' into development 2014-11-09 17:02:49 +01:00
iNPUTmice 61f046a675 make avatar service not break on empty names 2014-11-09 17:02:39 +01:00
Sam Whited 180a0e4408 Rework `Account.getJid()' to return full JIDs 
Remove `Account.getFullJid()'
 2014-11-09 10:57:22 -05:00
iNPUTmice 377bd49ee8 refactored code to always contain full jid for counterpart 2014-11-09 16:21:13 +01:00
Sam Whited 1a3327f2b1 Create avatar's for JID's w/o localparts 2014-11-09 07:00:40 -05:00
Sam Whited 5ce0cd3802 Fields that we sync on should be final 2014-11-09 07:00:40 -05:00
Sam Whited 9db624ec7b It builds again! 2014-11-09 07:00:40 -05:00
Sam Whited f108fc5a5c Update more files to use JID objects 2014-11-09 07:00:40 -05:00
Sam Whited 9053f4aca0 Move a chunk of classes over to using JID objects 2014-11-09 07:00:40 -05:00
iNPUTmice 2253814519 fixed notifications for images 2014-11-05 21:37:40 +01:00
iNPUTmice 6a43bda4d7 fixed #617 2014-11-05 00:06:07 +01:00
iNPUTmice 1ea2e7dc3b fixed arrayoutofbounds + spelling 2014-11-01 14:33:34 +01:00
Sam Whited 46f147a82c Merge branch 'gradle' into development 
Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib
 2014-10-30 15:33:13 -04:00
Sam Whited 281ce3105f Make conversations the root project 2014-10-22 15:47:11 -04:00