Review Request 126188: Update bluetooth branch with code in stable branch (Android).

Aleix Pol Gonzalez aleixpol at kde.org
Sat Nov 28 02:52:54 UTC 2015 

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/126188/#review88909
-----------------------------------------------------------


This has tons of unrelated changes, please clean up the patch.

- Aleix Pol Gonzalez


On Nov. 27, 2015, 8:12 p.m., Saikrishna Arcot wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/126188/
> -----------------------------------------------------------
> 
> (Updated Nov. 27, 2015, 8:12 p.m.)
> 
> 
> Review request for kdeconnect.
> 
> 
> Repository: kdeconnect-android
> 
> 
> Description
> -------
> 
> Merge changes made in the stable branch into the bluetooth branch.
> 
> 
> Diffs
> -----
> 
>   AndroidManifest.xml 7750f1941f71c98dd759492f3b2080284b506242 
>   README.md PRE-CREATION 
>   activity_find_my_phone.xml PRE-CREATION 
>   build.gradle f60da9a14f6272ced17a3c11a9ca165de0d2fe56 
>   icon.svg e12c3a212fc8ce86c346e58d5494706debc2d9b3 
>   proguard-rules.pro PRE-CREATION 
>   res/color/state_list_drawer_text.xml PRE-CREATION 
>   res/drawable-hdpi-v11/ic_notification.png PRE-CREATION 
>   res/drawable-hdpi/drawer_shadow.9.png PRE-CREATION 
>   res/drawable-hdpi/ic_action_content_add_circle_outline.png PRE-CREATION 
>   res/drawable-hdpi/ic_action_image_edit.png PRE-CREATION 
>   res/drawable-hdpi/ic_action_settings_inverted.png PRE-CREATION 
>   res/drawable-hdpi/ic_device_laptop.png PRE-CREATION 
>   res/drawable-hdpi/ic_device_phone.png PRE-CREATION 
>   res/drawable-hdpi/ic_device_tablet.png PRE-CREATION 
>   res/drawable-hdpi/ic_drawer.png PRE-CREATION 
>   res/drawable-hdpi/ic_notification.png PRE-CREATION 
>   res/drawable-hdpi/ic_volume.png 16c4a882837fb660fd745bd7430e8bed8a8f3afc 
>   res/drawable-hdpi/icon.png 95c523487d7e5740c3926774955e3f97243278b3 
>   res/drawable-hdpi/mpris_plugin_action.png PRE-CREATION 
>   res/drawable-hdpi/runcommand_plugin_icon.png PRE-CREATION 
>   res/drawable-hdpi/share_plugin_action.png PRE-CREATION 
>   res/drawable-hdpi/touchpad_plugin_action.png PRE-CREATION 
>   res/drawable-ldpi/icon.png b464818642bef22765d15311abb4b56f57903505 
>   res/drawable-mdpi-v11/ic_notification.png PRE-CREATION 
>   res/drawable-mdpi/drawer_shadow.9.png PRE-CREATION 
>   res/drawable-mdpi/ic_action_content_add_circle_outline.png PRE-CREATION 
>   res/drawable-mdpi/ic_action_image_edit.png PRE-CREATION 
>   res/drawable-mdpi/ic_action_settings_inverted.png PRE-CREATION 
>   res/drawable-mdpi/ic_device_laptop.png PRE-CREATION 
>   res/drawable-mdpi/ic_device_phone.png PRE-CREATION 
>   res/drawable-mdpi/ic_device_tablet.png PRE-CREATION 
>   res/drawable-mdpi/ic_drawer.png PRE-CREATION 
>   res/drawable-mdpi/ic_notification.png PRE-CREATION 
>   res/drawable-mdpi/ic_volume.png PRE-CREATION 
>   res/drawable-mdpi/icon.png PRE-CREATION 
>   res/drawable-mdpi/mpris_plugin_action.png PRE-CREATION 
>   res/drawable-mdpi/runcommand_plugin_icon.png PRE-CREATION 
>   res/drawable-mdpi/share_plugin_action.png PRE-CREATION 
>   res/drawable-mdpi/touchpad_plugin_action.png PRE-CREATION 
>   res/drawable-xhdpi-v11/ic_notification.png PRE-CREATION 
>   res/drawable-xhdpi/drawer_shadow.9.png PRE-CREATION 
>   res/drawable-xhdpi/ic_action_content_add_circle_outline.png PRE-CREATION 
>   res/drawable-xhdpi/ic_action_image_edit.png PRE-CREATION 
>   res/drawable-xhdpi/ic_action_settings_inverted.png PRE-CREATION 
>   res/drawable-xhdpi/ic_device_laptop.png PRE-CREATION 
>   res/drawable-xhdpi/ic_device_phone.png PRE-CREATION 
>   res/drawable-xhdpi/ic_device_tablet.png PRE-CREATION 
>   res/drawable-xhdpi/ic_drawer.png PRE-CREATION 
>   res/drawable-xhdpi/ic_notification.png PRE-CREATION 
>   res/drawable-xhdpi/ic_volume.png 882bc4e6eba30c2c2231e6104ad721a597757c93 
>   res/drawable-xhdpi/icon.png 4002c6f3b63014914a5754cd6b70627294af688b 
>   res/drawable-xhdpi/mpris_plugin_action.png PRE-CREATION 
>   res/drawable-xhdpi/runcommand_plugin_icon.png PRE-CREATION 
>   res/drawable-xhdpi/share_plugin_action.png PRE-CREATION 
>   res/drawable-xhdpi/touchpad_plugin_action.png PRE-CREATION 
>   res/drawable-xxhdpi-v11/ic_notification.png PRE-CREATION 
>   res/drawable-xxhdpi/drawer_shadow.9.png PRE-CREATION 
>   res/drawable-xxhdpi/ic_action_content_add_circle_outline.png PRE-CREATION 
>   res/drawable-xxhdpi/ic_action_image_edit.png PRE-CREATION 
>   res/drawable-xxhdpi/ic_device_laptop.png PRE-CREATION 
>   res/drawable-xxhdpi/ic_device_phone.png PRE-CREATION 
>   res/drawable-xxhdpi/ic_device_tablet.png PRE-CREATION 
>   res/drawable-xxhdpi/ic_drawer.png PRE-CREATION 
>   res/drawable-xxhdpi/ic_notification.png PRE-CREATION 
>   res/drawable-xxhdpi/ic_volume.png 73723416356f6fadf34af9ac03f76ccd0d17ef0b 
>   res/drawable-xxhdpi/icon.png 99455d4eb1ff07f18440358450a56b74b5b16f11 
>   res/drawable-xxhdpi/mpris_plugin_action.png PRE-CREATION 
>   res/drawable-xxhdpi/runcommand_plugin_icon.png PRE-CREATION 
>   res/drawable-xxhdpi/share_plugin_action.png PRE-CREATION 
>   res/drawable-xxhdpi/touchpad_plugin_action.png PRE-CREATION 
>   res/drawable-xxxhdpi-v11/ic_notification.png PRE-CREATION 
>   res/drawable-xxxhdpi/ic_notification.png PRE-CREATION 
>   res/drawable-xxxhdpi/ic_volume.png PRE-CREATION 
>   res/drawable-xxxhdpi/mpris_plugin_action.png PRE-CREATION 
>   res/drawable-xxxhdpi/runcommand_plugin_icon.png PRE-CREATION 
>   res/drawable-xxxhdpi/share_plugin_action.png PRE-CREATION 
>   res/drawable/button_round.xml PRE-CREATION 
>   res/drawable/drawer_header.jpeg PRE-CREATION 
>   res/drawable/drawer_header_noscale.xml PRE-CREATION 
>   res/drawable/ic_action_keyboard.png  
>   res/drawable/ic_action_refresh.png  
>   res/drawable/ic_action_settings.png  
>   res/drawable/ic_volume.png 3c9ab74cbf3b28a28e5596073cdfef758104be6d 
>   res/drawable/icon.png 81b04efa1003fd950c9b4e709bfd682000bf4c4c 
>   res/drawable/state_list_drawer_background.xml PRE-CREATION 
>   res/drawable/text_section_header.xml PRE-CREATION 
>   res/layout/activity_device.xml 77e2899e5b8ccbe611cf6a166b451eacdfda73df 
>   res/layout/activity_find_my_phone.xml PRE-CREATION 
>   res/layout/activity_list.xml PRE-CREATION 
>   res/layout/activity_main.xml 996dc57c8929c0f46a0f0f599b9ef0e03b36b97c 
>   res/layout/activity_pair.xml 6b73edc395dad26b93c85ce9d0b299d6d435f3e8 
>   res/layout/custom_ip_list.xml 80d19379a94be75d9a88697cfbb1bb3cc6816775 
>   res/layout/list_item_category.xml 3d259bc857ca1cbad160bac4189e69ed32975f21 
>   res/layout/list_item_entry.xml c772d8f540601e6fd8900b056487e24acb3520e9 
>   res/layout/list_item_with_button_entry.xml PRE-CREATION 
>   res/layout/list_item_with_icon_entry.xml PRE-CREATION 
>   res/layout/mpris_control.xml 613df3f1a79242a0cade4d1034914bf17861b08b 
>   res/layout/nav_header.xml PRE-CREATION 
>   res/layout/preference_with_button.xml PRE-CREATION 
>   res/menu/main.xml 4f0b81e4d20a7fe1d7b6286cf085ecd136741d1a 
>   res/menu/refresh.xml PRE-CREATION 
>   res/values-ar/strings.xml 945bc79ff613f1bd60b045c88fdd076ffd3a82ec 
>   res/values-bg/strings.xml a4424c0032b38a13712e7e5db5b65a31fe4b2e83 
>   res/values-bs/strings.xml 416d7b69d4f90059e708225cc40a5ea4d9a7f0c9 
>   res/values-ca/strings.xml 878406e7d75b9de02c5b181aea3996e81e571933 
>   res/values-cs/strings.xml ba15dc51580f9c80e24529d1273c48cbcb5ca72e 
>   res/values-da/strings.xml 681420cb8f4e393c96d3bde5385e47269127562d 
>   res/values-de/strings.xml eba9ccca06861c8e647ba01ac15db09cb3661fc5 
>   res/values-en-rGB/strings.xml PRE-CREATION 
>   res/values-es/strings.xml 906ed79bc0a58d6aaaf5ff7f8eec80ad2f3c741d 
>   res/values-fi/strings.xml ca4b1441113d11cc6c72e8b5fb9489d95d5bc1f7 
>   res/values-fr/strings.xml 3711e79c0c8736eb2398fcd6883780d3ed8d39cb 
>   res/values-gl/strings.xml PRE-CREATION 
>   res/values-hu/strings.xml c64e740960bcb0b4da1644c6de72c74bbfc86bc1 
>   res/values-it/strings.xml 0df5fefe3790133ac8b812c2f17b0e96c63e127f 
>   res/values-ko/strings.xml 84ab3629b097e83539153803cc7a84fc18f5e42a 
>   res/values-nl/strings.xml eb631ec0a9bf58b5fe4badcd5ffb5ec4edddf991 
>   res/values-pl/strings.xml d69fc9fd2c41b1c1fc6c3364205a42f85cba7692 
>   res/values-pt-rBR/strings.xml 8dfe5ac8a87e4bbf87ff233415bde69aaa277f8d 
>   res/values-pt/strings.xml a6ed2ce2def65e3fb018db82c2409d35833349d0 
>   res/values-ro/strings.xml 6b222fb874789f8062bade358e9ee61c31a70431 
>   res/values-ru/strings.xml 557d98dc69dc61411c2fc8896d897a6378747708 
>   res/values-sk/strings.xml e7d5ef0004c12d422e34c171de8f0533edef9f91 
>   res/values-sv/strings.xml 7fac1b65b7ca3eb532c0e46eb04a3a1bef2a9fe8 
>   res/values-uk/strings.xml c47014eb9a4f2b4e4445cf96e61a3378a9885862 
>   res/values-v11/styles.xml 4460dcfb31e13375032816f7733e3e6eb6a7c5d8 
>   res/values-w820dp/dimens.xml PRE-CREATION 
>   res/values-zh-rCN/strings.xml PRE-CREATION 
>   res/values/strings.xml c4d16a4df8a9c0b8517b3d18031580254b539dba 
>   res/values/styles.xml bf65b141c926227b9d05c2232545a0f0c55d6be8 
>   res/xml/general_preferences.xml d6759ecc50eaa048383fd2f83cfdc7b6851c5db5 
>   res/xml/plugin_mousepad_preferences.xml  
>   res/xml/plugin_mpris_preferences.xml  
>   res/xml/plugin_share_preferences.xml  
>   src/org/kde/kdeconnect/Backends/BaseLink.java 579a7af40d0e113079747d15b307b39e99d219a9 
>   src/org/kde/kdeconnect/Backends/BaseLinkProvider.java 980aaec68e3780b7617aae491339b0effdc233a3 
>   src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLink.java 16969a2c0c59ead125e202522802fe4ab9463b12 
>   src/org/kde/kdeconnect/Backends/BluetoothBackend/BluetoothLinkProvider.java f440af4f94cd13a63148de29684e47d01069fe23 
>   src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java 2da5922d6e82fa14b89c0a58a8bb5728871854ac 
>   src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java 6295f41c8272691882bf67b53b8f8c9b6cb1169c 
>   src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java add92f85dd663ee11903101d19e806368a491fb4 
>   src/org/kde/kdeconnect/BackgroundService.java 9078d8fcd56ce703c7cd83ff90fc716e96f19955 
>   src/org/kde/kdeconnect/Device.java 4c49af836f1d4ac3eab77568c745394eba9bcd86 
>   src/org/kde/kdeconnect/Helpers/ContactsHelper.java 7569f6e5c696154c540f047a7347b57545fa5595 
>   src/org/kde/kdeconnect/Helpers/DeviceHelper.java e9dd5289409566ede88f7a3040b35670952727e4 
>   src/org/kde/kdeconnect/Helpers/FilesHelper.java 6ed7701f418f39e5d285d97386e5ffcc2a40d52f 
>   src/org/kde/kdeconnect/Helpers/ObjectsHelper.java PRE-CREATION 
>   src/org/kde/kdeconnect/Helpers/StorageHelper.java ff4cd7f17d6d8898f1f8128da06175602b34346a 
>   src/org/kde/kdeconnect/NetworkPackage.java e5a777e0117ff39af67dfb96cd93eec45dd9e6bd 
>   src/org/kde/kdeconnect/Plugins/BatteryPlugin/BatteryPlugin.java b69ee7729c13ce8ae6ab9076e4cfeef3b1f5d210 
>   src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardListener.java 7f6601e3dda47cad2ee2d45599f6c9b9b9d62842 
>   src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardPlugin.java d96857ebe3c361cba3128c1aecb5a7160794a199 
>   src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhoneActivity.java PRE-CREATION 
>   src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhonePlugin.java PRE-CREATION 
>   src/org/kde/kdeconnect/Plugins/MousePadPlugin/KeyInputConnection.java PRE-CREATION 
>   src/org/kde/kdeconnect/Plugins/MousePadPlugin/KeyListenerView.java 7b069cf07db7779a8e12bd042189246205ee1bbf 
>   src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadActivity.java 9e6aab7feb4a614bfdb608480496f8a76bdef730 
>   src/org/kde/kdeconnect/Plugins/MousePadPlugin/MousePadPlugin.java eaf5dbdc89b71af19efb29350f9af6c42923e325 
>   src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisActivity.java 814a39a90fe586a2ceec84750d9cd1a97060699e 
>   src/org/kde/kdeconnect/Plugins/MprisPlugin/MprisPlugin.java f2ebdbac2e277c950fb8faf0cefa1a0b6d1345bc 
>   src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationFilterActivity.java d6fd43f62a99697df4c24fa6357cfdb908b0d6a8 
>   src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationReceiver.java 537412c0492a3db1b60fcd7909f1c054f9519d10 
>   src/org/kde/kdeconnect/Plugins/NotificationsPlugin/NotificationsPlugin.java 2f9ebd242e12225e128c53542facdae12db80e76 
>   src/org/kde/kdeconnect/Plugins/PingPlugin/PingPlugin.java f358a7ccfdd7be752e668075f6254e38cb616644 
>   src/org/kde/kdeconnect/Plugins/Plugin.java d4a1af4560cc64f4826b229cc7f0aab216b2e9f2 
>   src/org/kde/kdeconnect/Plugins/PluginFactory.java 0100690534920636b3db64056ef2211da8af61c0 
>   src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandActivity.java PRE-CREATION 
>   src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandPlugin.java PRE-CREATION 
>   src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpImpl.java ec410609f649fce7182850256bb1bf0e7e125894 
>   src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java 6f3a1d4930cb095bae815b3a4e3729aa674ceebc 
>   src/org/kde/kdeconnect/Plugins/SharePlugin/SendFileActivity.java PRE-CREATION 
>   src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java b1b920aab27fc2eee902e3a25b10f26901c6c4a5 
>   src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java 3c6af4311b21e3aebea8ce88e241fb8b7c48e4f8 
>   src/org/kde/kdeconnect/Plugins/TelepathyPlugin/TelepathyPlugin.java PRE-CREATION 
>   src/org/kde/kdeconnect/Plugins/TelephonyPlugin/TelephonyPlugin.java f578caf99a23e0007fe77d4cfb62a3a4126189a7 
>   src/org/kde/kdeconnect/UserInterface/AppCompatPreferenceActivity.java PRE-CREATION 
>   src/org/kde/kdeconnect/UserInterface/CustomDevicesActivity.java e4e2f13dd53e9b4827ae4b29213f10b52fd7d030 
>   src/org/kde/kdeconnect/UserInterface/DeviceActivity.java 88aa95c7027c07a5a47d132f7bcfe7a9197e4263 
>   src/org/kde/kdeconnect/UserInterface/DeviceFragment.java PRE-CREATION 
>   src/org/kde/kdeconnect/UserInterface/List/ButtonItem.java a972b8ff195c262057e3e36113afacab8c21bd92 
>   src/org/kde/kdeconnect/UserInterface/List/DeviceItem.java 247254b23192d10144a5f322600209025d59827c 
>   src/org/kde/kdeconnect/UserInterface/List/EntryItem.java 2e3e91d32316d94aec1215b17d0e089359574be9 
>   src/org/kde/kdeconnect/UserInterface/List/ListAdapter.java df26194583ab46d8387277a798daf59ae46fa0c5 
>   src/org/kde/kdeconnect/UserInterface/List/SmallEntryItem.java 18d3b1e87d17d41eda61dda300bde0bc76931919 
>   src/org/kde/kdeconnect/UserInterface/List/TextItem.java 884893386cdab4604c0c976060ea4037f1057a83 
>   src/org/kde/kdeconnect/UserInterface/MainActivity.java 99fcddc3c0d17bb4434c483db4625590466520c3 
>   src/org/kde/kdeconnect/UserInterface/MainSettingsActivity.java 587cf947a0ae34be037ef7c126383fe1bec1f0e7 
>   src/org/kde/kdeconnect/UserInterface/MaterialActivity.java PRE-CREATION 
>   src/org/kde/kdeconnect/UserInterface/PairActivity.java 51c5a31dbb4840eee0c9ec5ea1b45a9de2341eda 
>   src/org/kde/kdeconnect/UserInterface/PairingFragment.java PRE-CREATION 
>   src/org/kde/kdeconnect/UserInterface/PluginPreference.java PRE-CREATION 
>   src/org/kde/kdeconnect/UserInterface/PluginSettingsActivity.java f359056f0e3e01f83b0f31199de8d84ae9f7374a 
>   src/org/kde/kdeconnect/UserInterface/SettingsActivity.java e1eeeef7f3d9647967459808603abe7dbf1b0f29 
>   store/header.png 43fc1ba1f9cb89168e8df6a5384855338f9fddf3 
>   store/header.xcf PRE-CREATION 
>   store/icon.png PRE-CREATION 
>   store/screen1.png PRE-CREATION 
>   store/screen2.png PRE-CREATION 
>   store/screen3.png PRE-CREATION 
>   store/screen4.png PRE-CREATION 
>   store/screen5.png PRE-CREATION 
>   tests/org/kde/kdeconnect/DeviceTest.java PRE-CREATION 
>   tests/org/kde/kdeconnect/LanLinkProviderTest.java PRE-CREATION 
>   tests/org/kde/kdeconnect/LanLinkTest.java PRE-CREATION 
>   tests/org/kde/kdeconnect/NetworkPackageTest.java PRE-CREATION 
> 
> Diff: https://git.reviewboard.kde.org/r/126188/diff/
> 
> 
> Testing
> -------
> 
> Works after making the following change (needs to be made on master branch):
> 
> ```diff
> --- a/src/org/kde/kdeconnect/Device.java
> +++ b/src/org/kde/kdeconnect/Device.java
> @@ -440,7 +440,7 @@ public class Device implements BaseLink.PackageReceiver {
>          link.addPackageReceiver(this);
>  
>          if (links.size() == 1) {
> -            incomingCapabilities = identityPackage.getStringList("IncomingCapabilties");
> +            incomingCapabilities = identityPackage.getStringList("IncomingCapabilities");
>              outgoingCapabilities = identityPackage.getStringList("OutgoingCapabilities");
>              reloadPluginsFromSettings();
>          }
> ```
> 
> 
> Thanks,
> 
> Saikrishna Arcot
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdeconnect/attachments/20151128/a36d36f9/attachment-0001.html>

More information about the KDEConnect mailing list