diff options
5 files changed, 129 insertions, 49 deletions
diff --git a/src/java/com/android/ims/rcs/uce/eab/EabProvider.java b/src/java/com/android/ims/rcs/uce/eab/EabProvider.java index 60283c22..da70349a 100644 --- a/src/java/com/android/ims/rcs/uce/eab/EabProvider.java +++ b/src/java/com/android/ims/rcs/uce/eab/EabProvider.java @@ -81,7 +81,7 @@ public class EabProvider extends ContentProvider { public static final String AUTHORITY = "eab"; private static final String TAG = "EabProvider"; - private static final int DATABASE_VERSION = 2; + private static final int DATABASE_VERSION = 3; public static final String EAB_CONTACT_TABLE_NAME = "eab_contact"; public static final String EAB_COMMON_TABLE_NAME = "eab_common"; @@ -332,8 +332,6 @@ public class EabProvider extends ContentProvider { static { CONTACT_UNIQUE_FIELDS.add(ContactColumns.PHONE_NUMBER); - - COMMON_UNIQUE_FIELDS.add(EabCommonColumns.EAB_CONTACT_ID); } @VisibleForTesting @@ -356,8 +354,7 @@ public class EabProvider extends ContentProvider { + EabCommonColumns.EAB_CONTACT_ID + " INTEGER DEFAULT -1, " + EabCommonColumns.MECHANISM + " INTEGER DEFAULT NULL, " + EabCommonColumns.REQUEST_RESULT + " INTEGER DEFAULT -1, " - + EabCommonColumns.SUBSCRIPTION_ID + " INTEGER DEFAULT -1, " - + "UNIQUE (" + TextUtils.join(", ", COMMON_UNIQUE_FIELDS) + ")" + + EabCommonColumns.SUBSCRIPTION_ID + " INTEGER DEFAULT -1 " + ");"; @VisibleForTesting @@ -410,6 +407,46 @@ public class EabProvider extends ContentProvider { + ContactColumns.CONTACT_ID + " INTEGER DEFAULT -1;"); oldVersion = 2; } + + if (oldVersion < 3) { + // Drop UNIQUE constraint in EAB_COMMON_TABLE, SQLite didn't support DROP + // constraint, so drop the old one and migrate data to new one + + // Create temp table + final String createTempTableCommand = "CREATE TABLE temp" + + " (" + + EabCommonColumns._ID + " INTEGER PRIMARY KEY, " + + EabCommonColumns.EAB_CONTACT_ID + " INTEGER DEFAULT -1, " + + EabCommonColumns.MECHANISM + " INTEGER DEFAULT NULL, " + + EabCommonColumns.REQUEST_RESULT + " INTEGER DEFAULT -1, " + + EabCommonColumns.SUBSCRIPTION_ID + " INTEGER DEFAULT -1 " + + ");"; + sqLiteDatabase.execSQL(createTempTableCommand); + + // Migrate data to temp table + sqLiteDatabase.execSQL("INSERT INTO temp (" + + EabCommonColumns._ID + ", " + + EabCommonColumns.EAB_CONTACT_ID + ", " + + EabCommonColumns.MECHANISM + ", " + + EabCommonColumns.REQUEST_RESULT + ", " + + EabCommonColumns.SUBSCRIPTION_ID + ") " + + " SELECT " + + EabCommonColumns._ID + ", " + + EabCommonColumns.EAB_CONTACT_ID + ", " + + EabCommonColumns.MECHANISM + ", " + + EabCommonColumns.REQUEST_RESULT + ", " + + EabCommonColumns.SUBSCRIPTION_ID + " " + + " FROM " + + EAB_COMMON_TABLE_NAME + +";"); + + // Drop old one + sqLiteDatabase.execSQL("DROP TABLE " + EAB_COMMON_TABLE_NAME + ";"); + + // Rename temp to eab_common + sqLiteDatabase.execSQL("ALTER TABLE temp RENAME TO " + EAB_COMMON_TABLE_NAME + ";"); + oldVersion = 3; + } } } diff --git a/src/java/com/android/ims/rcs/uce/presence/pidfparser/PidfParser.java b/src/java/com/android/ims/rcs/uce/presence/pidfparser/PidfParser.java index 2660f1d9..dc2dc045 100644 --- a/src/java/com/android/ims/rcs/uce/presence/pidfparser/PidfParser.java +++ b/src/java/com/android/ims/rcs/uce/presence/pidfparser/PidfParser.java @@ -36,14 +36,13 @@ import com.android.ims.rcs.uce.presence.pidfparser.pidf.PidfConstant; import com.android.ims.rcs.uce.presence.pidfparser.pidf.Presence; import com.android.ims.rcs.uce.presence.pidfparser.pidf.Tuple; import com.android.ims.rcs.uce.util.UceUtils; +import com.android.internal.annotations.VisibleForTesting; import java.io.IOException; import java.io.Reader; import java.io.StringReader; import java.io.StringWriter; import java.time.Instant; -import java.time.format.DateTimeFormatter; -import java.time.format.DateTimeParseException; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -63,6 +62,29 @@ public class PidfParser { private static final Pattern PIDF_PATTERN = Pattern.compile("\t|\r|\n"); /** + * Testing interface used to get the timestamp. + */ + @VisibleForTesting + public interface TimestampProxy { + Instant getTimestamp(); + } + + // The timestamp proxy to create the local timestamp. + private static final TimestampProxy sLocalTimestampProxy = () -> Instant.now(); + + // Override timestamp proxy for testing only. + private static TimestampProxy sOverrideTimestampProxy; + + @VisibleForTesting + public static void setTimestampProxy(TimestampProxy proxy) { + sOverrideTimestampProxy = proxy; + } + + private static TimestampProxy getTimestampProxy() { + return (sOverrideTimestampProxy != null) ? sOverrideTimestampProxy : sLocalTimestampProxy; + } + + /** * Convert the RcsContactUceCapability to the string of pidf. */ public static String convertToPidf(RcsContactUceCapability capabilities) { @@ -214,17 +236,8 @@ public class PidfParser { builder.setContactUri(Uri.parse(contact)); } - // Timestamp - String timestamp = PidfParserUtils.getTupleTimestamp(tuple); - if (!TextUtils.isEmpty(timestamp)) { - try { - Instant instant = DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse( - timestamp, Instant::from); - builder.setTime(instant); - } catch (DateTimeParseException e) { - Log.w(LOG_TAG, "getRcsContactPresenceTuple: Parse timestamp failed " + e); - } - } + // Use local time instead to prevent we receive the incorrect timestamp from the network. + builder.setTime(getTimestampProxy().getTimestamp()); // Set service description if (!TextUtils.isEmpty(serviceDescription)) { diff --git a/tests/src/com/android/ims/rcs/uce/eab/EabControllerTest.java b/tests/src/com/android/ims/rcs/uce/eab/EabControllerTest.java index 5138445f..96147b43 100644 --- a/tests/src/com/android/ims/rcs/uce/eab/EabControllerTest.java +++ b/tests/src/com/android/ims/rcs/uce/eab/EabControllerTest.java @@ -66,7 +66,8 @@ import java.util.concurrent.TimeUnit; @RunWith(AndroidJUnit4.class) public class EabControllerTest extends ImsTestBase { EabProviderTestable mEabProviderTestable = new EabProviderTestable(); - EabControllerImpl mEabController; + EabControllerImpl mEabControllerSub1; + EabControllerImpl mEabControllerSub2; PersistableBundle mBundle; ExecutorService mExecutor = Executors.newSingleThreadExecutor(); @@ -74,6 +75,7 @@ public class EabControllerTest extends ImsTestBase { EabControllerImpl.ExpirationTimeFactory mExpirationTimeFactory; private static final int TEST_SUB_ID = 1; + private static final int TEST_SECOND_SUB_ID = 2; private static final String TEST_PHONE_NUMBER = "16661234567"; private static final String TEST_SERVICE_STATUS = "status"; private static final String TEST_SERVICE_SERVICE_ID = "serviceId"; @@ -94,9 +96,14 @@ public class EabControllerTest extends ImsTestBase { mockContentResolver.addProvider(EabProvider.AUTHORITY, mEabProviderTestable); insertContactInfoToDB(); - mEabController = new EabControllerImpl( + mEabControllerSub1 = new EabControllerImpl( mContext, TEST_SUB_ID, null, Looper.getMainLooper()); - mEabController.setExpirationTimeFactory(mExpirationTimeFactory); + mEabControllerSub1.setExpirationTimeFactory(mExpirationTimeFactory); + + mEabControllerSub2 = new EabControllerImpl( + mContext, TEST_SECOND_SUB_ID, null, Looper.getMainLooper()); + mEabControllerSub2.setExpirationTimeFactory(mExpirationTimeFactory); + doReturn(Instant.now().getEpochSecond()).when(mExpirationTimeFactory).getExpirationTime(); mBundle = mContextFixture.getTestCarrierConfigBundle(); @@ -113,9 +120,9 @@ public class EabControllerTest extends ImsTestBase { List<RcsContactUceCapability> contactList = new ArrayList<>(); contactList.add(createPresenceCapability()); - mEabController.saveCapabilities(contactList); + mEabControllerSub1.saveCapabilities(contactList); - EabCapabilityResult result = mEabController.getAvailability(TEST_CONTACT_URI); + EabCapabilityResult result = mEabControllerSub1.getAvailability(TEST_CONTACT_URI); Assert.assertEquals(EabCapabilityResult.EAB_QUERY_SUCCESSFUL, result.getStatus()); Assert.assertEquals(TEST_CONTACT_URI, result.getContactCapabilities().getContactUri()); @@ -127,14 +134,14 @@ public class EabControllerTest extends ImsTestBase { List<RcsContactUceCapability> contactList = new ArrayList<>(); contactList.add(createPresenceCapability()); - mEabController.saveCapabilities(contactList); + mEabControllerSub1.saveCapabilities(contactList); List<Uri> contactUriList = new ArrayList<>(); contactUriList.add(TEST_CONTACT_URI); Assert.assertEquals(1, - mEabController.getCapabilities(contactUriList).size()); + mEabControllerSub1.getCapabilities(contactUriList).size()); Assert.assertEquals(EabCapabilityResult.EAB_QUERY_SUCCESSFUL, - mEabController.getCapabilities(contactUriList).get(0).getStatus()); + mEabControllerSub1.getCapabilities(contactUriList).get(0).getStatus()); } @Test @@ -145,14 +152,14 @@ public class EabControllerTest extends ImsTestBase { contactList.add(createPresenceCapability()); - mEabController.saveCapabilities(contactList); + mEabControllerSub1.saveCapabilities(contactList); List<Uri> contactUriList = new ArrayList<>(); contactUriList.add(TEST_CONTACT_URI); Assert.assertEquals(1, - mEabController.getCapabilities(contactUriList).size()); + mEabControllerSub1.getCapabilities(contactUriList).size()); Assert.assertEquals(EabCapabilityResult.EAB_CONTACT_EXPIRED_FAILURE, - mEabController.getCapabilities(contactUriList).get(0).getStatus()); + mEabControllerSub1.getCapabilities(contactUriList).get(0).getStatus()); } @Test @@ -164,16 +171,16 @@ public class EabControllerTest extends ImsTestBase { List<RcsContactUceCapability> contactList = new ArrayList<>(); contactList.add(createPresenceNonRcsCapability()); - mEabController.saveCapabilities(contactList); + mEabControllerSub1.saveCapabilities(contactList); List<Uri> contactUriList = new ArrayList<>(); contactUriList.add(TEST_CONTACT_URI); // Verify result is not expired Assert.assertEquals(1, - mEabController.getCapabilities(contactUriList).size()); + mEabControllerSub1.getCapabilities(contactUriList).size()); Assert.assertEquals(EabCapabilityResult.EAB_QUERY_SUCCESSFUL, - mEabController.getCapabilities(contactUriList).get(0).getStatus()); + mEabControllerSub1.getCapabilities(contactUriList).get(0).getStatus()); } @Test @@ -187,15 +194,15 @@ public class EabControllerTest extends ImsTestBase { List<RcsContactUceCapability> contactList = new ArrayList<>(); contactList.add(createPresenceNonRcsCapability()); - mEabController.saveCapabilities(contactList); + mEabControllerSub1.saveCapabilities(contactList); // Verify result is expired List<Uri> contactUriList = new ArrayList<>(); contactUriList.add(TEST_CONTACT_URI); Assert.assertEquals(1, - mEabController.getCapabilities(contactUriList).size()); + mEabControllerSub1.getCapabilities(contactUriList).size()); Assert.assertEquals(EabCapabilityResult.EAB_CONTACT_EXPIRED_FAILURE, - mEabController.getCapabilities(contactUriList).get(0).getStatus()); + mEabControllerSub1.getCapabilities(contactUriList).get(0).getStatus()); } @Test @@ -209,7 +216,7 @@ public class EabControllerTest extends ImsTestBase { data.put(EabProvider.EabCommonColumns.SUBSCRIPTION_ID, -1); mContext.getContentResolver().insert(COMMON_URI, data); - mExecutor.execute(mEabController.mCapabilityCleanupRunnable); + mExecutor.execute(mEabControllerSub1.mCapabilityCleanupRunnable); mExecutor.awaitTermination(TIME_OUT_IN_SEC, TimeUnit.SECONDS); // Verify the entry that cannot map to presence/option table has been removed @@ -242,7 +249,7 @@ public class EabControllerTest extends ImsTestBase { expiredDate.getTime().getTime() / 1000); mContext.getContentResolver().insert(PRESENCE_URI, data); - mExecutor.execute(mEabController.mCapabilityCleanupRunnable); + mExecutor.execute(mEabControllerSub1.mCapabilityCleanupRunnable); mExecutor.awaitTermination(TIME_OUT_IN_SEC, TimeUnit.SECONDS); // Verify the invalid data has been removed after save capabilities @@ -275,7 +282,7 @@ public class EabControllerTest extends ImsTestBase { expiredDate.getTime().getTime() / 1000); mContext.getContentResolver().insert(OPTIONS_URI, data); - mExecutor.execute(mEabController.mCapabilityCleanupRunnable); + mExecutor.execute(mEabControllerSub1.mCapabilityCleanupRunnable); mExecutor.awaitTermination(TIME_OUT_IN_SEC, TimeUnit.SECONDS); // Verify the invalid data has been removed after save capabilities @@ -289,6 +296,23 @@ public class EabControllerTest extends ImsTestBase { } } + @Test + @SmallTest + public void testSaveCapabilityForDifferentSubId() { + List<RcsContactUceCapability> contactList = new ArrayList<>(); + contactList.add(createPresenceCapability()); + + mEabControllerSub1.saveCapabilities(contactList); + mEabControllerSub2.saveCapabilities(contactList); + + List<Uri> contactUriList = new ArrayList<>(); + contactUriList.add(TEST_CONTACT_URI); + Assert.assertEquals(1, + mEabControllerSub1.getCapabilities(contactUriList).size()); + Assert.assertEquals(1, + mEabControllerSub2.getCapabilities(contactUriList).size()); + } + private RcsContactUceCapability createPresenceCapability() { RcsContactPresenceTuple.ServiceCapabilities.Builder serviceCapabilitiesBuilder = new RcsContactPresenceTuple.ServiceCapabilities.Builder(TEST_AUDIO_CAPABLE, diff --git a/tests/src/com/android/ims/rcs/uce/eab/EabProviderTest.java b/tests/src/com/android/ims/rcs/uce/eab/EabProviderTest.java index 3c22e0ed..6d09ebf8 100644 --- a/tests/src/com/android/ims/rcs/uce/eab/EabProviderTest.java +++ b/tests/src/com/android/ims/rcs/uce/eab/EabProviderTest.java @@ -117,17 +117,19 @@ public class EabProviderTest extends ImsTestBase { @Test @SmallTest - public void testCommonIsUnique() { + public void testCommonIsNotUnique() { ContentValues data = new ContentValues(); data.put(EabProvider.EabCommonColumns.EAB_CONTACT_ID, 1); data.put(EabProvider.EabCommonColumns.MECHANISM, CAPABILITY_MECHANISM_PRESENCE); data.put(EabProvider.EabCommonColumns.REQUEST_RESULT, REQUEST_RESULT_FOUND); + data.put(EabProvider.EabCommonColumns.SUBSCRIPTION_ID, 1); mContext.getContentResolver().insert(COMMON_URI, data); data = new ContentValues(); data.put(EabProvider.EabCommonColumns.EAB_CONTACT_ID, 1); data.put(EabProvider.EabCommonColumns.MECHANISM, CAPABILITY_MECHANISM_PRESENCE); data.put(EabProvider.EabCommonColumns.REQUEST_RESULT, REQUEST_RESULT_FOUND); + data.put(EabProvider.EabCommonColumns.SUBSCRIPTION_ID, 2); mContext.getContentResolver().insert(COMMON_URI, data); Cursor cursor = mContext.getContentResolver().query(COMMON_URI, @@ -136,7 +138,7 @@ public class EabProviderTest extends ImsTestBase { null, null); - assertEquals(1, cursor.getCount()); + assertEquals(2, cursor.getCount()); } @Test diff --git a/tests/src/com/android/ims/rcs/uce/presence/pidfparser/PidfParserTest.java b/tests/src/com/android/ims/rcs/uce/presence/pidfparser/PidfParserTest.java index f8038be1..be92ce36 100644 --- a/tests/src/com/android/ims/rcs/uce/presence/pidfparser/PidfParserTest.java +++ b/tests/src/com/android/ims/rcs/uce/presence/pidfparser/PidfParserTest.java @@ -47,14 +47,19 @@ import org.mockito.Mock; @RunWith(AndroidJUnit4.class) public class PidfParserTest extends ImsTestBase { + // The timestamp of the PIDF + private final Instant mPidfTimestamp = Instant.now().plusMillis(1); + @Before public void setUp() throws Exception { super.setUp(); + PidfParser.setTimestampProxy(() -> mPidfTimestamp); } @After public void tearDown() throws Exception { super.tearDown(); + PidfParser.setTimestampProxy(null); } @Test @@ -104,7 +109,7 @@ public class PidfParserTest extends ImsTestBase { assertEquals("1.0", presenceTuple1.getServiceVersion()); assertEquals(serviceDescription, presenceTuple1.getServiceDescription()); assertEquals(Uri.parse(contact), presenceTuple1.getContactUri()); - assertEquals("2001-01-01T01:00:00Z", presenceTuple1.getTime().toString()); + assertEquals(mPidfTimestamp.toString(), presenceTuple1.getTime().toString()); assertTrue(presenceTuple1.getServiceCapabilities().isAudioCapable()); assertFalse(presenceTuple1.getServiceCapabilities().isVideoCapable()); } @@ -184,7 +189,7 @@ public class PidfParserTest extends ImsTestBase { assertEquals(expectedTuple.getStatus(), tuple.getStatus()); assertEquals(expectedTuple.getServiceVersion(), tuple.getServiceVersion()); assertEquals(expectedTuple.getServiceDescription(), tuple.getServiceDescription()); - assertEquals(expectedTuple.getTime(), tuple.getTime()); + assertEquals(mPidfTimestamp, tuple.getTime()); assertEquals(expectedTuple.getContactUri(), tuple.getContactUri()); ServiceCapabilities expectedCap = expectedTuple.getServiceCapabilities(); @@ -243,7 +248,7 @@ public class PidfParserTest extends ImsTestBase { assertEquals("1.0", presenceTuple1.getServiceVersion()); assertEquals(serviceDescription1, presenceTuple1.getServiceDescription()); assertEquals(Uri.parse(contact), presenceTuple1.getContactUri()); - assertEquals("2001-01-01T01:00:00Z", presenceTuple1.getTime().toString()); + assertEquals(mPidfTimestamp.toString(), presenceTuple1.getTime().toString()); assertNull(presenceTuple1.getServiceCapabilities()); // Verify the second tuple information @@ -254,7 +259,7 @@ public class PidfParserTest extends ImsTestBase { assertFalse(presenceTuple2.getServiceCapabilities().isVideoCapable()); assertEquals(serviceDescription2, presenceTuple2.getServiceDescription()); assertEquals(Uri.parse(contact), presenceTuple2.getContactUri()); - assertEquals("2001-02-02T01:00:00Z", presenceTuple2.getTime().toString()); + assertEquals(mPidfTimestamp.toString(), presenceTuple2.getTime().toString()); assertNotNull(presenceTuple2.getServiceCapabilities()); assertEquals(isAudioSupported, presenceTuple2.getServiceCapabilities().isAudioCapable()); assertEquals(isVideoSupported, presenceTuple2.getServiceCapabilities().isVideoCapable()); @@ -341,7 +346,7 @@ public class PidfParserTest extends ImsTestBase { .append("<caps:video>").append(isVideoSupported).append("</caps:video>") .append("</caps:servcaps>") .append("<contact>").append(contact).append("</contact>") - .append("<timestamp>2001-01-01T01:00:00.00Z</timestamp>") + .append("<timestamp>").append(mPidfTimestamp.toString()).append("</timestamp>") .append("</tuple></presence>"); return pidfBuilder.toString(); } @@ -444,7 +449,7 @@ public class PidfParserTest extends ImsTestBase { + "<op:description>" + serviceDescription1 + "</op:description>" + "</op:service-description>" + "<contact>" + contact + "</contact>" - + "<timestamp>2001-01-01T01:00:00.00Z</timestamp>" + + "<timestamp>" + mPidfTimestamp.toString() + "</timestamp>" + "</tuple>" // tuple 2 + "<tuple id=\"a1\">" @@ -462,7 +467,7 @@ public class PidfParserTest extends ImsTestBase { + "<caps:video>" + videoSupported + "</caps:video>" + "</caps:servcaps>" + "<contact>" + contact + "</contact>" - + "<timestamp>2001-02-02T01:00:00.00Z</timestamp>" + + "<timestamp>" + mPidfTimestamp.toString() + "</timestamp>" + "</tuple>" + "</presence>"; } @@ -475,7 +480,6 @@ public class PidfParserTest extends ImsTestBase { final String basicStatus = RcsContactPresenceTuple.TUPLE_BASIC_STATUS_OPEN; final String version = "1.0"; final String description = "description test"; - final Instant nowTime = Instant.now(); // init the capabilities ServiceCapabilities.Builder servCapsBuilder = @@ -487,7 +491,7 @@ public class PidfParserTest extends ImsTestBase { basicStatus, RcsContactPresenceTuple.SERVICE_ID_MMTEL, version); tupleBuilder.setContactUri(contact) .setServiceDescription(description) - .setTime(nowTime) + .setTime(mPidfTimestamp) .setServiceCapabilities(servCapsBuilder.build()); PresenceBuilder presenceBuilder = new PresenceBuilder(contact, |