forked from upstream-mirrors/quik
Merge branch 'master' into block-senders
This commit is contained in:
@@ -95,8 +95,6 @@ public class SmsHelper {
|
|||||||
private static final String TAG = "SMSHelper";
|
private static final String TAG = "SMSHelper";
|
||||||
private static SmsManager sms;
|
private static SmsManager sms;
|
||||||
|
|
||||||
private static Cursor cursor;
|
|
||||||
|
|
||||||
private static Settings sendSettings;
|
private static Settings sendSettings;
|
||||||
|
|
||||||
public SmsHelper() {
|
public SmsHelper() {
|
||||||
@@ -157,11 +155,6 @@ public class SmsHelper {
|
|||||||
|
|
||||||
private static String[] sNoSubjectStrings;
|
private static String[] sNoSubjectStrings;
|
||||||
|
|
||||||
public static long getLastThreadId(Context context) {
|
|
||||||
Cursor cursor = context.getContentResolver().query(SmsHelper.RECEIVED_MESSAGE_CONTENT_PROVIDER, new String[]{COLUMN_ID}, null, null, "date DESC");
|
|
||||||
return (cursor != null && cursor.moveToFirst()) ? cursor.getLong(0) : 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void markSmsSeen(Context context) {
|
public static void markSmsSeen(Context context) {
|
||||||
Cursor cursor = context.getContentResolver().query(RECEIVED_MESSAGE_CONTENT_PROVIDER,
|
Cursor cursor = context.getContentResolver().query(RECEIVED_MESSAGE_CONTENT_PROVIDER,
|
||||||
new String[]{SmsHelper.COLUMN_ID}, SmsHelper.UNSEEN_SELECTION + " AND " + SmsHelper.UNREAD_SELECTION, null, null);
|
new String[]{SmsHelper.COLUMN_ID}, SmsHelper.UNSEEN_SELECTION + " AND " + SmsHelper.UNREAD_SELECTION, null, null);
|
||||||
@@ -290,7 +283,7 @@ public class SmsHelper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static int getUnseenSMSCount(Context context, long threadId) {
|
public static int getUnseenSMSCount(Context context, long threadId) {
|
||||||
|
Cursor cursor = null;
|
||||||
int count = 0;
|
int count = 0;
|
||||||
String selection = UNSEEN_SELECTION + " AND " + UNREAD_SELECTION + (threadId == 0 ? "" : " AND " + COLUMN_THREAD_ID + " = " + threadId);
|
String selection = UNSEEN_SELECTION + " AND " + UNREAD_SELECTION + (threadId == 0 ? "" : " AND " + COLUMN_THREAD_ID + " = " + threadId);
|
||||||
|
|
||||||
@@ -301,7 +294,9 @@ public class SmsHelper {
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
} finally {
|
} finally {
|
||||||
cursor.close();
|
if (cursor != null) {
|
||||||
|
cursor.close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return count;
|
return count;
|
||||||
@@ -314,6 +309,7 @@ public class SmsHelper {
|
|||||||
*/
|
*/
|
||||||
public static String getHistoryForWearable(Context context, String name, long threadId) {
|
public static String getHistoryForWearable(Context context, String name, long threadId) {
|
||||||
final String me = context.getString(R.string.me);
|
final String me = context.getString(R.string.me);
|
||||||
|
Cursor cursor = null;
|
||||||
StringBuilder builder = new StringBuilder();
|
StringBuilder builder = new StringBuilder();
|
||||||
MessageColumns.ColumnsMap map = new MessageColumns.ColumnsMap();
|
MessageColumns.ColumnsMap map = new MessageColumns.ColumnsMap();
|
||||||
|
|
||||||
@@ -432,6 +428,7 @@ public class SmsHelper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static long getThreadId(Context context, String address) {
|
public static long getThreadId(Context context, String address) {
|
||||||
|
Cursor cursor = null;
|
||||||
long threadId = 0;
|
long threadId = 0;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -440,67 +437,13 @@ public class SmsHelper {
|
|||||||
threadId = cursor.getLong(cursor.getColumnIndexOrThrow(COLUMN_THREAD_ID));
|
threadId = cursor.getLong(cursor.getColumnIndexOrThrow(COLUMN_THREAD_ID));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
|
||||||
|
|
||||||
return threadId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static long getLastSentThreadId(Context context) {
|
|
||||||
long threadId = 0;
|
|
||||||
|
|
||||||
try {
|
|
||||||
cursor = context.getContentResolver().query(SENT_MESSAGE_CONTENT_PROVIDER, new String[]{COLUMN_THREAD_ID}, null, null, sortDateDesc);
|
|
||||||
cursor.moveToFirst();
|
|
||||||
threadId = cursor.getLong(cursor.getColumnIndexOrThrow(COLUMN_THREAD_ID));
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
return threadId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static List<String> getUnseenMessageNames(Context context) {
|
|
||||||
List<Message> messages = getUnseenMessages(context);
|
|
||||||
List<String> names = new ArrayList<>();
|
|
||||||
|
|
||||||
for (int i = 0; i < messages.size(); i++) {
|
|
||||||
if (!names.contains(messages.get(i).getName()))
|
|
||||||
names.add(messages.get(i).getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
return names;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getUnseenMessageText(Context context, boolean names) {
|
|
||||||
List<Message> messages = getUnseenMessages(context);
|
|
||||||
String s = "";
|
|
||||||
|
|
||||||
for (Message message : messages) {
|
|
||||||
if (names) s += message.getName() + ": ";
|
|
||||||
s += message.getBody() + "\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
return s.substring(0, s.length() - 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static List<Message> getUnseenMessages(Context context) {
|
|
||||||
|
|
||||||
List<Message> messages = new ArrayList<>();
|
|
||||||
|
|
||||||
try {
|
|
||||||
cursor = context.getContentResolver().query(RECEIVED_MESSAGE_CONTENT_PROVIDER, new String[]{COLUMN_ID}, UNSEEN_SELECTION + " AND " + UNREAD_SELECTION, null, sortDateDesc);
|
|
||||||
cursor.moveToFirst();
|
|
||||||
for (int i = 0; i < cursor.getCount(); i++) {
|
|
||||||
messages.add(new Message(context, cursor.getLong(cursor.getColumnIndexOrThrow(COLUMN_ID))));
|
|
||||||
cursor.moveToNext();
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
} finally {
|
} finally {
|
||||||
cursor.close();
|
if (cursor != null) {
|
||||||
|
cursor.close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return messages;
|
return threadId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getUnreadMessageCount(Context context) {
|
public static int getUnreadMessageCount(Context context) {
|
||||||
@@ -519,11 +462,13 @@ public class SmsHelper {
|
|||||||
} while (conversationCursor.moveToNext());
|
} while (conversationCursor.moveToNext());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
conversationCursor.close();
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<Message> getFailedMessages(Context context) {
|
public static List<Message> getFailedMessages(Context context) {
|
||||||
|
Cursor cursor = null;
|
||||||
List<Message> messages = new ArrayList<>();
|
List<Message> messages = new ArrayList<>();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -536,16 +481,17 @@ public class SmsHelper {
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
} finally {
|
} finally {
|
||||||
cursor.close();
|
if (cursor != null) {
|
||||||
|
cursor.close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return messages;
|
return messages;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<Message> deleteFailedMessages(Context context, long threadId) {
|
public static List<Message> deleteFailedMessages(Context context, long threadId) {
|
||||||
|
|
||||||
Log.d(TAG, "Deleting failed messages");
|
Log.d(TAG, "Deleting failed messages");
|
||||||
|
Cursor cursor = null;
|
||||||
List<Message> messages = new ArrayList<>();
|
List<Message> messages = new ArrayList<>();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -558,12 +504,13 @@ public class SmsHelper {
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
} finally {
|
} finally {
|
||||||
cursor.close();
|
if (cursor != null) {
|
||||||
|
cursor.close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (Message m : messages)
|
for (Message m : messages) {
|
||||||
{
|
if (m.getThreadId() == threadId) {
|
||||||
if(m.getThreadId() == threadId) {
|
|
||||||
Log.d(TAG, "Deleting failed message to " + m.getName() + "\n Body: " + m.getBody());
|
Log.d(TAG, "Deleting failed message to " + m.getName() + "\n Body: " + m.getBody());
|
||||||
m.delete();
|
m.delete();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user