Update internal search engine + rollback order management

ATMobileAnalytics/Tracker/build.gradle

@@ -30,7 +30,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.3.3"
+version = "2.3.4"
 
 install {
     repositories.mavenInstaller {
@@ -75,7 +75,7 @@ bintray {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    provided 'com.google.android.gms:play-services-ads:10.0.1'
+    provided 'com.google.android.gms:play-services-ads:10.2.0'
     testCompile 'org.robolectric:robolectric:3.1.2'
     testCompile 'junit:junit:4.10'
 }

ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/AbstractScreen.java

@@ -204,7 +204,9 @@ public Campaign Campaign(String campaignId) {
      * @param orderId  String
      * @param turnover double
      * @return Order
+     * @deprecated Since 2.3.4, bug was revealed when this method is used. Use Orders tracker property instead.
      */
+    @Deprecated
     public Order Order(String orderId, double turnover) {
         return order == null ? (order = new Order(tracker).setOrderId(orderId).setTurnover(turnover)) : order;
     }

ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Gesture.java

@@ -70,13 +70,30 @@ LinkedHashMap<String, CustomObject> getCustomObjectsMap() {
      * @param keywordLabel       String
      * @param resultScreenNumber int
      * @return InternalSearch
+     * @deprecated Since 2.3.4, use {@link #InternalSearch(String, int, int)} instead.
      */
+    @Deprecated
     public InternalSearch InternalSearch(String keywordLabel, int resultScreenNumber) {
         return internalSearch == null ? (internalSearch = new InternalSearch(tracker)
                 .setKeyword(keywordLabel)
                 .setResultScreenNumber(resultScreenNumber)) : internalSearch;
     }
 
+    /**
+     * Add an InternalSearch
+     *
+     * @param keywordLabel       String
+     * @param resultScreenNumber int
+     * @param resultPosition     int
+     * @return InternalSearch
+     */
+    public InternalSearch InternalSearch(String keywordLabel, int resultScreenNumber, int resultPosition) {
+        return internalSearch == null ? (internalSearch = new InternalSearch(tracker)
+                .setKeyword(keywordLabel)
+                .setResultScreenNumber(resultScreenNumber)
+                .setResultPosition(resultPosition)) : internalSearch;
+    }
+
     /**
      * Get CustomObjects
      *

ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/InternalSearch.java

@@ -91,7 +91,7 @@ public InternalSearch setResultPosition(int resultPosition) {
     InternalSearch(Tracker tracker) {
         super(tracker);
         keyword = null;
-        resultScreenNumber = -1;
+        resultScreenNumber = 1;
         resultPosition = -1;
     }
 

ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Orders.java

@@ -22,10 +22,6 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.atinternet.tracker;
 
-/**
- * @deprecated Since 2.3.0, Order is now only available as a screen or gesture object property.
- */
-@Deprecated
 public class Orders extends Helper {
 
     /**

ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/TechnicalContext.java

@@ -71,7 +71,7 @@ class TechnicalContext {
     static final Closure VTAG = new Closure() {
         @Override
         public String execute() {
-            return "2.3.3";
+            return "2.3.4";
         }
     };
 

ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Tracker.java

@@ -481,9 +481,7 @@ public InternalSearches InternalSearches() {
      * Get Orders instance
      *
      * @return Orders
-     * @deprecated Since 2.3.0, Order is now only available as a screen object property.
      */
-    @Deprecated
     public Orders Orders() {
         return orders == null ? (orders = new Orders(this)) : orders;
     }

ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/GestureTest.java

@@ -37,7 +37,7 @@ of this software and associated documentation files (the "Software"), to deal
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 
-@Config(sdk =21)
+@Config(sdk = 21)
 @RunWith(RobolectricTestRunner.class)
 public class GestureTest extends AbstractTestClass {
 
@@ -73,7 +73,7 @@ public void CustomObjectsTest() {
     }
 
     @Test
-    public void InternalSearchTest() {
+    public void InternalSearchDeprecatedTest() {
         int id = new Random().nextInt(500);
         InternalSearch internalSearch = gesture.InternalSearch("test" + id, id);
         Assert.assertNotNull(internalSearch);
@@ -85,6 +85,20 @@ public void InternalSearchTest() {
         Assert.assertEquals(internalSearch.getResultScreenNumber(), id);
     }
 
+    @Test
+    public void InternalSearchTest() {
+        int id = new Random().nextInt(500);
+        InternalSearch internalSearch = gesture.InternalSearch("test" + id, id, id);
+        Assert.assertNotNull(internalSearch);
+        Assert.assertEquals(gesture.InternalSearch("", 0, 0), internalSearch);
+
+        internalSearch = gesture.InternalSearch("", 0, 0);
+
+        Assert.assertEquals(internalSearch.getKeyword(), "test" + id);
+        Assert.assertEquals(internalSearch.getResultScreenNumber(), id);
+        Assert.assertEquals(internalSearch.getResultPosition(), id);
+    }
+
     @Test
     public void setTest() {
         assertEquals("toto", gesture.setName("toto").getName());

ATMobileAnalytics/Tracker/src/test/java/com/atinternet/tracker/InternalSearchTest.java

@@ -49,7 +49,7 @@ public void setUp() throws Exception {
     @Test
     public void initTest() {
         assertNull(internalSearch.getKeyword());
-        assertEquals(-1, internalSearch.getResultScreenNumber());
+        assertEquals(1, internalSearch.getResultScreenNumber());
         assertEquals(-1, internalSearch.getResultPosition());
     }
 

DeliveryProject/core.manifest.json

@@ -1,7 +1,7 @@
 {
     "name":"Core",
     "description": "Geode_Tag_Android_Description",
-    "version": "2.3.3",
+    "version": "2.3.4",
     "type": "core",
     "config": {
         "storage":

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.3.3'
+	   compile 'com.atinternet:Tracker:2.3.4'
 
 ### License
 MIT