data: auto negotiate OTR and resend requests on OTR activated

still issue with auto negotiate
data: make offers retry after OTR negotiation

fixes #2035
Merge branch 'otr6' of https://github.com/devrandom/ChatSecureAndroid into devrandom-otr6