2
0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-29 05:07:40 +00:00

19 Commits

Author SHA1 Message Date
Albert Vaca
e9a64dc99a Don't show the Encryption Info menu if we are not connected with the device
We don't know the actual encryption used unless we have a device link.
2016-09-06 10:53:24 +02:00
Albert Vaca
c5456fd84e Fixed issues detected in static analysis by Coverity 2016-07-07 17:45:04 +02:00
Albert Vaca
de81a20f82 Made capabilities static like in /r/128386/ 2016-07-06 17:45:12 +02:00
Albert Vaca
0836453c35 Project-wise optimize imports 2016-06-09 13:42:54 +02:00
Albert Vaca
f3e5bf917a Removed unneeded whitespaces. 2016-06-04 02:21:28 +02:00
Albert Vaca
c927af4bf3 Added newlines in encryption info 2016-02-12 08:37:18 -08:00
Albert Vaca
1ca09d7f58 Fixing build 2016-01-10 03:16:14 -08:00
Albert Vaca
f8da00b9b5 Merge branch 'master' into sslmaster 2015-12-02 09:46:22 -08:00
Albert Vaca
d67985d484 Now with less compilation errors! 2015-11-12 06:41:14 -08:00
Albert Vaca
9322970d58 Merge branch '0.9'
# Conflicts:
#	res/values-ca/strings.xml
#	res/values-fi/strings.xml
#	res/values-nl/strings.xml
#	res/values-pt-rBR/strings.xml
#	res/values-pt/strings.xml
#	res/values-sv/strings.xml
#	res/values-uk/strings.xml
#	res/values/strings.xml
#	src/org/kde/kdeconnect/Device.java
2015-09-18 08:11:44 -07:00
Albert Vaca
47c9729e04 Removed logs 2015-09-18 04:40:33 -07:00
Albert Vaca
80026f6d62 Merge branch 'stable' 2015-09-12 13:30:21 -07:00
Albert Vaca
24ca5f706a Fixed pairing requests not being displayed after clicking the notification 2015-09-12 13:21:06 -07:00
Albert Vaca
6940bac3e6 Do not assume that all the plugins are non-null 2015-09-12 07:17:14 -07:00
Albert Vaca
f5725b7c8d Merge branch 'master' into ssl
# Conflicts:
#	build.gradle
#	src/org/kde/kdeconnect/Backends/BaseLink.java
#	src/org/kde/kdeconnect/Backends/BaseLinkProvider.java
#	src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java
#	src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
#	src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java
#	src/org/kde/kdeconnect/BackgroundService.java
#	src/org/kde/kdeconnect/Device.java
#	src/org/kde/kdeconnect/Helpers/DeviceHelper.java
#	src/org/kde/kdeconnect/UserInterface/DeviceActivity.java
#	src/org/kde/kdeconnect/UserInterface/PairActivity.java
#	tests/org/kde/kdeconnect/LanLinkProviderTest.java
#	tests/org/kde/kdeconnect/LanLinkTest.java
2015-09-11 09:24:35 -07:00
Albert Vaca
34ec43445d Better print something on exception 2015-09-11 03:46:23 -07:00
Albert Vaca
cf8f87b6a1 Fixed crash 2015-09-11 01:23:07 -07:00
Albert Vaca
10d9ff5a5a Commented out some logs 2015-09-09 01:50:12 -07:00
Albert Vaca
92e4fa864a Removed old UI 2015-09-07 02:16:23 -07:00