Fix on NullPointerException for Debugger

at-internet · Jan 18, 2018 · 99fa7ce · 99fa7ce
1 parent f36bb7b
commit 99fa7ce
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 20 deletions.
diff --git a/ATMobileAnalytics/SmartTracker/SmartTracker.iml b/ATMobileAnalytics/SmartTracker/SmartTracker.iml
@@ -91,20 +91,13 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
-      <excludeFolder url="file://$MODULE_DIR$/build/test-results" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 26 Platform (1)" jdkType="Android SDK" />

diff --git a/ATMobileAnalytics/SmartTracker/build.gradle b/ATMobileAnalytics/SmartTracker/build.gradle
@@ -29,7 +29,7 @@ android {
 def siteUrl = 'https://github.com/at-internet/atinternet-android-sdk'
 def gitUrl = 'https://github.com/at-internet/atinternet-android-sdk.git'
 group = "com.atinternet"
-def standardVersion = "2.8.2"
+def standardVersion = "2.8.3"
 version = standardVersion + "s"
 
 install {

diff --git a/ATMobileAnalytics/SmartTracker/core.manifest.json b/ATMobileAnalytics/SmartTracker/core.manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Core",
   "description": "Geode_Tag_Android_Description",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "type": "core",
   "config": {
     "storage": {

diff --git a/ATMobileAnalytics/SmartTracker/src/main/java/com/atinternet/tracker/Core.java b/ATMobileAnalytics/SmartTracker/src/main/java/com/atinternet/tracker/Core.java
@@ -1118,7 +1118,7 @@ class TechnicalContext {
     static final Closure VTAG = new Closure() {
         @Override
         public String execute() {
-            return "2.8.2s";
+            return "2.8.3s";
         }
     };
 

diff --git a/ATMobileAnalytics/SmartTracker/src/main/java/com/atinternet/tracker/Debugger.java b/ATMobileAnalytics/SmartTracker/src/main/java/com/atinternet/tracker/Debugger.java
@@ -166,7 +166,7 @@ public static void remove() {
      * @param visible true if debugger should be visible
      */
     public static void setViewerVisibility(boolean visible) {
-        if (bubbleImage != null) {
+        if (bubbleImage != null && bubbleImage.get() != null) {
             bubbleVisibility = visible ? View.VISIBLE : View.GONE;
             bubbleImage.get().setVisibility(bubbleVisibility);
         }

diff --git a/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/MainActivity.java b/ATMobileAnalytics/TestApp/src/main/java/com/atinternet/MainActivity.java
@@ -1,10 +1,6 @@
 package com.atinternet;
 
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 

diff --git a/ATMobileAnalytics/Tracker/build.gradle b/ATMobileAnalytics/Tracker/build.gradle
@@ -29,7 +29,7 @@ android {
 def siteUrl = 'https://github.com/at-internet/atinternet-android-sdk'
 def gitUrl = 'https://github.com/at-internet/atinternet-android-sdk.git'
 group = "com.atinternet"
-version = "2.8.2"
+version = "2.8.3"
 
 install {
     repositories.mavenInstaller {

diff --git a/ATMobileAnalytics/Tracker/core.manifest.json b/ATMobileAnalytics/Tracker/core.manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Core",
   "description": "Geode_Tag_Android_Description",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "type": "core",
   "config": {
     "storage": {

diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java
@@ -1066,7 +1066,7 @@ class TechnicalContext {
     static final Closure VTAG = new Closure() {
         @Override
         public String execute() {
-            return "2.8.2";
+            return "2.8.3";
         }
     };
 

diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Debugger.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Debugger.java
@@ -166,7 +166,7 @@ public static void remove() {
      * @param visible true if debugger should be visible
      */
     public static void setViewerVisibility(boolean visible) {
-        if (bubbleImage != null) {
+        if (bubbleImage != null && bubbleImage.get() != null) {
             bubbleVisibility = visible ? View.VISIBLE : View.GONE;
             bubbleImage.get().setVisibility(bubbleVisibility);
         }

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Gradle can restore 3rd-party libraries in your projects.
 
   In your build.gradle module, add in dependencies block :
 
-	   compile 'com.atinternet:Tracker:2.8.2'
+	   compile 'com.atinternet:Tracker:2.8.3'
 
 ### License
 MIT