Daniel Gultsch
f8e06d8e9a
revert undo timeout to a more reasonable value
2015-04-28 09:25:58 +02:00
Daniel Gultsch
4caa92e8ff
handle returning from camera without picture
2015-04-27 12:18:27 +02:00
Daniel Gultsch
0fda254d48
Merge pull request #1135 from BrianBlade/manage_certificates
...
Add option to remove manually approved certificates
2015-04-25 19:09:50 +02:00
Daniel Gultsch
5ea1c547d5
fixed service discovery by properly storing and checking identities
2015-04-25 18:24:10 +02:00
Daniel Gultsch
5d7e1159f5
always hide pgp snackbar after decrypting a message. fixes #1075
2015-04-20 12:13:47 +02:00
Daniel Gultsch
127b7866f0
removed some dead code
2015-04-20 11:49:44 +02:00
Daniel Gultsch
d2c9bf31cd
fixed weird touch on snackbar switched conversation bug
...
when touching the border of the snackbar or more precisely the space between the input field and the snackbar Conversations would switch into a random conversation for yet unknown reasons.
2015-04-20 11:39:38 +02:00
Daniel Gultsch
9e20a4936e
some code clean up to fix some rare NPE’s
2015-04-19 19:11:32 +02:00
BrianBlade
da367dd752
Add option to remove manually approved certificates
...
- "Remove certificates" option brings up a dialog that allows
to delete certificates from MemorizingTrustManager's keystore
- Reconnect active accounts when certificate-settings are changed
- new preference category "Certificate options"
2015-04-19 18:08:13 +02:00
iNPUTmice
570a22206d
increased undo delay
2015-04-17 20:01:09 +02:00
iNPUTmice
f99e234b88
maintain state when rotating settings activity
2015-04-14 15:53:50 +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
iNPUTmice
261b505f06
always show save button when account info was modified. fixes #918
2015-04-14 15:00:49 +02:00
iNPUTmice
2f24b09309
fixed disable account when sliding and not clicking the toggle
2015-04-13 18:19:40 +02:00
iNPUTmice
4bf09bc10b
shut up linter
2015-04-13 17:35:20 +02:00
iNPUTmice
85cb1e4a37
Maintain private chat on MUC. fixes #1097
2015-04-13 16:00:04 +02:00
iNPUTmice
845b39cdcc
fixed regression where the selected conversation wasn't highlighted anymore on tabled layout
2015-04-13 15:59:18 +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
37d08276a8
allow sharing multiple images at once. fixes #1090
2015-04-11 14:53:10 +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
BrianBlade
e64049c4fc
Add toggle account-state switch
...
Add a switch to AccountAdapter that allows self-contained enabling/disabling of
accounts without the need to bring up the context-menu
2015-04-01 12:47:59 +02:00
Andreas Straub
f76baa5658
Added multiple select to Choose Contact Activity
...
When passing the Choose Contact Activity a boolean called "multiple"
set to true, it now allows the user to select multiple contacts. Long
pressing a contact enters multiple selection mode and the selection is
confirmed using a button in the CAB. The Activity returns whether or not
multiple contacts were selected using the same boolean. If multiple
contacts were selected, an array of JID strings called "contacts" is
returned. The Choose Contact Activity now also honors "filter_contacts",
an array of strings containing JIDs that should not be displayed in
the picker.
The invite to conference dialog now uses this feature to enable inviting
multiple contacts at once. Additionally, Invite Contact uses
"filter_contacts" to only display contacts that are not yet
participating in the conversation
2015-03-18 17:11:50 +01:00
iNPUTmice
4ee4eeb5e7
add context menu entries for geo uris
2015-03-11 15:48:43 +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
cbca92d209
fixed enter is send option
2015-03-06 22:22:50 +01:00
iNPUTmice
f25a824610
avoid unnecessary thread creation
2015-03-05 15:46:33 +01:00
iNPUTmice
6ad4865d96
hide change password menu item if server feature is unavailable
2015-02-27 17:03:13 +01:00
iNPUTmice
a022e4b41a
reset error status in edit account when reconnecting
2015-02-26 17:17:40 +01:00
iNPUTmice
b8bc70aaa0
prevent next button from showing up too early on account setup
2015-02-25 23:48:45 +01:00
iNPUTmice
da2da75756
init mode (first start) for StartConversationActivity (no up button) and avoid being started multiple times. fixed #995
2015-02-22 13:24:29 +01:00
iNPUTmice
f52bc4f0be
properly remove invalid avatar
2015-02-22 13:15:27 +01:00
iNPUTmice
7ee5e95959
added typing notifications through XEP-0085. fixed #210
2015-02-21 11:06:52 +01:00
iNPUTmice
f26f6e9a00
fixed #993
2015-02-19 14:36:52 +01:00
iNPUTmice
2e596c0bd4
launch edit account activity when starting Conversations for the first time (fixed regression)
2015-02-19 13:48:40 +01:00
iNPUTmice
9c2e6392ec
always call to cancel before loading new avatars
2015-02-18 18:12:43 +01:00
iNPUTmice
da2bc6db23
avoid weird npe. fixed #991
2015-02-18 13:11:41 +01:00
iNPUTmice
a8ec36cda8
limit ui refresh rate
2015-02-17 14:18:35 +01:00
iNPUTmice
62b15a5d26
refresh list view more often
2015-02-17 09:53:16 +01:00
iNPUTmice
4e14c89ff8
support for XEP-0092: Software Version
2015-02-16 10:06:09 +01:00
iNPUTmice
5aa600c638
fixed avatar cache lookup in ListItemAdapter
2015-02-16 00:58:31 +01:00
iNPUTmice
146edb8c81
made image view background more colorful while waiting on actual avatar to load
2015-02-15 23:25:35 +01:00
iNPUTmice
0485da8488
loading avatars in seperate tasks
2015-02-15 18:48:05 +01:00
iNPUTmice
45de788773
use time instead of uptime for unmute
2015-02-12 18:52:10 +01:00
iNPUTmice
026be61b72
don't show 'enter pgp key' in non encrypted chats
2015-02-09 16:01:30 +01:00
Daniel Gultsch
ae8c021c16
sort users in muc
2015-02-07 12:29:32 +01:00
Daniel Gultsch
e1e09d5cba
refactored how snackbar is displayed
2015-02-07 12:17:03 +01:00
iNPUTmice
6c3ea7f2bd
Merge branch 'development' of https://github.com/siacs/Conversations into development
2015-01-29 23:26:41 +01:00
iNPUTmice
f2bf64d19d
Merge branch 'development' of https://github.com/siacs/Conversations into development
2015-01-29 23:20:01 +01:00
Sam Whited
48604a6620
Use Material Design Icons on API 21+
2015-01-29 15:28:26 -05:00
iNPUTmice
0eeead495f
properly clear notifications. fixed #921
2015-01-29 13:20:18 +01:00
Sam Whited
8cbf610bb2
Show errors before mute snackbar
...
See #939
2015-01-27 08:49:03 -05:00
iNPUTmice
91e85d2faf
adapt caps on whether or not message confirmation is on
2015-01-26 00:48:56 +01:00
Daniel Gultsch
4afdd6480a
Merge pull request #930 from betheg/otr
...
otr: switch to the otr-state the partner alternate.
2015-01-25 20:53:29 +01:00
Michael
29331e49b9
fix mergable() for /me command.
2015-01-25 16:58:06 +01:00
Michael
7800647885
otr: switch to the otr-state the partner alternate.
...
should also fixed #877
2015-01-25 13:07:31 +01:00
Anders Sandblad
cbebd14dbd
Changed online color to green instead of primary
2015-01-23 22:28:10 +01:00
iNPUTmice
4e50098e31
show checkbox to hide offline contacts
2015-01-21 17:24:02 +01:00
iNPUTmice
00c74503ab
deal with user entering full jids in join conference dialog
2015-01-21 16:18:38 +01:00
iNPUTmice
be9af442ef
always allow access to contact details. provide add button in contact details
2015-01-21 15:31:40 +01:00
Sam Whited
764ef3c8cd
Add block/unblock to contact details menu
...
See #889
2015-01-21 13:07:36 +01:00
iNPUTmice
6dc53c2b35
fixed missing image preview
2015-01-20 22:54:26 +01:00
iNPUTmice
04f4680582
fixed up button on v21 devices
2015-01-20 22:53:45 +01:00
iNPUTmice
fc2e458053
fixed bug when sharing files from google drive
2015-01-18 20:27:16 +01:00
iNPUTmice
6756386eee
explain read marker
2015-01-18 13:44:18 +01:00
iNPUTmice
d58fadd05f
use same helper methods for images and files
2015-01-18 13:00:57 +01:00
Sam Whited
edd58f19b4
Add download button on notification if applicable
2015-01-16 01:10:01 -05:00
iNPUTmice
dc8b467cf6
sending read marker when resuming activity and conversation is open
2015-01-15 16:32:24 +01:00
iNPUTmice
c0993a9acb
show toast when avatar has been published - fixed #874
2015-01-15 16:26:46 +01:00
Sam Whited
0a96bec3c1
Add option to swap enter/emoticon key
2015-01-14 16:14:14 -05:00
Daniel Gultsch
8d3323e384
context menu for files and offered files. fixed #848 fixed #849
2015-01-12 16:42:20 +01: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
Sam Whited
3c5224251c
Add XEP-0245 (/me command) support
2015-01-11 18:32:00 -05:00
Daniel Gultsch
18eb187949
make room persistant when changing subject or other muc options
2015-01-10 23:10:32 +01:00
Daniel Gultsch
158f5dd17c
don't crash when selecting a conversation by uuid did not work
2015-01-10 19:43:23 +01:00
Daniel Gultsch
c89fdec0b1
fixed regression in tablet ui
2015-01-09 22:24:50 +01:00
Daniel Gultsch
06eae476ee
Introduced expert options to control enter-is-send
...
(default == off)
2015-01-09 19:23:26 +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
061de5205e
some clean ups for affiliation change context menu
2015-01-08 00:23:26 +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
562699c745
run invalidateOptionsMenu on uiThread
2015-01-06 18:26:14 +01:00
Daniel Gultsch
4b0043ba91
fixed potential NPEs in ShareWithActivity
2015-01-06 18:25:31 +01:00
Daniel Gultsch
fdcbdfdc05
added debug info + possible platform bug work arounds to message adapter
2015-01-05 18:46:42 +01:00
Daniel Gultsch
bdb335e6b0
Show affiliation instead of role in MucDetails and offer 'advanced mode' to display role
2015-01-05 15:06:39 +01:00
Daniel Gultsch
e6cd92a663
added higher auto accept file sizes
...
also changed labeling to MiB and KiB
2015-01-04 17:53:06 +01:00
Daniel Gultsch
be7de054be
record voice and attachment refactor
2015-01-03 16:06:59 +01:00
Daniel Gultsch
960b7343d3
disable / enable all accounts
2015-01-03 13:36:48 +01:00
Daniel Gultsch
969044b113
migrated change password into separate activity
2015-01-03 00:11:02 +01:00
Daniel Gultsch
1988e244ef
some further otr improvements
2015-01-02 15:14:06 +01:00
Daniel Gultsch
f58f27a1f7
click on dynamic tag to filter for that tag
2015-01-02 14:47:08 +01:00
Daniel Gultsch
3df23a4f75
allow cancellation of waiting files
2015-01-02 14:27:49 +01:00
Daniel Gultsch
bcd3be59ce
put Conversations into background mode earlier
2015-01-02 12:04:33 +01:00
Daniel Gultsch
3833e6dfef
improved OTR verification part one
2015-01-02 01:21:14 +01:00
Daniel Gultsch
fb8737ed9f
fixed npe in block menu item
2014-12-30 01:16:33 +01:00
Daniel Gultsch
193d2645e6
code cleanup for change password stuff
2014-12-25 22:28:19 +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
Daniel Gultsch
2081c1bef7
proper call to invalidateViews()
2014-12-25 19:53:56 +01:00
pulser
3ada834839
Show server info option when blocking is unavailable
...
Current head of development branch doesn't show server information if
blocking is disabled. This is due to slightly wrong logic on an if
statement. This patch ensures only the blocking option is disabled when
blocking is not supported by the server, and that the feature remains
available.
2014-12-24 20:54:56 +00:00
Sam Whited
afbe727b17
Don't allow user to register domain only jids
2014-12-23 17:35:36 -05:00
Sam Whited
8a467e33dd
Don't show menu on create account screen
2014-12-23 17:12:52 -05:00
Sam Whited
d454788011
Remove old JID validator
2014-12-23 13:23:13 -05:00
Sam Whited
01107e31ae
Add more server compatibility info.
...
Hide server info behind a checkbox.
Add XEP-0352 support to the server info list
Add XEP-0237 to server info list
Add XEP-0352 support to the server info list
Add MaM and Blocking to the account XEPs list
Also add a toggle button to hide some of the list
Rebase on current codebase
Make MAM string more descriptive
Change show more button to checkbox menu item
Shorten `MAM (History)' to `MAM'
Order XEP list and hide all by default
Supress warning (which is wrong anyways)
Change `Show more' to `Show more info'
2014-12-23 12:44:30 -05:00
Sam Whited
e1cb72b9ef
Fix NPEs in blocking code
2014-12-22 11:24:08 -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
88f43643bf
inject ui callback into running mam query
2014-12-20 12:52:08 +01:00
iNPUTmice
f00e168752
clean up conversation history after swtiching to a different conversation
2014-12-17 21:05:47 +01:00
iNPUTmice
de952cc959
show error if jid couldn't be parsed in new contact dialog
2014-12-17 21:04:54 +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
1a7ed4ed7c
properly detect images in share with
2014-12-17 07:12:38 +01:00
Sam Whited
6659339eff
Allow sending of any filetype via intent
...
Fixes #756
2014-12-15 22:31:55 -05:00
Sam Whited
f9c783085d
Update summary in TimePreference change listener
...
Ensures the summary is updated even if we change the time preference
programatically; also allows other places to stop the summary from being
updated by setting a new listener.
2014-12-15 17:46:32 -05:00
iNPUTmice
e2f50ab855
go through mam history page by page. load mam dynamically on scroll
2014-12-15 23:06:29 +01: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
209e62d68b
avoid npe on weird platform bugs
2014-12-15 16:55:38 +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
05d1f46c15
recreate activity after theme has changed. fixed #764
2014-12-09 20:22:21 +01:00
iNPUTmice
78370094e9
cleanup: removed unused emoticon parsing
2014-12-09 14:21:35 +01:00
iNPUTmice
490f40b196
possible work around for some weird - possibly sdk - bugs
2014-12-07 21:14:13 +01:00
iNPUTmice
a38005ec89
fixed #544
2014-12-03 12:33:32 +01:00
iNPUTmice
685f405154
display proper error in edit account details if jid is invalid
2014-12-03 10:52:55 +01:00
iNPUTmice
8f62d95e1f
further npe checks
2014-12-03 10:45:47 +01:00
iNPUTmice
aaeba697bd
refactored the message adapter a bit
2014-12-03 10:35:30 +01:00
iNPUTmice
be358b77d6
set nick and autojoin=true for new bookmarks
2014-12-03 10:34:05 +01:00
iNPUTmice
46b2760069
worked around concurrent modification exception
2014-12-03 00:54:07 +01:00
iNPUTmice
9dd445a507
fixed #728
2014-12-01 12:33:57 +01:00
iNPUTmice
8d306ac64f
clear encrypted messages on reinit
2014-12-01 11:18:55 +01:00
iNPUTmice
57fd763066
don't request fragment before updating
2014-11-30 22:27:11 +01:00
Sam Whited
afc673bb15
Misc. "fixes" to correct warnings.
2014-11-29 07:50:59 -05:00
iNPUTmice
7ba41c6a8e
fixed npe. fixed #717
2014-11-27 10:30:06 +01:00
iNPUTmice
2f02d8d398
create conversation with bare jid
2014-11-27 10:26:53 +01:00
Daniel Gultsch
7a75a8bc5a
Merge pull request #713 from betheg/muc
...
MUC: do not add yourself to the muc user list.
2014-11-24 11:53:28 +01:00
Michael
31b539daf7
MUC: option to set/delete bookmark in conference details.
2014-11-23 21:37:45 +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
Daniel Gultsch
36f8a31d7d
Merge pull request #706 from betheg/unused_imports
...
remove unused imports.
2014-11-21 20:03:46 +01:00
iNPUTmice
81a1a48b8d
update action bar with conversations updates as well
2014-11-21 20:02:13 +01:00
Michael
dc0dba3faf
remove unused imports.
2014-11-21 19:17:27 +01:00
iNPUTmice
424de3ea3a
move task to back and not finish when hitting back button
2014-11-21 18:57:27 +01:00
iNPUTmice
de0b36fc78
verify contacts key only on initiating side of smp
2014-11-21 13:42:25 +01:00
iNPUTmice
0ad6d0616f
brought ad hoc conferences back. fixed #688 fixed #367
2014-11-20 18:20:42 +01:00
