Skip to content

Commit

Permalink
Merge commit '28731a0ad464b9aff456bf8e2deb05627dd7f080' into sslavin-…
Browse files Browse the repository at this point in the history
…MM-1462-stub-clock

# Conflicts:
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/BatchReporterTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/CustomUserDataTypeTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/GeoEventsTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/MessageStoreTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/NotificationsTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/RetryableSynchronizerTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/SeenStatusReporterTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/SeenStatusStorageTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/SendMOMessageTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/SystemDataReportTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/UserDataSyncTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/dal/sqlite/DatabaseHelperTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/dal/sqlite/SharedPreferencesMigrationTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/dal/sqlite/SqliteMessageMigrationTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/dal/sqlite/SqliteMessageTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/gcm/MessageHandlerTests.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeoHandlerTests.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeoMonitoringTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeoReportsTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeoStorageTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/GeoTransitionsTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/geo/PushUnregisteredTest.java
#	infobip-mobile-messaging-android-sdk/src/androidTest/java/org/infobip/mobile/messaging/platform/AndroidBroadcasterTest.java
#	infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/MobileMessagingCore.java
#	infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/dal/sqlite/DatabaseHelper.java
#	infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/gcm/MobileMessageHandler.java
#	infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/geo/Area.java
#	infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/geo/GeoNotificationHelper.java
#	infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/geo/GeoReportHelper.java
#	infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/geo/GeofencingConsistencyReceiver.java
#	infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/mobile/geo/GeoReportingTask.java
#	infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/mobile/messages/MessageSender.java
  • Loading branch information
stanislavin committed Mar 14, 2017
2 parents bae26b5 + 28731a0 commit 6e4e49f
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public interface DatabaseHelper {
<T extends DatabaseContract.DatabaseObject> void delete(Class<T> cls, String primaryKey);

/**
* Deletes object from database
* Deletes objects from database
* @param cls object class
* @param primaryKeys object primary keys
*/
Expand Down

0 comments on commit 6e4e49f

Please sign in to comment.