summaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorArtur Dryomov <artur.dryomov@gmail.com>2013-09-13 02:32:24 +0300
committerArtur Dryomov <artur.dryomov@gmail.com>2013-09-13 02:44:01 +0300
commit14a25b343d98d7a4ebf9b6c03b09d1882c71d0b1 (patch)
tree8c2dd013be2c8c1b6ce3df64a76dd8a6b34e5651 /android
parentMove the service binder to a static inner class. (diff)
downloadcore-14a25b343d98d7a4ebf9b6c03b09d1882c71d0b1.tar.gz
core-14a25b343d98d7a4ebf9b6c03b09d1882c71d0b1.zip
Fix minor style issues.
Change-Id: I6c7cfd8c1e0d88ad99f5e2ca15758eab033ec50c
Diffstat (limited to 'android')
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java2
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java5
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/communication/Server.java2
-rw-r--r--android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java16
4 files changed, 13 insertions, 12 deletions
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
index 605e0a9579bf..2dbb6e6f713a 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java
@@ -96,7 +96,7 @@ class BluetoothServersFinder extends BroadcastReceiver implements ServersFinder,
private void startDiscoveryDelayed() {
// Start discovery again after a small delay.
// Check whether device is on in case the user manually
- // disabled bluetooth
+ // disabled Bluetooth.
if (!BluetoothOperator.getAdapter().isEnabled()) {
return;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
index ea03e5272325..95b54b3ffe9f 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
@@ -69,7 +69,7 @@ public class CommunicationService extends Service implements Runnable, MessagesL
}
@Override
- public IBinder onBind(Intent intent) {
+ public IBinder onBind(Intent aIntent) {
return mBinder;
}
@@ -96,7 +96,8 @@ public class CommunicationService extends Service implements Runnable, MessagesL
public void connectServer(Server aServer) {
mServer = aServer;
- new Thread(this).start();
+ Thread aConnectionThread = new Thread(this);
+ aConnectionThread.start();
}
@Override
diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java b/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
index 4e94b6c9714a..9f1a16b37812 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/communication/Server.java
@@ -22,7 +22,7 @@ public class Server implements Parcelable {
private final String mAddress;
private final String mName;
- public Server(Protocol aProtocol, String aAddress, String aName) {
+ private Server(Protocol aProtocol, String aAddress, String aName) {
this.mProtocol = aProtocol;
this.mAddress = aAddress;
this.mName = aName;
diff --git a/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java b/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java
index d63fdd41ed0a..0a2141b385ad 100644
--- a/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java
+++ b/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java
@@ -77,26 +77,26 @@ public final class Preferences {
return mPreferences.getAll();
}
- public String getString(String aKey) {
- return mPreferences.getString(aKey, Defaults.STRING);
+ public boolean getBoolean(String aKey) {
+ return mPreferences.getBoolean(aKey, Defaults.BOOLEAN);
}
public int getInt(String aKey) {
return mPreferences.getInt(aKey, Defaults.INT);
}
- public void setString(String aKey, String aValue) {
- mPreferences.edit().putString(aKey, aValue).commit();
- }
-
- public boolean getBoolean(String aKey) {
- return mPreferences.getBoolean(aKey, Defaults.BOOLEAN);
+ public String getString(String aKey) {
+ return mPreferences.getString(aKey, Defaults.STRING);
}
public void setInt(String aKey, int aValue) {
mPreferences.edit().putInt(aKey, aValue).commit();
}
+ public void setString(String aKey, String aValue) {
+ mPreferences.edit().putString(aKey, aValue).commit();
+ }
+
public void remove(String aKey) {
mPreferences.edit().remove(aKey).commit();
}