mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-01 06:35:09 +00:00
Code Issues Releases Wiki Activity

Fix duplicated addresses

Browse Source
This commit is contained in:
Simon Redman
2020-01-19 12:59:11 -08:00
parent 3dc171632c
commit 0d69c0b96c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/org/kde/kdeconnect/Helpers/SMSHelper.java
View File

@@ -46,6 +46,7 @@ import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -536,6 +537,8 @@ public class SMSHelper {
* Get the address(es) of an MMS message * Get the address(es) of an MMS message
* Original implementation from https://stackoverflow.com/a/6446831/3723163 * Original implementation from https://stackoverflow.com/a/6446831/3723163
* *
* The message at the first position of the list should be the sender of the message
*
* @param messageID ID of this message in the MMS database for looking up the remaining info * @param messageID ID of this message in the MMS database for looking up the remaining info
* @param userPhoneNumbers List of phone numbers which should be removed from the list of addresses * @param userPhoneNumbers List of phone numbers which should be removed from the list of addresses
*/ */
@@ -555,7 +558,8 @@ public class SMSHelper {
String selection = Telephony.Mms.Addr.MSG_ID + " = ?"; String selection = Telephony.Mms.Addr.MSG_ID + " = ?";
String[] selectionArgs = {messageID.toString()}; String[] selectionArgs = {messageID.toString()};
List<Address> addresses = new ArrayList<>(); // Keep an ordered set rather than a list because Android sometimes throws duplicates at us
Set<Address> addresses = new LinkedHashSet<>();
try (Cursor addrCursor = context.getContentResolver().query( try (Cursor addrCursor = context.getContentResolver().query(
uri, uri,
@@ -704,6 +708,11 @@ public class SMSHelper {
} }
return false; return false;
} }
@Override
public int hashCode() {
return this.address.hashCode();
}
} }
/** /**