9 commits

Author	SHA1	Message	Date
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
iNPUTmice	f25a824610	avoid unnecessary thread creation	2015-03-05 15:46:33 +01:00
iNPUTmice	91e85d2faf	adapt caps on whether or not message confirmation is on	2015-01-26 00:48:56 +01:00
Michael	dc0dba3faf	remove unused imports.	2014-11-21 19:17:27 +01:00
iNPUTmice	3c6b3506e3	turn on foreground service in expert settings	2014-11-15 15:34:34 +01:00
Sam Whited	9db624ec7b	It builds again!	2014-11-09 07:00:40 -05:00
Sam Whited	281ce3105f	Make conversations the root project	2014-10-22 15:47:11 -04:00

Renamed from conversations/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java (Browse further)