Updating Instabug-SDK version to v8.0.2 and migrating to new APIs (#106)

Author: mzelzoghbi

app/build.gradle

@@ -50,7 +50,7 @@ dependencies {
     // TODO add the following 2 lines if you exclude io.reactivex from Instabug
 //    implementation 'io.reactivex:rxjava:1.0.13'
 //    implementation 'io.reactivex:rxandroid:1.0.1'
-    implementation('com.instabug.library:instabug:4.15.0') {
+    implementation('com.instabug.library:instabug:8.0.2') {
         // TODO uncomment this line to exclude RxJava from Instabug and use your own version
 //        exclude group: 'io.reactivex'
 

app/src/main/java/com/example/instabug/SampleApplication.java

@@ -27,11 +27,12 @@ public void onCreate() {
 
         //initialing instabug
         new Instabug.Builder(this, "48ad905e141bc665d064945f423aa414")
-                .setInvocationEvent(InstabugInvocationEvent.SHAKE)
+                .setInvocationEvents(InstabugInvocationEvent.SHAKE, InstabugInvocationEvent.SCREENSHOT_GESTURE,
+                        InstabugInvocationEvent.FLOATING_BUTTON, InstabugInvocationEvent.TWO_FINGER_SWIPE_LEFT)
                 .build();
 
         //Choosing instabug theme
-        Instabug.setTheme(InstabugColorTheme.InstabugColorThemeLight);
+        Instabug.setColorTheme(InstabugColorTheme.InstabugColorThemeLight);
         //Choosing type of attachments allowed
         //1. initial screenshot, 2. extra screenshot, 3. image from gallery, 4. voice note
         //5. screen record

app/src/main/java/com/example/instabug/ui/activities/MainActivity.java

@@ -13,10 +13,13 @@
 import com.example.instabug.BaseActivity;
 import com.example.instabug.R;
 import com.example.instabug.fcm.RegistrationIntentService;
+import com.instabug.bug.BugReporting;
+import com.instabug.featuresrequest.FeatureRequests;
 import com.instabug.library.Instabug;
 import com.instabug.library.logging.InstabugLog;
 import com.instabug.library.logging.InstabugNetworkLog;
 import com.instabug.library.ui.onboarding.WelcomeMessage;
+import com.instabug.survey.Surveys;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -62,7 +65,7 @@ public void onShowBetaOnboardingMessageClicked(View view) {
     }
 
     public void onShowInstabugClicked(View view) {
-        Instabug.invoke();
+        BugReporting.invoke();
     }
 
     public void onCrashTheAppClicked(View view) {
@@ -80,15 +83,15 @@ public void onClick(DialogInterface dialog, int which) {
     }
 
     public void showNPSSurvey(View view) {
-        Instabug.showSurvey("ulUaFocMCejDr3Ldd8VBaA");
+        Surveys.showSurvey("ulUaFocMCejDr3Ldd8VBaA");
     }
 
     public void showMultipleQuestionSurvey(View view) {
-        Instabug.showSurvey("AGI5OH47k3eEAIKj-yKDWA");
+        Surveys.showSurvey("AGI5OH47k3eEAIKj-yKDWA");
     }
 
     public void showFeatureRequests(View view) {
-        Instabug.showFeatureRequests();
+        FeatureRequests.show();
     }
 
     public void onShowSettingsClicked(View view) {

app/src/main/java/com/example/instabug/ui/activities/SettingsActivity.java

@@ -6,18 +6,24 @@
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.Toast;
 
 import com.example.instabug.BaseActivity;
 import com.example.instabug.R;
+import com.instabug.bug.BugReporting;
 import com.instabug.library.Instabug;
 import com.instabug.library.InstabugColorTheme;
 import com.instabug.library.invocation.InstabugInvocationEvent;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+
 import petrov.kristiyan.colorpicker.ColorPicker;
 
 public class SettingsActivity extends BaseActivity {
+
+    final String[] invocationEvents = getInvocationEventsNames(InstabugInvocationEvent.class);
+    final boolean[] invocationEventsState = {false, false, false, false, false};
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -26,37 +32,45 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
+
+        for (int i = 0; i < invocationEvents.length; i++) {
+            invocationEvents[i] = invocationEvents[i].replace("_", " ");
+        }
     }
 
     public void onShowInvocationEventsClicked(View view) {
-        final CharSequence[] items = {"Shake", "Floating Button", "Screenshot", "Two Finger Swipe", "None"};
-
+        // reset events
+        for (int i = 0; i < invocationEventsState.length; i++) {
+            invocationEventsState[i] = false;
+        }
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle("Select Invocation Event");
-        builder.setItems(items, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int item) {
-                switch (item) {
-                    case 0:
-                        Instabug.changeInvocationEvent(InstabugInvocationEvent.SHAKE);
-                        break;
-                    case 1:
-                        Instabug.changeInvocationEvent(InstabugInvocationEvent.FLOATING_BUTTON);
-                        break;
-                    case 2:
-                        Instabug.changeInvocationEvent(InstabugInvocationEvent.SCREENSHOT_GESTURE);
-                        break;
-                    case 3:
-                        Instabug.changeInvocationEvent(InstabugInvocationEvent.TWO_FINGER_SWIPE_LEFT);
-                        break;
-                    case 4:
-                        Instabug.changeInvocationEvent(InstabugInvocationEvent.NONE);
-                        break;
+        builder.setTitle("Select Invocation Events");
+        builder.setMultiChoiceItems(invocationEvents, null, new DialogInterface.OnMultiChoiceClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which, boolean isChecked) {
+                invocationEventsState[which] = isChecked;
+            }
+        });
+        builder.setPositiveButton("Done", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                ArrayList<InstabugInvocationEvent> selectedEvents = new ArrayList();
+                for (int i = 0; i < invocationEvents.length; i++) {
+                    if (invocationEventsState[i]) {
+                        selectedEvents.add(InstabugInvocationEvent.valueOf(invocationEvents[i].toUpperCase().replace(" ", "_")));
+                    }
                 }
+                // set new invocation events here
+                BugReporting.setInvocationEvents(selectedEvents.toArray(new InstabugInvocationEvent[selectedEvents.size()]));
             }
         });
         builder.show();
     }
 
+    public static String[] getInvocationEventsNames(Class<? extends Enum<?>> e) {
+        return Arrays.toString(e.getEnumConstants()).replaceAll("^.|.$", "").split(", ");
+    }
+
     public void onChangeThemeClicked(View view) {
         final CharSequence[] items = {"Light", "Dark"};
 
@@ -66,10 +80,10 @@ public void onChangeThemeClicked(View view) {
             public void onClick(DialogInterface dialog, int item) {
                 switch (item) {
                     case 0:
-                        Instabug.setTheme(InstabugColorTheme.InstabugColorThemeLight);
+                        Instabug.setColorTheme(InstabugColorTheme.InstabugColorThemeLight);
                         break;
                     case 1:
-                        Instabug.setTheme(InstabugColorTheme.InstabugColorThemeDark);
+                        Instabug.setColorTheme(InstabugColorTheme.InstabugColorThemeDark);
                         break;
                 }
             }
@@ -83,9 +97,7 @@ public void onChangePrimaryColorClicked(View view) {
         colorPicker.setOnChooseColorListener(new ColorPicker.OnChooseColorListener() {
             @Override
             public void onChooseColor(int position, int color) {
-                Instabug.disable();
                 Instabug.setPrimaryColor(color);
-                Instabug.enable();
             }
 
             @Override