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

SmsBuffer: add push helper function to factorize code

Browse Source
This commit is contained in:
Loic Blot 2017-09-04 20:26:14 +02:00
parent d950fc73ed
commit ebfd1ccfbf
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/fr/unix_experience/owncloud_sms/engine/AndroidSmsFetcher.java
View File

@ -56,15 +56,7 @@ public class AndroidSmsFetcher {
// Mailbox ID is required by server // Mailbox ID is required by server
entry.put("mbox", mbID.ordinal()); entry.put("mbox", mbID.ordinal());
smsBuffer.push(mbID, entry);
smsBuffer.push(entry.getInt("_id"),
mbID.ordinal(),
entry.getInt("type"),
entry.getLong("date"),
entry.getString("address"),
entry.getString("body"),
entry.getString("read"),
entry.getString("seen"));
} catch (JSONException e) { } catch (JSONException e) {
Log.e(AndroidSmsFetcher.TAG, "JSON Exception when reading SMS Mailbox", e); Log.e(AndroidSmsFetcher.TAG, "JSON Exception when reading SMS Mailbox", e);
@ -130,15 +122,7 @@ public class AndroidSmsFetcher {
* aren't indexed in the same mean * aren't indexed in the same mean
*/ */
entry.put("mbox", (mboxId - 1)); entry.put("mbox", (mboxId - 1));
results.push(mbID, entry);
results.push(entry.getInt("_id"),
mbID.ordinal(),
entry.getInt("type"),
entry.getLong("date"),
entry.getString("address"),
entry.getString("body"),
entry.getString("read"),
entry.getString("seen"));
} catch (JSONException e) { } catch (JSONException e) {
Log.e(AndroidSmsFetcher.TAG, "JSON Exception when reading SMS Mailbox", e); Log.e(AndroidSmsFetcher.TAG, "JSON Exception when reading SMS Mailbox", e);
} }

16
src/main/java/fr/unix_experience/owncloud_sms/jni/SmsBuffer.java
View File

@ -1,5 +1,10 @@
package fr.unix_experience.owncloud_sms.jni; package fr.unix_experience.owncloud_sms.jni;
import org.json.JSONException;
import org.json.JSONObject;
import fr.unix_experience.owncloud_sms.enums.MailboxID;
/** /**
* Copyright (c) 2014-2017, Loic Blot <loic.blot@unix-experience.fr> * Copyright (c) 2014-2017, Loic Blot <loic.blot@unix-experience.fr>
* *
@ -43,6 +48,17 @@ public class SmsBuffer {
public native void print(); public native void print();
public native String asRawJsonString(); public native String asRawJsonString();
public void push (MailboxID mbid, JSONObject jsonObject) throws JSONException {
push(jsonObject.getInt("_id"),
mbid.ordinal(),
jsonObject.getInt("type"),
jsonObject.getLong("date"),
jsonObject.getString("address"),
jsonObject.getString("body"),
jsonObject.getString("read"),
jsonObject.getString("seen"));
}
public void clear() { public void clear() {
if (mHandle == 0) { if (mHandle == 0) {
return; return;