flywithu/ownCloud-SMS-App
1
0
Fork 0
mirror of https://github.com/nerzhul/ownCloud-SMS-App.git synced 2025-06-08 00:16:09 +00:00
Code Issues Releases Wiki Activity

Abort sync process earlier when no account is available

Browse Source
This commit is contained in:
Loic Blot 2015-08-30 10:28:57 +02:00
parent f7dcb8e51c
commit cc14488a88
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/fr/unix_experience/owncloud_sms/broadcast_receivers/ConnectivityChanged.java
View File

@ -19,10 +19,14 @@ package fr.unix_experience.owncloud_sms.broadcast_receivers;
import org.json.JSONArray; import org.json.JSONArray;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.util.Log; import android.util.Log;
import fr.unix_experience.owncloud_sms.R;
import fr.unix_experience.owncloud_sms.engine.ASyncSMSSync; import fr.unix_experience.owncloud_sms.engine.ASyncSMSSync;
import fr.unix_experience.owncloud_sms.engine.ConnectivityMonitor; import fr.unix_experience.owncloud_sms.engine.ConnectivityMonitor;
import fr.unix_experience.owncloud_sms.engine.SmsFetcher; import fr.unix_experience.owncloud_sms.engine.SmsFetcher;
@ -32,6 +36,13 @@ public class ConnectivityChanged extends BroadcastReceiver implements ASyncSMSSy
@Override @Override
public void onReceive(final Context context, final Intent intent) { public void onReceive(final Context context, final Intent intent) {
// No account: abort
final Account[] myAccountList = AccountManager.get(context).
getAccountsByType(context.getString(R.string.account_type));
if (myAccountList.length == 0) {
return;
}
final ConnectivityMonitor cMon = new ConnectivityMonitor(context); final ConnectivityMonitor cMon = new ConnectivityMonitor(context);
final OCSMSSharedPrefs prefs = new OCSMSSharedPrefs(context); final OCSMSSharedPrefs prefs = new OCSMSSharedPrefs(context);
@ -55,6 +66,7 @@ public class ConnectivityChanged extends BroadcastReceiver implements ASyncSMSSy
} }
private void checkMessagesAndSend(final Context context) { private void checkMessagesAndSend(final Context context) {
// Get last message synced from preferences // Get last message synced from preferences
final Long lastMessageSynced = (new OCSMSSharedPrefs(context)).getLastMessageDate(); final Long lastMessageSynced = (new OCSMSSharedPrefs(context)).getLastMessageDate();
Log.d(TAG,"Synced Last:" + lastMessageSynced); Log.d(TAG,"Synced Last:" + lastMessageSynced);

6
src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncSMSSync.java
View File

@ -38,12 +38,12 @@ public interface ASyncSMSSync {
@Override @Override
protected Void doInBackground(final Void... params) { protected Void doInBackground(final Void... params) {
final OCSMSNotificationManager nMgr = new OCSMSNotificationManager(_context);
// Get ownCloud SMS account list // Get ownCloud SMS account list
final AccountManager _accountMgr = AccountManager.get(_context); final AccountManager _accountMgr = AccountManager.get(_context);
final Account[] myAccountList = _accountMgr.getAccountsByType(_context.getString(R.string.account_type)); final Account[] myAccountList = _accountMgr.getAccountsByType(_context.getString(R.string.account_type));
// Notify that we are syncing SMS
final OCSMSNotificationManager nMgr = new OCSMSNotificationManager(_context);
for (final Account element : myAccountList) { for (final Account element : myAccountList) {
final Uri serverURI = Uri.parse(_accountMgr.getUserData(element, "ocURI")); final Uri serverURI = Uri.parse(_accountMgr.getUserData(element, "ocURI"));

11
src/main/java/fr/unix_experience/owncloud_sms/observers/SmsObserver.java
View File

@ -19,11 +19,15 @@ package fr.unix_experience.owncloud_sms.observers;
import org.json.JSONArray; import org.json.JSONArray;
import fr.unix_experience.owncloud_sms.R;
import fr.unix_experience.owncloud_sms.engine.ASyncSMSSync; import fr.unix_experience.owncloud_sms.engine.ASyncSMSSync;
import fr.unix_experience.owncloud_sms.engine.ConnectivityMonitor; import fr.unix_experience.owncloud_sms.engine.ConnectivityMonitor;
import fr.unix_experience.owncloud_sms.engine.OCSMSOwnCloudClient; import fr.unix_experience.owncloud_sms.engine.OCSMSOwnCloudClient;
import fr.unix_experience.owncloud_sms.engine.SmsFetcher; import fr.unix_experience.owncloud_sms.engine.SmsFetcher;
import fr.unix_experience.owncloud_sms.enums.MailboxID; import fr.unix_experience.owncloud_sms.enums.MailboxID;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.content.Context; import android.content.Context;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.os.Handler; import android.os.Handler;
@ -43,6 +47,13 @@ public class SmsObserver extends ContentObserver implements ASyncSMSSync {
public void onChange(boolean selfChange) { public void onChange(boolean selfChange) {
super.onChange(selfChange); super.onChange(selfChange);
Log.d(TAG, "onChange SmsObserver"); Log.d(TAG, "onChange SmsObserver");
// No account, abort
final Account[] myAccountList = AccountManager.get(_context).
getAccountsByType(_context.getString(R.string.account_type));
if (myAccountList.length == 0) {
return;
}
SmsFetcher fetcher = new SmsFetcher(_context); SmsFetcher fetcher = new SmsFetcher(_context);
JSONArray smsList = fetcher.getLastMessage(MailboxID.ALL); JSONArray smsList = fetcher.getLastMessage(MailboxID.ALL);