flywithu/ownCloud-SMS-App
1
0
Fork 0
mirror of https://github.com/nerzhul/ownCloud-SMS-App.git synced 2025-10-31 02:17:53 +00:00
Code Issues Releases Wiki Activity

SmsFetcher: do the cursor checks directly in SmsDataProviderAPI

Browse Source
This commit is contained in:
Loic Blot 2016-11-02 08:09:06 +01:00
parent 8212ef63aa
commit 8395ac5bb4
2 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/fr/unix_experience/owncloud_sms/engine/SmsFetcher.java
View File

@ -63,16 +63,6 @@ public class SmsFetcher {
return; return;
} }
if (c.getCount() == 0) {
c.close();
return;
}
if (!c.moveToFirst()) {
c.close();
return;
}
// Reading mailbox // Reading mailbox
do { do {
JSONObject entry = new JSONObject(); JSONObject entry = new JSONObject();
@ -108,18 +98,6 @@ public class SmsFetcher {
return null; return null;
} }
// or for a reason count returns zero value
if (c.getCount() == 0) {
c.close();
return null;
}
// If no first message into cursor
if (!c.moveToFirst()) {
c.close();
return null;
}
// We create a list of strings to store results // We create a list of strings to store results
JSONArray results = new JSONArray(); JSONArray results = new JSONArray();
JSONObject entry = new JSONObject(); JSONObject entry = new JSONObject();
@ -169,20 +147,6 @@ public class SmsFetcher {
Log.i(SmsFetcher.TAG, "Retrieved " + c.getCount() + " messages."); Log.i(SmsFetcher.TAG, "Retrieved " + c.getCount() + " messages.");
} else { } else {
Log.i(SmsFetcher.TAG, "No message retrieved."); Log.i(SmsFetcher.TAG, "No message retrieved.");
}
if (c == null) {
return;
}
if (c.getCount() == 0) {
c.close();
return;
}
// Reading mailbox
if (!c.moveToFirst()) {
c.close();
return; return;
} }

17
src/main/java/fr/unix_experience/owncloud_sms/providers/SmsDataProvider.java
View File

@ -117,7 +117,22 @@ public class SmsDataProvider extends ContentProvider {
Log.i(SmsDataProvider.TAG, "query: selection set to " + selection); Log.i(SmsDataProvider.TAG, "query: selection set to " + selection);
return _context.getContentResolver().query(uri, projection, selection, selectionArgs, sortOrder); Cursor cursor = _context.getContentResolver().query(uri, projection, selection, selectionArgs, sortOrder);
if (cursor == null) {
return null;
}
if (cursor.getCount() == 0) {
cursor.close();
return null;
}
if (!cursor.moveToFirst()) {
cursor.close();
return null;
}
return cursor;
} }
@Override @Override