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

Bug 755638 - SecurityException when attempting to sync multiple Fennecs to the same account. r=rnewman

Browse Source
This commit is contained in:
Chenxia Liu 2012-08-16 11:05:57 +02:00
parent fb787e7766
commit 3cd80fb8d6
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/android/base/sync/setup/SyncAccounts.java
View File

@ -413,6 +413,14 @@ public class SyncAccounts {
ContentResolver.setSyncAutomatically(account, authority, syncAutomatically);
}
public static void backgroundSetSyncAutomatically(final Account account, final boolean syncAutomatically) {
ThreadPool.run(new Runnable() {
@Override
public void run() {
setSyncAutomatically(account, syncAutomatically);
}
});
}
/**
* Bug 721760: try to start a vendor-specific Accounts & Sync activity on Moto
* Blur devices.

15
mobile/android/base/sync/syncadapter/SyncAdapter.java
View File

@ -88,6 +88,7 @@ public class SyncAdapter extends AbstractThreadedSyncAdapter implements GlobalSe
/**
* Handle an exception: update stats, invalidate auth token, log errors, etc.
* Wakes up sleeping threads by calling notifyMonitor().
*
* @param globalSession
* current global session, or null.
@ -164,10 +165,18 @@ public class SyncAdapter extends AbstractThreadedSyncAdapter implements GlobalSe
return;
}
// Bug 755638 - Uncaught SecurityException when attempting to sync multiple Fennecs
// to the same Sync account.
// Uncheck Sync checkbox because we cannot sync this instance.
if (e instanceof SecurityException) {
Logger.error(LOG_TAG, "SecurityException, multiple Fennecs. Disabling this instance.", e);
SyncAccounts.backgroundSetSyncAutomatically(localAccount, false);
return;
}
// Generic exception.
Logger.error(LOG_TAG, "Unknown exception. Aborting sync.", e);
} catch (Exception ex) {
Logger.error(LOG_TAG, "Unknown exception. Aborting sync.", e);
} finally {
notifyMonitor();
}
}
@ -345,7 +354,6 @@ public class SyncAdapter extends AbstractThreadedSyncAdapter implements GlobalSe
username, password, prefsPath, serverURL, syncKey);
} catch (Exception e) {
self.processException(null, e);
notifyMonitor();
return;
}
}
@ -479,7 +487,6 @@ public class SyncAdapter extends AbstractThreadedSyncAdapter implements GlobalSe
public void handleError(GlobalSession globalSession, Exception ex) {
Logger.info(LOG_TAG, "GlobalSession indicated error.");
this.processException(globalSession, ex);
notifyMonitor();
}
@Override