feat: remove legacy targeting method

Author: ValentinPostindustria

DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/IdentifyFragment.java

@@ -5,10 +5,10 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
-import android.widget.Switch;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import co.optable.android_sdk.OptableIdentifiers;
 import co.optable.android_sdk.OptableResult;
 import co.optable.android_sdk.OptableSDK;
 import co.optable.demoappjava.R;
@@ -19,7 +19,6 @@ public class IdentifyFragment extends Fragment {
 
     private TextView identifyView;
     private EditText emailText;
-    private Switch gaidSwitch;
 
     private OptableSDK optable;
 
@@ -34,15 +33,17 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
     private void initUi(View root) {
         identifyView = root.findViewById(R.id.identifyView);
         emailText = root.findViewById(R.id.editTextTextEmailAddress);
-        gaidSwitch = root.findViewById(R.id.gaidSwitch);
 
         root.findViewById(R.id.identifyButton).setOnClickListener(view -> onClickIdentify());
     }
 
     private void onClickIdentify() {
         identifyView.setText("");
 
-        optable.identify(emailText.getText().toString(), gaidSwitch.isChecked(), result -> {
+        OptableIdentifiers ids = new OptableIdentifiers.Builder()
+                .email(emailText.getText().toString())
+                .build();
+        optable.identify(ids, result -> {
             if (result instanceof OptableResult.Success) {
                 identifyView.setText("Identify success");
             } else if (result instanceof OptableResult.Error<Unit> error) {

DemoApp/DemoAppJava/app/src/main/res/layout/fragment_identify.xml

@@ -28,17 +28,6 @@
         android:layout_marginTop="8dp"
         android:text="Identify"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/gaidSwitch" />
-
-    <Switch
-        android:id="@+id/gaidSwitch"
-        android:layout_width="84dp"
-        android:layout_height="40dp"
-        android:layout_marginStart="32dp"
-        android:layout_marginLeft="32dp"
-        android:layout_marginTop="8dp"
-        android:text="GAID"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/editTextTextEmailAddress" />
 
     <TextView
@@ -49,4 +38,5 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/identifyButton" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/IdentifyFragment.kt

@@ -6,9 +6,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.EditText
-import android.widget.Switch
 import android.widget.TextView
 import androidx.fragment.app.Fragment
+import co.optable.android_sdk.OptableIdentifiers
 import co.optable.android_sdk.OptableResult
 import co.optable.android_sdk.OptableSDK
 import co.optable.androidsdkdemo.R
@@ -18,7 +18,6 @@ class IdentifyFragment : Fragment() {
 
     private lateinit var identifyView: TextView
     private lateinit var emailText: EditText
-    private lateinit var gaidSwitch: Switch
 
     private lateinit var optable: OptableSDK
 
@@ -36,7 +35,6 @@ class IdentifyFragment : Fragment() {
     private fun initUi(root: View) {
         identifyView = root.findViewById(R.id.identifyView)
         emailText = root.findViewById(R.id.editTextTextEmailAddress)
-        gaidSwitch = root.findViewById(R.id.gaidSwitch)
 
         root.findViewById<Button>(R.id.identifyButton).setOnClickListener {
             onClickIdentify()
@@ -46,10 +44,10 @@ class IdentifyFragment : Fragment() {
     private fun onClickIdentify() {
         identifyView.text = ""
 
-        val email = emailText.text.toString()
-        val gaidStatus = gaidSwitch.isChecked
-
-        optable.identify(email, gaidStatus) { result ->
+        val ids = OptableIdentifiers.Builder()
+            .email(emailText.getText().toString())
+            .build()
+        optable.identify(ids) { result ->
             val msg = when (result) {
                 is OptableResult.Success -> "Identify success"
                 is OptableResult.Error -> "Identify error: ${result.message}"

DemoApp/DemoAppKotlin/app/src/main/res/layout/fragment_identify.xml

@@ -28,17 +28,6 @@
         android:layout_marginTop="8dp"
         android:text="Identify"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/gaidSwitch" />
-
-    <Switch
-        android:id="@+id/gaidSwitch"
-        android:layout_width="84dp"
-        android:layout_height="40dp"
-        android:layout_marginStart="32dp"
-        android:layout_marginLeft="32dp"
-        android:layout_marginTop="8dp"
-        android:text="GAID"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/editTextTextEmailAddress" />
 
     <TextView

android_sdk/src/main/java/co/optable/android_sdk/OptableSDK.kt

@@ -57,37 +57,6 @@ class OptableSDK(
         }
     }
 
-
-    /**
-     *  Calls the Optable Sandbox "identify" API, passing only email, GAID and PPID.
-     *
-     *  @param email email address to identify (encrypted with SHA256)
-     *  @param gaid Should receive Google Advertising ID of the device
-     *  @param ppid Should receive PPID of the device
-     */
-    @JvmOverloads
-    fun identify(email: String, gaid: Boolean = false, ppid: String? = null, listener: OptableResultListener<Unit>) {
-        val emailValue = if (email.isNotBlank() && android.util.Patterns.EMAIL_ADDRESS.matcher(email).matches()) {
-            email
-        } else null
-
-        val gaid = if (gaid) {
-            adIdManager.getId()
-        } else null
-
-        val ppid = if (ppid != null) {
-            listOf("c:$ppid")
-        } else null
-
-        val ids = OptableIdentifiers(
-            email = emailValue,
-            googleGaid = gaid,
-            raw = ppid
-        )
-
-        return identify(ids, listener)
-    }
-
     /**
      * tryIdentifyFromURI(uri) is a helper that attempts to find a valid-looking "oeid"
      * parameter in the specified uri's query string parameters and, if found, calls