aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Revert "chnaged avatar format to match XEP"Christian S2016-04-111-1/+1
* Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-113-43/+54
|\
| * don't throw IO exception at end of streamDaniel Gultsch2016-04-101-1/+0
| * fixed 'connecting…' buttonDaniel Gultsch2016-04-101-3/+6
| * moved authentication into seperate method. force close socket before changing...Daniel Gultsch2016-04-101-38/+44
| * introduced setting to turn of notification ledDaniel Gultsch2016-04-091-1/+4
* | don't show contact details when in conversations with selfChristian S2016-04-111-26/+23
* | Insert /me on long click send buttonArtem Shipovskiy2016-04-091-0/+11
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-098-24/+91
|\|
| * use startdate as lower bound when querying archive with after=xDaniel Gultsch2016-04-091-13/+3
| * don't show contact details when in conversations with selfDaniel Gultsch2016-04-093-1/+8
| * use last received message id when querying archiveDaniel Gultsch2016-04-091-7/+17
| * transform nimbuzz workaround into a more general 'waitForDisco' conditionDaniel Gultsch2016-04-091-6/+11
| * add required disco#items query to timeout listDaniel Gultsch2016-04-081-1/+4
| * removed ernoexception in exchange for a regular exeption to prevent verify er...Daniel Gultsch2016-04-081-3/+2
| * check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-073-2/+54
| * prevent null pointer when checking http upload max sizeDaniel Gultsch2016-04-071-6/+6
* | chnaged avatar format to match XEPChristian S2016-04-091-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-072-2/+10
|\|
| * better detect broken pepDaniel Gultsch2016-04-052-2/+10
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-042-19/+25
|\|
| * switched around info and items query to avoid race conditionDaniel Gultsch2016-04-041-1/+1
| * removed unnecessary wait for disconnectDaniel Gultsch2016-04-041-6/+0
| * made sure the disco#items query has returned before finalizing the bindDaniel Gultsch2016-04-041-12/+24
* | add option to only allow one account and set it to trueChristian S2016-04-042-5/+4
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-0317-54/+184
|\|
| * don't ask for resource when server uses http upload v0.1Daniel Gultsch2016-04-023-6/+8
| * check max http file size when attaching filesDaniel Gultsch2016-04-016-12/+83
| * add methods to check max file size for http uploadDaniel Gultsch2016-03-315-12/+41
| * save otr fingerprint in messageDaniel Gultsch2016-03-316-12/+15
| * include form fields into caps hash calculationDaniel Gultsch2016-03-312-6/+25
| * closed some cursors under error conditionsDaniel Gultsch2016-03-311-3/+13
| * made setting aes keys in DownloadableFile more readableDaniel Gultsch2016-03-311-12/+8
| * Update ShortcutBadger to version 1.1.4Christian S2016-03-271-2/+2
* | fixed crashes during updates on Android 6Christian S2016-03-302-35/+57
* | fixed bug in ShortcutBadgerChristian S2016-03-271-2/+2
* | Merge remote-tracking branch 'refs/remotes/origin/patch-2' into developmentChristian S2016-03-271-2/+2
|\ \
| * | Update ShortcutBadger to version 1.1.4Christian S2016-03-271-2/+2
| |/
* | Merge branch 'siacs/master' into developmentChristian S2016-03-268-39/+63
|\|
| * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-236-30/+41
| * only add image files to media scannerDaniel Gultsch2016-03-236-13/+26
| * Typo `attempt`licaon-kter2016-03-221-1/+1
* | Merge pull request #80 from siacs/masterChristian S2016-03-206-12/+19
|\|
| * show room nick for /me command in sent muc messages. fixes #1773Daniel Gultsch2016-03-201-4/+5
| * be less strict when sharing EXTRA_TEXT intentsDaniel Gultsch2016-03-201-1/+1
| * be more careful to avoid creating multiple connectionsDaniel Gultsch2016-03-202-3/+8
| * don't show v\omemo keys as such if not enabledDaniel Gultsch2016-03-202-4/+5
* | Merge branch 'siacs/master' into developmentChristian S2016-03-176-54/+92
|\|
| * made it possible to share text filesDaniel Gultsch2016-03-161-7/+8
| * reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-162-30/+66