Merge change 7780
* changes: resolved conflicts for Email MessagingController null check from donut to master
This commit is contained in:
commit
d10ffd33de
|
@ -457,6 +457,8 @@ public class MessagingController implements Runnable {
|
|||
try {
|
||||
Store.StoreInfo info = Store.StoreInfo.getStoreInfo(account.getStoreUri(mContext),
|
||||
mContext);
|
||||
// check for null to handle semi-initialized accounts created during unit tests
|
||||
// store info should not be null in production scenarios
|
||||
if (info != null) {
|
||||
LocalStore localStore = (LocalStore) Store.getInstance(
|
||||
account.getLocalStoreUri(mContext), mContext, null);
|
||||
|
|
Loading…
Reference in New Issue