diff --git a/CHANGELOG.md b/CHANGELOG.md index 003d5bb4..b20bfd02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog for DP3T-SDK Android +## Version 0.5.6 (12.6.2020) + +- increased time delta check to 10min + ## Version 0.5.5 (11.6.2020) - improve history logging diff --git a/calibration-app/app/src/main/java/org/dpppt/android/calibration/MainApplication.java b/calibration-app/app/src/main/java/org/dpppt/android/calibration/MainApplication.java index 0ee203e0..12dc82e3 100644 --- a/calibration-app/app/src/main/java/org/dpppt/android/calibration/MainApplication.java +++ b/calibration-app/app/src/main/java/org/dpppt/android/calibration/MainApplication.java @@ -20,7 +20,6 @@ import org.dpppt.android.calibration.util.NotificationUtil; import org.dpppt.android.calibration.util.PreferencesUtil; import org.dpppt.android.sdk.DP3T; -import org.dpppt.android.sdk.internal.backend.BackendBucketRepository; import org.dpppt.android.sdk.internal.logger.LogLevel; import org.dpppt.android.sdk.internal.logger.Logger; import org.dpppt.android.sdk.models.ApplicationInfo; @@ -58,7 +57,6 @@ public static void initDP3T(Context context) { .build(); DP3T.setCertificatePinner(certificatePinner); } - BackendBucketRepository.BATCH_LENGTH = 5 * 60 * 1000L; String userAgent = BuildConfig.APPLICATION_ID + ";" + BuildConfig.VERSION_NAME + ";" + diff --git a/dp3t-sdk/sdk/build.gradle b/dp3t-sdk/sdk/build.gradle index 820758b3..63911ad1 100644 --- a/dp3t-sdk/sdk/build.gradle +++ b/dp3t-sdk/sdk/build.gradle @@ -21,8 +21,8 @@ android { defaultConfig { minSdkVersion 23 targetSdkVersion 29 - versionCode 55 - versionName "0.5.5" + versionCode 56 + versionName "0.5.6" testInstrumentationRunnerArgument 'androidx.benchmark.suppressErrors', 'EMULATOR,LOW-BATTERY,ACTIVITY-MISSING,DEBUGGABLE,UNLOCKED,UNSUSTAINED-ACTIVITY-MISSING' testInstrumentationRunner "androidx.benchmark.junit4.AndroidBenchmarkRunner" diff --git a/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/TracingStatus.java b/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/TracingStatus.java index 95df6ed5..faba3624 100644 --- a/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/TracingStatus.java +++ b/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/TracingStatus.java @@ -64,7 +64,6 @@ public enum ErrorState { SYNC_ERROR_SERVER(R.string.dp3t_sdk_service_notification_error_sync_server), SYNC_ERROR_NETWORK(R.string.dp3t_sdk_service_notification_error_sync_network), SYNC_ERROR_SSLTLS(R.string.dp3t_sdk_service_notification_error_sync_ssltls), - SYNC_ERROR_DATABASE(R.string.dp3t_sdk_service_notification_error_sync_database), SYNC_ERROR_TIMING(R.string.dp3t_sdk_service_notification_error_sync_timing), SYNC_ERROR_SIGNATURE(R.string.dp3t_sdk_service_notification_error_sync_signature), SYNC_ERROR_API_EXCEPTION(R.string.dp3t_sdk_service_notification_error_sync_api); diff --git a/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/internal/SyncWorker.java b/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/internal/SyncWorker.java index 39a6aa87..b9d42998 100644 --- a/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/internal/SyncWorker.java +++ b/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/internal/SyncWorker.java @@ -129,8 +129,6 @@ public static synchronized void doSync(Context context) throws Exception { } else if (e instanceof StatusCodeException) { syncError = ErrorState.SYNC_ERROR_SERVER; syncError.setErrorCode("ASST" + ((StatusCodeException) e).getCode()); - } else if (e instanceof SQLiteException) { - syncError = ErrorState.SYNC_ERROR_DATABASE; } else if (e instanceof ApiException) { syncError = ErrorState.SYNC_ERROR_API_EXCEPTION; syncError.setErrorCode("AGAEN" + ((ApiException) e).getStatusCode()); diff --git a/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/internal/backend/BackendBucketRepository.java b/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/internal/backend/BackendBucketRepository.java index 0745525f..a59912db 100644 --- a/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/internal/backend/BackendBucketRepository.java +++ b/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/internal/backend/BackendBucketRepository.java @@ -25,8 +25,6 @@ public class BackendBucketRepository implements Repository { - public static long BATCH_LENGTH = 2 * 60 * 60 * 1000L; - private BucketService bucketService; public BackendBucketRepository(@NonNull Context context, @NonNull String bucketBaseUrl, @NonNull PublicKey publicKey) { diff --git a/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/internal/backend/TimingVerificationInterceptor.java b/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/internal/backend/TimingVerificationInterceptor.java index a527a505..3b524d06 100644 --- a/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/internal/backend/TimingVerificationInterceptor.java +++ b/dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/internal/backend/TimingVerificationInterceptor.java @@ -23,7 +23,7 @@ public class TimingVerificationInterceptor implements Interceptor { - private static final long ALLOWED_SERVER_TIME_DIFF = 60 * 1000L; + private static final long ALLOWED_SERVER_TIME_DIFF = 10 * 60 * 1000L; private static final String TAG = "TimingVerification"; diff --git a/dp3t-sdk/sdk/src/main/res/values/strings.xml b/dp3t-sdk/sdk/src/main/res/values/strings.xml index 43b8b28d..b556f006 100644 --- a/dp3t-sdk/sdk/src/main/res/values/strings.xml +++ b/dp3t-sdk/sdk/src/main/res/values/strings.xml @@ -21,7 +21,6 @@ failed to load new infection data (server error) failed to load new infection data (network error) failed to load new infection data (ssl/tls error) - failed to load new infection data (database error) device time does not match server time failed to load new infection data (invalid signature) failed to load new infection data