aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/utils (follow)
Commit message (Expand)AuthorAgeFilesLines
* Improved error handling for filetransfer:http:delete, Check for httpupload fe...steckbrief2017-01-112-3/+34
* Generic view util added to change the visibility of subclasses of Viewsteckbrief2017-01-112-2/+41
* Custom toast view addedsteckbrief2017-01-111-0/+101
* Merge branch 'trz/rebase' into trz/renamesteckbrief2017-01-054-8/+126
|\
| * Added columns to fileparams table: url, original file name, key and ivsteckbrief2017-01-042-3/+91
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-204-34/+176
| |\ | |/ |/|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-092-0/+93
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-233-0/+62
| |\ \
* | | | Implements FS#235: Deletion of remote files uploaded via httpuploadsteckbrief2016-09-294-34/+78
* | | | Fixes FS#230: Uncaught NullPointerException in DNSHelpersteckbrief2016-08-261-7/+12
* | | | Basic filetransfer http delete implementation; Exceptions for IqPacketError a...steckbrief2016-08-221-0/+10
* | | | Implements FS#227: Store password encrypted in internal databasesteckbrief2016-07-161-0/+110
| |_|/ |/| |
* | | XmppConnectionService.markMessage moved to MessageUtilsteckbrief2016-05-092-0/+91
| |/ |/|
* | Fixes FS#204: Observe all used directoriessteckbrief2016-04-232-0/+44
* | Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-182-1/+41
|\ \
| * | Implements FS#137: build flavorssteckbrief2016-04-181-1/+1
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-171-0/+40
| |\|
| | * Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-0/+40
| | * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-071-0/+48
| | |\ | | |/ | |/|
* / | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-171-0/+16
|/ /
* | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-071-0/+47
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-051-0/+36
|\|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-0/+75
| |\ | |/ |/|
* | Introduction of a TextViewUtil to easily set attributes for TextViewssteckbrief2016-03-291-0/+75
* | Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-291-13/+16
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-251-4/+5
|\|
* | Show file name instead of mime type (FS#102)lookshe2016-03-201-1/+1
* | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-0/+2
|\|
* | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-1/+8
|\|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-121-82/+0
| |\ | |/ |/|
* | Fixes FS#155: Check FileHelper vs. FileUtilssteckbrief2016-03-122-87/+10
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-122-3/+31
|\|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-1/+2
| |\ | |/ |/|
* | Fixes FS#139: Do not merge messages at allsteckbrief2016-03-111-1/+2
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-1/+4
|\|
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-1/+2
|\|
| * use Build.VERSION_CODES.KITKAT instead of hard coded 19lookshe2016-03-081-1/+2
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-072-4/+43
|\|
| * corrected getRealPathFromUrilookshe2016-03-071-2/+40
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0619-177/+662
|\|
| * Packet sending helper moved to XmppSendUtil and methods in XmppConnectionServ...steckbrief2016-02-231-0/+8
| * Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError)steckbrief2016-02-231-0/+15
| * Imports organizedsteckbrief2016-02-123-5/+0
| * Compilation errors and merge mixups fixedsteckbrief2016-02-111-0/+22
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-132-0/+79
| |\ | |/ |/|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-162-0/+132
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-103-126/+3
| |\ \
| * \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-023-5/+129
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-063-0/+526
| |\ \ \ \
| * | | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-0315-2075/+0