brb

7 files changed, 42 insertions, 1 deletions

diff --git a/include/mbgl/util/thread.hpp b/include/mbgl/util/thread.hpp
index bc58427349..6e66df4400 100644
--- a/include/mbgl/util/thread.hpp
+++ b/include/mbgl/util/thread.hpp
@@ -15,6 +15,8 @@
 #include <string>
 #include <thread>
 #include <utility>
+#include <sstream>
+#include "logging.hpp"
 
 namespace mbgl {
 namespace util {
@@ -104,6 +106,17 @@ public:
     // sent to a paused `Object` will be queued and only processed after
     // `resume()` is called.
     void pause() {
+        auto myid = std::this_thread::get_id();
+        std::stringstream ss;
+        ss << myid;
+        std::string mystring = ss.str();
+
+        auto myid2 = tid;
+        std::stringstream ss2;
+        ss2 << myid2;
+        std::string mystring2 = ss2.str();
+
+        Log::Error(Event::Android, "Hello world "+ mystring + " , while " + mystring2);
         MBGL_VERIFY_THREAD(tid);
 
         assert(!paused);
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index 927317996b..165d42a66d 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: "com.jaredsburrows.license"
 apply plugin: 'kotlin-android'
 
@@ -18,6 +19,7 @@ dependencies {
     testImplementation dependenciesList.mockk
     testImplementation dependenciesList.robolectric
     testImplementation dependenciesList.kotlinLib
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 android {
@@ -170,4 +172,7 @@ apply from: "${rootDir}/gradle/gradle-dependencies-graph.gradle"
 apply from: "${rootDir}/gradle/gradle-update-vendor-modules.gradle"
 apply from: "${rootDir}/gradle/android-nitpick.gradle"
 apply from: "${rootDir}/gradle/gradle-bintray.gradle"
-apply from: "${rootDir}/gradle/jacoco-report.gradle"
\ No newline at end of file
+apply from: "${rootDir}/gradle/jacoco-report.gradle"
+repositories {
+    mavenCentral()
+}
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
index 8684d7c6f1..689c9b8f56 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
@@ -12,6 +12,7 @@ import com.mapbox.mapboxsdk.LibraryLoader;
 import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.R;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
+import com.mapbox.mapboxsdk.log.Logger;
 import com.mapbox.mapboxsdk.maps.TelemetryDefinition;
 import com.mapbox.mapboxsdk.net.ConnectivityReceiver;
 import com.mapbox.mapboxsdk.storage.FileSource;
@@ -182,6 +183,7 @@ public class OfflineManager {
         getHandler().post(new Runnable() {
           @Override
           public void run() {
+            Logger.e("offline_test.db", "#listOfflineRegions " +  (Looper.myLooper() == Looper.getMainLooper()));
             fileSource.deactivate();
             callback.onList(offlineRegions);
           }
@@ -193,6 +195,7 @@ public class OfflineManager {
         getHandler().post(new Runnable() {
           @Override
           public void run() {
+            Logger.e("offline_test.db", "#listOfflineRegions#onError " +  (Looper.myLooper() == Looper.getMainLooper()));
             fileSource.deactivate();
             callback.onError(error);
           }
@@ -327,6 +330,7 @@ public class OfflineManager {
         getHandler().post(new Runnable() {
           @Override
           public void run() {
+            Logger.e("offline_test.db", "mergeOfflineDatabaseFiles " +  (Looper.myLooper() == Looper.getMainLooper()));
             fileSource.deactivate();
             if (isTemporaryFile) {
               file.delete();
@@ -341,6 +345,7 @@ public class OfflineManager {
         getHandler().post(new Runnable() {
           @Override
           public void run() {
+            Logger.e("offline_test.db", "mergeOfflineDatabaseFiles#onError " +  (Looper.myLooper() == Looper.getMainLooper()));
             fileSource.deactivate();
             if (isTemporaryFile) {
               file.delete();
@@ -387,6 +392,7 @@ public class OfflineManager {
         getHandler().post(new Runnable() {
           @Override
           public void run() {
+            Logger.e("offline_test.db", "onCreate " +  (Looper.myLooper() == Looper.getMainLooper()));
             ConnectivityReceiver.instance(context).deactivate();
             FileSource.getInstance(context).deactivate();
             callback.onCreate(offlineRegion);
@@ -399,6 +405,7 @@ public class OfflineManager {
         getHandler().post(new Runnable() {
           @Override
           public void run() {
+            Logger.e("offline_test.db", "onCreate#onError " +  (Looper.myLooper() == Looper.getMainLooper()));
             ConnectivityReceiver.instance(context).deactivate();
             FileSource.getInstance(context).deactivate();
             callback.onError(error);
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
index 7bcc6ad234..876a4eedf7 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java
@@ -8,6 +8,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import com.mapbox.mapboxsdk.LibraryLoader;
 import com.mapbox.mapboxsdk.Mapbox;
+import com.mapbox.mapboxsdk.log.Logger;
 import com.mapbox.mapboxsdk.storage.FileSource;
 
 import java.lang.annotation.Retention;
@@ -309,6 +310,7 @@ public class OfflineRegion {
     if (state == STATE_ACTIVE) {
       fileSource.activate();
     } else {
+      Logger.e("offline_test.db", "setDownloadState " +  (Looper.myLooper() == Looper.getMainLooper()));
       fileSource.deactivate();
     }
 
@@ -331,6 +333,7 @@ public class OfflineRegion {
         handler.post(new Runnable() {
           @Override
           public void run() {
+            Logger.e("offline_test.db", "getStatus " +  (Looper.myLooper() == Looper.getMainLooper()));
             FileSource.getInstance(Mapbox.getApplicationContext()).deactivate();
             callback.onStatus(status);
           }
@@ -342,6 +345,7 @@ public class OfflineRegion {
         handler.post(new Runnable() {
           @Override
           public void run() {
+            Logger.e("offline_test.db", "getStatus#onError " +  (Looper.myLooper() == Looper.getMainLooper()));
             FileSource.getInstance(Mapbox.getApplicationContext()).deactivate();
             callback.onError(error);
           }
@@ -377,6 +381,7 @@ public class OfflineRegion {
           handler.post(new Runnable() {
             @Override
             public void run() {
+              Logger.e("offline_test.db", "onDelete " +  (Looper.myLooper() == Looper.getMainLooper()));
               FileSource.getInstance(Mapbox.getApplicationContext()).deactivate();
               callback.onDelete();
               OfflineRegion.this.finalize();
@@ -390,6 +395,7 @@ public class OfflineRegion {
             @Override
             public void run() {
               isDeleted = false;
+              Logger.e("offline_test.db", "onDelete#onError " +  (Looper.myLooper() == Looper.getMainLooper()));
               FileSource.getInstance(Mapbox.getApplicationContext()).deactivate();
               callback.onError(error);
             }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java
index 5c70d23899..a2c6e773c2 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java
@@ -7,6 +7,7 @@ import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
 import android.os.AsyncTask;
 import android.os.Environment;
+import android.os.Looper;
 import android.support.annotation.Keep;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -355,6 +356,7 @@ public class FileSource {
   private long nativePtr;
 
   private FileSource(String cachePath, AssetManager assetManager) {
+    Logger.e("offline_test.db", "FileSource constructor " +  (Looper.myLooper() == Looper.getMainLooper()));
     initialize(Mapbox.getAccessToken(), cachePath, assetManager);
   }
 
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt
index 8e5f3f7c5f..6e55bf7550 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/offline/OfflineManagerTest.kt
@@ -1,8 +1,10 @@
 package com.mapbox.mapboxsdk.testapp.offline
 
 import android.content.Context
+import android.os.Looper
 import android.support.test.rule.ActivityTestRule
 import android.support.test.runner.AndroidJUnit4
+import com.mapbox.mapboxsdk.log.Logger
 import com.mapbox.mapboxsdk.offline.OfflineManager
 import com.mapbox.mapboxsdk.offline.OfflineRegion
 import com.mapbox.mapboxsdk.storage.FileSource
@@ -37,6 +39,7 @@ class OfflineManagerTest {
     rule.runOnUiThread {
       FileUtils.CopyFileFromAssetsTask(rule.activity, object : FileUtils.OnFileCopiedFromAssetsListener {
         override fun onFileCopiedFromAssets() {
+          Logger.e("offline_test.db", "onFileCopiedFromAssets " +  (Looper.myLooper() == Looper.getMainLooper()))
           latch.countDown()
         }
 
@@ -56,6 +59,7 @@ class OfflineManagerTest {
         FileSource.getResourcesCachePath(rule.activity) + "/" + TEST_DB_FILE_NAME,
         object : OfflineManager.MergeOfflineRegionsCallback {
           override fun onMerge(offlineRegions: Array<out OfflineRegion>?) {
+            Logger.e(TEST_DB_FILE_NAME, "onMerge " +  (Looper.myLooper() == Looper.getMainLooper()))
             assert(offlineRegions?.size == 1)
             latch.countDown()
           }
@@ -74,6 +78,7 @@ class OfflineManagerTest {
     rule.runOnUiThread {
       OfflineManager.getInstance(context).listOfflineRegions(object : OfflineManager.ListOfflineRegionsCallback {
         override fun onList(offlineRegions: Array<out OfflineRegion>?) {
+          Logger.e(TEST_DB_FILE_NAME, "onList " +  (Looper.myLooper() == Looper.getMainLooper()))
           assert(offlineRegions?.size == 1)
           mergedRegion = offlineRegions!![0]
           latch.countDown()
@@ -93,6 +98,7 @@ class OfflineManagerTest {
     rule.runOnUiThread {
       mergedRegion.delete(object : OfflineRegion.OfflineRegionDeleteCallback {
         override fun onDelete() {
+          Logger.e(TEST_DB_FILE_NAME, "delete " +  (Looper.myLooper() == Looper.getMainLooper()))
           latch.countDown()
         }
 
diff --git a/platform/android/build.gradle b/platform/android/build.gradle
index 97f3037afb..d2974ce4fe 100644
--- a/platform/android/build.gradle
+++ b/platform/android/build.gradle
@@ -1,4 +1,5 @@
 buildscript {
+    ext.kotlin_version = '1.3.21'
     apply from: "${rootDir}/gradle/dependencies.gradle"
 
     repositories {
@@ -13,6 +14,7 @@ buildscript {
         classpath dependenciesList.artifactoryPlugin
         classpath dependenciesList.androidPublishPlugin
         classpath dependenciesList.jacocoPlugin
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }