am 55470710: Replace use of SharedPreference commit() with apply().
Merge commit '55470710c2624bde2aa56275d29b60055638c06c' into gingerbread-plus-aosp
* commit '55470710c2624bde2aa56275d29b60055638c06c':
Replace use of SharedPreference commit() with apply().
diff --git a/src/com/android/bluetooth/opp/BluetoothOppManager.java b/src/com/android/bluetooth/opp/BluetoothOppManager.java
index 73411d9..e3a2b01 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppManager.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppManager.java
@@ -69,11 +69,11 @@
private BluetoothAdapter mAdapter;
- private String mMimeTypeOfSendigFile;
+ private String mMimeTypeOfSendingFile;
private String mUriOfSendingFile;
- private String mMimeTypeOfSendigFiles;
+ private String mMimeTypeOfSendingFiles;
private ArrayList<Uri> mUrisOfSendingFiles;
@@ -148,13 +148,13 @@
// All member vars are not initialized till now
mSendingFlag = settings.getBoolean(SENDING_FLAG, false);
- mMimeTypeOfSendigFile = settings.getString(MIME_TYPE, null);
+ mMimeTypeOfSendingFile = settings.getString(MIME_TYPE, null);
mUriOfSendingFile = settings.getString(FILE_URI, null);
- mMimeTypeOfSendigFiles = settings.getString(MIME_TYPE_MULTIPLE, null);
+ mMimeTypeOfSendingFiles = settings.getString(MIME_TYPE_MULTIPLE, null);
mMultipleFlag = settings.getBoolean(MULTIPLE_FLAG, false);
if (V) Log.v(TAG, "restoreApplicationData! " + mSendingFlag + mMultipleFlag
- + mMimeTypeOfSendigFile + mUriOfSendingFile);
+ + mMimeTypeOfSendingFile + mUriOfSendingFile);
String strUris = settings.getString(FILE_URIS, null);
mUrisOfSendingFiles = new ArrayList<Uri>();
@@ -166,7 +166,7 @@
}
}
- mContext.getSharedPreferences(OPP_PREFERENCE_FILE, 0).edit().clear().commit();
+ mContext.getSharedPreferences(OPP_PREFERENCE_FILE, 0).edit().clear().apply();
}
/**
@@ -175,10 +175,10 @@
private void storeApplicationData() {
SharedPreferences.Editor editor = mContext.getSharedPreferences(OPP_PREFERENCE_FILE, 0)
.edit();
- editor.putBoolean(SENDING_FLAG, mSendingFlag).commit();
- editor.putBoolean(MULTIPLE_FLAG, mMultipleFlag).commit();
+ editor.putBoolean(SENDING_FLAG, mSendingFlag);
+ editor.putBoolean(MULTIPLE_FLAG, mMultipleFlag);
if (mMultipleFlag) {
- editor.putString(MIME_TYPE_MULTIPLE, mMimeTypeOfSendigFiles).commit();
+ editor.putString(MIME_TYPE_MULTIPLE, mMimeTypeOfSendingFiles);
StringBuilder sb = new StringBuilder();
for (int i = 0, count = mUrisOfSendingFiles.size(); i < count; i++) {
Uri uriContent = mUrisOfSendingFiles.get(i);
@@ -186,24 +186,25 @@
sb.append(ARRAYLIST_ITEM_SEPERATOR);
}
String strUris = sb.toString();
- editor.putString(FILE_URIS, strUris).commit();
+ editor.putString(FILE_URIS, strUris);
- editor.remove(MIME_TYPE).commit();
- editor.remove(FILE_URI).commit();
+ editor.remove(MIME_TYPE);
+ editor.remove(FILE_URI);
} else {
- editor.putString(MIME_TYPE, mMimeTypeOfSendigFile).commit();
- editor.putString(FILE_URI, mUriOfSendingFile).commit();
+ editor.putString(MIME_TYPE, mMimeTypeOfSendingFile);
+ editor.putString(FILE_URI, mUriOfSendingFile);
- editor.remove(MIME_TYPE_MULTIPLE).commit();
- editor.remove(FILE_URIS).commit();
+ editor.remove(MIME_TYPE_MULTIPLE);
+ editor.remove(FILE_URIS);
}
+ editor.apply();
if (V) Log.v(TAG, "Application data stored to SharedPreference! ");
}
public void saveSendingFileInfo(String mimeType, String uri) {
synchronized (BluetoothOppManager.this) {
mMultipleFlag = false;
- mMimeTypeOfSendigFile = mimeType;
+ mMimeTypeOfSendingFile = mimeType;
mUriOfSendingFile = uri;
storeApplicationData();
}
@@ -212,7 +213,7 @@
public void saveSendingFileInfo(String mimeType, ArrayList<Uri> uris) {
synchronized (BluetoothOppManager.this) {
mMultipleFlag = true;
- mMimeTypeOfSendigFiles = mimeType;
+ mMimeTypeOfSendingFiles = mimeType;
mUrisOfSendingFiles = uris;
storeApplicationData();
}
@@ -293,8 +294,8 @@
return;
}
- insertThread = new InsertShareInfoThread(device, mMultipleFlag, mMimeTypeOfSendigFile,
- mUriOfSendingFile, mMimeTypeOfSendigFiles, mUrisOfSendingFiles);
+ insertThread = new InsertShareInfoThread(device, mMultipleFlag, mMimeTypeOfSendingFile,
+ mUriOfSendingFile, mMimeTypeOfSendingFiles, mUrisOfSendingFiles);
if (mMultipleFlag) {
mfileNumInBatch = mUrisOfSendingFiles.size();
}
diff --git a/src/com/android/bluetooth/opp/BluetoothOppPreference.java b/src/com/android/bluetooth/opp/BluetoothOppPreference.java
index 7874222..604453a 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppPreference.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppPreference.java
@@ -130,7 +130,7 @@
if (!name.equals(getName(remoteDevice))) {
Editor ed = mNamePreference.edit();
ed.putString(remoteDevice.getAddress(), name);
- ed.commit();
+ ed.apply();
mNames.put(remoteDevice.getAddress(), name);
}
}
@@ -142,7 +142,7 @@
String key = getChannelKey(remoteDevice, uuid);
Editor ed = mChannelPreference.edit();
ed.putInt(key, channel);
- ed.commit();
+ ed.apply();
mChannels.put(key, channel);
}
}
@@ -151,7 +151,7 @@
String key = getChannelKey(remoteDevice, uuid);
Editor ed = mChannelPreference.edit();
ed.remove(key);
- ed.commit();
+ ed.apply();
mChannels.remove(key);
}