summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-09-16 21:48:53 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-09-16 21:48:53 +0200
commitced907e70130d8962db60ca9f42f140ec7a902b1 (patch)
tree9510a3dc978bf7228e2163536581af2e76089f55
parent70f2c74078e5bf585911db172dcb28568870f8b9 (diff)
sdremote: use apply() instead of commit() to store properties
so android can do that in the background, we don't need them stored immediately. Also remove some redundant static modifier from enums Change-Id: I9e3755e601172c45c14d74db23810432dc582bfb
-rw-r--r--android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java2
-rw-r--r--android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SlideShowActivity.java2
-rw-r--r--android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/Server.java4
-rw-r--r--android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java2
-rw-r--r--android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputersFragment.java2
-rw-r--r--android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/util/Preferences.java6
6 files changed, 9 insertions, 9 deletions
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java
index 9f9696d..103b4a7 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java
@@ -176,7 +176,7 @@ public class ComputersActivity extends ActionBarActivity implements ActionBar.Ta
SharedPreferences.Editor editor = sharedPref.edit();
editor.putBoolean(SELECT_BLUETOOTH, btTab.equals(getSupportActionBar()
.getSelectedTab()));
- editor.commit();
+ editor.apply();
}
@Override
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SlideShowActivity.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SlideShowActivity.java
index 3322732..ed66719 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SlideShowActivity.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/SlideShowActivity.java
@@ -44,7 +44,7 @@ import org.libreoffice.impressremote.util.Preferences;
import org.libreoffice.impressremote.util.SavedStates;
public class SlideShowActivity extends ActionBarActivity implements ServiceConnection {
- public static enum Mode {
+ public enum Mode {
PAGER, GRID, EMPTY, STARTPOINTER, STOPPOINTER
}
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/Server.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/Server.java
index 4053c4f..993d47a 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/Server.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/communication/Server.java
@@ -15,11 +15,11 @@ import android.text.TextUtils;
public class Server implements Parcelable {
private static final int SPECIAL_PARCELABLE_OBJECTS_BITMASK = 0;
- public static enum Protocol {
+ public enum Protocol {
TCP, BLUETOOTH
}
- public static enum Type {
+ public enum Type {
COMPUTER, PHONE, UNDEFINED
}
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
index c2adf4b..7665182 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java
@@ -35,7 +35,7 @@ import org.libreoffice.impressremote.communication.Server;
import org.libreoffice.impressremote.util.SavedStates;
public class ComputerConnectionFragment extends Fragment implements ServiceConnection {
- public static enum Result {
+ public enum Result {
CONNECTED, NOT_CONNECTED
}
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputersFragment.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputersFragment.java
index 7f35e67..b5f3e54 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputersFragment.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/fragment/ComputersFragment.java
@@ -52,7 +52,7 @@ import org.libreoffice.impressremote.util.SavedStates;
public class ComputersFragment extends ListFragment implements ServiceConnection, Runnable {
private static final int SHOWING_PROGRESS_MESSAGE_DELAY_IN_SECONDS = 3;
- public static enum Type {
+ public enum Type {
WIFI, BLUETOOTH
}
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/util/Preferences.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/util/Preferences.java
index ca5fbae..19539f7 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/util/Preferences.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/util/Preferences.java
@@ -87,15 +87,15 @@ public final class Preferences {
}
public void setInt(String aKey, int aValue) {
- mPreferences.edit().putInt(aKey, aValue).commit();
+ mPreferences.edit().putInt(aKey, aValue).apply();
}
public void setString(String aKey, String aValue) {
- mPreferences.edit().putString(aKey, aValue).commit();
+ mPreferences.edit().putString(aKey, aValue).apply();
}
public void remove(String aKey) {
- mPreferences.edit().remove(aKey).commit();
+ mPreferences.edit().remove(aKey).apply();
}
}