Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1182270 - Pre: AccountPickler public interface synchronized to avoid race condition r=nalexander.

Browse Source 
--HG--
extra : commitid : KT2pXglowza
extra : rebase_source : 3e6d86bd674bad411be428e7ffcb3e483de684fe
extra : amend_source : e0900f039707f0c61f65335a76c284862e0d8d78
This commit is contained in:
vivek 2015-07-16 00:24:37 +03:00
parent 50aa4930d9
commit 074d27e765
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/fxa/FirefoxAccounts.java
View File

@ -129,7 +129,7 @@ public class FirefoxAccounts {
// exist.
final AndroidFxAccount fxAccount =
AccountPickler.unpickle(context, FxAccountConstants.ACCOUNT_PICKLE_FILENAME);
accounts[0] = fxAccount.getAndroidAccount();
accounts[0] = fxAccount != null ? fxAccount.getAndroidAccount() : null;
} finally {
latch.countDown();
}

11
mobile/android/base/fxa/authenticator/AccountPickler.java
View File

@ -80,12 +80,13 @@ public class AccountPickler {
/**
* Remove Firefox account persisted to disk.
* This operation is synchronized to avoid race condition while deleting the account.
*
* @param context Android context.
* @param filename name of persisted pickle file; must not contain path separators.
* @return <code>true</code> if given pickle existed and was successfully deleted.
*/
public static boolean deletePickle(final Context context, final String filename) {
public synchronized static boolean deletePickle(final Context context, final String filename) {
return context.deleteFile(filename);
}
@ -122,11 +123,12 @@ public class AccountPickler {
/**
* Persist Firefox account to disk as a JSON object.
* This operation is synchronized to avoid race condition while deleting the account.
*
* @param AndroidFxAccount the account to persist to disk
* @param account the AndroidFxAccount to persist to disk
* @param filename name of file to persist to; must not contain path separators.
*/
public static void pickle(final AndroidFxAccount account, final String filename) {
public synchronized static void pickle(final AndroidFxAccount account, final String filename) {
final ExtendedJSONObject o = toJSON(account, System.currentTimeMillis());
writeToDisk(account.context, filename, o);
}
@ -155,6 +157,7 @@ public class AccountPickler {
/**
* Create Android account from saved JSON object. Assumes that an account does not exist.
* This operation is synchronized to avoid race condition while deleting the account.
*
* @param context
* Android context.
@ -162,7 +165,7 @@ public class AccountPickler {
* name of file to read from; must not contain path separators.
* @return created Android account, or null on error.
*/
public static AndroidFxAccount unpickle(final Context context, final String filename) {
public synchronized static AndroidFxAccount unpickle(final Context context, final String filename) {
final String jsonString = Utils.readFile(context, filename);
if (jsonString == null) {
Logger.info(LOG_TAG, "Pickle file '" + filename + "' not found; aborting.");