Remove push tracking in CT and add license information (#519)

hborisoff · web-flow · commit de0a425b2d1f · 2022-10-13T11:31:32.000+03:00
* Filter Push Delivered and Push Opened in wrapper

* Add license information
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/callbacks/CleverTapInstanceCallback.java b/AndroidSDKCore/src/main/java/com/leanplum/callbacks/CleverTapInstanceCallback.java
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2022, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.leanplum.callbacks;
 
 import androidx.annotation.NonNull;
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/internal/Constants.java b/AndroidSDKCore/src/main/java/com/leanplum/internal/Constants.java
@@ -253,6 +253,8 @@ static class Files {
     public static final int MAX_UPLOAD_BATCH_FILES = 16;
   }
 
+  public static final String PUSH_DELIVERED_EVENT_NAME = "Push Delivered";
+  public static final String PUSH_OPENED_EVENT_NAME = "Push Opened";
   public static final String HELD_BACK_EVENT_NAME = "Held Back";
   public static final String HELD_BACK_MESSAGE_PREFIX = "__held_back__";
 
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/migration/MigrationConstants.kt b/AndroidSDKCore/src/main/java/com/leanplum/migration/MigrationConstants.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2022, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.leanplum.migration
 
 import com.clevertap.android.sdk.CleverTapAPI
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/migration/MigrationManager.kt b/AndroidSDKCore/src/main/java/com/leanplum/migration/MigrationManager.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2022, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.leanplum.migration
 
 import com.leanplum.callbacks.CleverTapInstanceCallback
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/migration/ResponseHandler.kt b/AndroidSDKCore/src/main/java/com/leanplum/migration/ResponseHandler.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2022, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.leanplum.migration
 
 import com.leanplum.internal.Constants.Params
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/migration/model/MigrationConfig.kt b/AndroidSDKCore/src/main/java/com/leanplum/migration/model/MigrationConfig.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2022, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.leanplum.migration.model
 
 import com.leanplum.internal.CollectionUtil
@@ -32,8 +53,7 @@ object MigrationConfig {
       return field
     }
 
-  // TODO read from getMigrateState and set false as default
-  var trackGooglePlayPurchases = true//false
+  var trackGooglePlayPurchases = true
     private set
 
   fun update(data: ResponseData) {
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/migration/model/MigrationState.kt b/AndroidSDKCore/src/main/java/com/leanplum/migration/model/MigrationState.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2022, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.leanplum.migration.model
 
 enum class MigrationState {
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/migration/model/ResponseData.kt b/AndroidSDKCore/src/main/java/com/leanplum/migration/model/ResponseData.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2022, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.leanplum.migration.model
 
 data class ResponseData(
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/migration/push/FcmMigrationHandler.kt b/AndroidSDKCore/src/main/java/com/leanplum/migration/push/FcmMigrationHandler.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2022, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.leanplum.migration.push
 
 import com.clevertap.android.sdk.pushnotification.fcm.CTFcmMessageHandler
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/migration/push/HmsMigrationHandler.kt b/AndroidSDKCore/src/main/java/com/leanplum/migration/push/HmsMigrationHandler.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2022, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.leanplum.migration.push
 
 import android.content.Context
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/migration/push/MiPushMigrationHandler.kt b/AndroidSDKCore/src/main/java/com/leanplum/migration/push/MiPushMigrationHandler.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2022, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.leanplum.migration.push
 
 import android.content.Context
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/CTWrapper.kt b/AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/CTWrapper.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2022, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.leanplum.migration.wrapper
 
 import android.app.Application
@@ -6,6 +27,7 @@ import com.clevertap.android.sdk.ActivityLifecycleCallback
 import com.clevertap.android.sdk.CleverTapAPI
 import com.clevertap.android.sdk.CleverTapInstanceConfig
 import com.leanplum.callbacks.CleverTapInstanceCallback
+import com.leanplum.internal.Constants
 import com.leanplum.internal.Log
 import com.leanplum.migration.MigrationConstants
 import com.leanplum.migration.MigrationManager
@@ -103,6 +125,9 @@ internal class CTWrapper(
     params: Map<String, Any?>?
   ) {
     if (event == null) return
+    if (event == Constants.PUSH_DELIVERED_EVENT_NAME || event == Constants.PUSH_OPENED_EVENT_NAME) {
+      return
+    }
 
     val properties =
       params?.mapValues(::mapNotSupportedValues)?.toMutableMap()
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/IWrapper.kt b/AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/IWrapper.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2022, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.leanplum.migration.wrapper
 
 import android.app.Application
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/IdentityManager.kt b/AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/IdentityManager.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2022, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.leanplum.migration.wrapper
 
 import com.leanplum.internal.Log
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/NullWrapper.kt b/AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/NullWrapper.kt
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2022, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package com.leanplum.migration.wrapper
 
 /**
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/StaticMethodsWrapper.kt b/AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/StaticMethodsWrapper.kt
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/WrapperFactory.kt b/AndroidSDKCore/src/main/java/com/leanplum/migration/wrapper/WrapperFactory.kt
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/utils/StringPreference.kt b/AndroidSDKCore/src/main/java/com/leanplum/utils/StringPreference.kt
diff --git a/AndroidSDKCore/src/main/java/com/leanplum/utils/StringPreferenceNullable.kt b/AndroidSDKCore/src/main/java/com/leanplum/utils/StringPreferenceNullable.kt
diff --git a/AndroidSDKPush/src/main/java/com/leanplum/PushTracking.java b/AndroidSDKPush/src/main/java/com/leanplum/PushTracking.java

Original file line number	Diff line number	Diff line change
`@@ -253,6 +253,8 @@ static class Files {`
`253`	`253`	`public static final int MAX_UPLOAD_BATCH_FILES = 16;`
`254`	`254`	`}`
`255`	`255`
	`256`	`+ public static final String PUSH_DELIVERED_EVENT_NAME = "Push Delivered";`
	`257`	`+ public static final String PUSH_OPENED_EVENT_NAME = "Push Opened";`
`256`	`258`	`public static final String HELD_BACK_EVENT_NAME = "Held Back";`
`257`	`259`	`public static final String HELD_BACK_MESSAGE_PREFIX = "__held_back__";`
`258`	`260`