Merge pull request #149 from DP-3T/develop

Develop

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog for DP3T-SDK Android
 
+## Version 0.5.5 (11.6.2020)
+
+- improve history logging
+
 ## Version 0.5.4 (11.6.2020)
 
 - bugfix for user-visible logs

dp3t-sdk/sdk/build.gradle

@@ -21,8 +21,8 @@ android {
 	defaultConfig {
 		minSdkVersion 23
 		targetSdkVersion 29
-		versionCode 54
-		versionName "0.5.4"
+		versionCode 55
+		versionName "0.5.5"
 		testInstrumentationRunnerArgument 'androidx.benchmark.suppressErrors', 'EMULATOR,LOW-BATTERY,ACTIVITY-MISSING,DEBUGGABLE,UNLOCKED,UNSUSTAINED-ACTIVITY-MISSING'
 		testInstrumentationRunner "androidx.benchmark.junit4.AndroidBenchmarkRunner"
 

dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/DP3T.java

@@ -31,9 +31,9 @@
 import org.dpppt.android.sdk.internal.backend.StatusCodeException;
 import org.dpppt.android.sdk.internal.backend.SyncErrorState;
 import org.dpppt.android.sdk.internal.backend.models.GaenRequest;
-import org.dpppt.android.sdk.internal.history.HistoryEntryType;
 import org.dpppt.android.sdk.internal.history.HistoryDatabase;
 import org.dpppt.android.sdk.internal.history.HistoryEntry;
+import org.dpppt.android.sdk.internal.history.HistoryEntryType;
 import org.dpppt.android.sdk.internal.logger.Logger;
 import org.dpppt.android.sdk.internal.nearby.GaenStateCache;
 import org.dpppt.android.sdk.internal.nearby.GaenStateHelper;
@@ -413,18 +413,19 @@ public static void clearData(Context context) {
 		Logger.clear();
 	}
 
-	public static void clientOpened(Context context) {
+	public static void addClientOpenedToHistory(Context context) {
 		HistoryDatabase historyDatabase = HistoryDatabase.getInstance(context);
 		Calendar calendar = new GregorianCalendar();
 		historyDatabase.addEntry(new HistoryEntry(HistoryEntryType.OPEN_APP, null, true, calendar.getTimeInMillis()));
 		calendar.add(Calendar.DAY_OF_YEAR, -1 * HISTORY_KEEP_FOR_DAYS);
 		historyDatabase.clearBefore(calendar.getTimeInMillis());
 	}
 
-	public static void fakeWorkerScheduled(Context context) {
+	public static void addWorkerStartedToHistory(Context context, String workerName) {
 		if (AppConfigManager.getInstance(context).getDevHistory()) {
 			HistoryDatabase historyDatabase = HistoryDatabase.getInstance(context);
-			historyDatabase.addEntry(new HistoryEntry(HistoryEntryType.SCHEDULED_WORKER, "Fake", true, System.currentTimeMillis()));
+			historyDatabase
+					.addEntry(new HistoryEntry(HistoryEntryType.WORKER_STARTED, workerName, true, System.currentTimeMillis()));
 		}
 	}
 

dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/internal/SyncWorker.java

@@ -70,11 +70,6 @@ public static void startSyncWorker(Context context) {
 		WorkManager workManager = WorkManager.getInstance(context);
 		workManager.enqueueUniquePeriodicWork(WORK_TAG, ExistingPeriodicWorkPolicy.KEEP, periodicWorkRequest);
 
-		if (AppConfigManager.getInstance(context).getDevHistory()) {
-			HistoryDatabase.getInstance(context)
-					.addEntry(new HistoryEntry(HistoryEntryType.SCHEDULED_WORKER, "Sync", true, System.currentTimeMillis()));
-		}
-
 		Logger.d(TAG, "scheduled SyncWorker");
 	}
 
@@ -97,6 +92,11 @@ public Result doWork() {
 		Logger.d(TAG, "start SyncWorker");
 		Context context = getApplicationContext();
 
+		if (AppConfigManager.getInstance(context).getDevHistory()) {
+			HistoryDatabase.getInstance(context)
+					.addEntry(new HistoryEntry(HistoryEntryType.WORKER_STARTED, "Sync", true, System.currentTimeMillis()));
+		}
+
 		try {
 			doSync(context);
 		} catch (Exception e) {

dp3t-sdk/sdk/src/main/java/org/dpppt/android/sdk/internal/history/HistoryEntryType.java

@@ -5,7 +5,7 @@
 public enum HistoryEntryType {
 	OPEN_APP(0),
 	SYNC(1),
-	SCHEDULED_WORKER(2),
+	WORKER_STARTED(2),
 	FAKE_REQUEST(3),
 	NEXT_DAY_KEY_UPLOAD_REQUEST(4);