Merge pull request #96 from Instabug/update-sample-app

Updating sample app

Author: mhmdnagy

app/build.gradle

@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 27
 
     defaultConfig {
         applicationId "com.example.instabug"
         minSdkVersion 15
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -41,21 +40,25 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:multidex:1.0.2'
-    implementation 'com.android.support:design:26.0.2'
-    implementation 'com.android.support:appcompat-v7:26.0.2'
-    // TODO if you use a lower version than 9.0.0 (min is 7.5.0) you should uncomment the exclude line to avoid errors
-    implementation 'com.google.android.gms:play-services:11.4.2'
+    implementation 'com.android.support:multidex:1.0.3'
+    implementation "com.android.support:design:$rootProject.ext.androidSupport"
+    implementation "com.android.support:appcompat-v7:$rootProject.ext.androidSupport"
+
+    implementation 'com.google.firebase:firebase-core:16.0.0'
+    implementation 'com.google.firebase:firebase-messaging:17.0.0'
+
     // 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.11.1') {
+    implementation('com.instabug.library:instabug:4.15.0') {
         // TODO uncomment this line to exclude RxJava from Instabug and use your own version
 //        exclude group: 'io.reactivex'
 
         // TODO uncomment next line if you're facing compilation issue in build.gradle about gms different versions
 //        exclude group: 'com.android.support'
     }
+    implementation 'petrov.kristiyan:colorpicker-library:1.1.8'
+
 
 
 }

app/proguard-rules.pro

@@ -15,4 +15,6 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
--dontwarn butterknife.internal.**
+-dontwarn butterknife.internal.**
+-keep class com.google.firebase.provider.FirebaseInitProvider
+-keep class com.example.instabug.**

app/src/main/AndroidManifest.xml

@@ -36,8 +36,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <activity android:name=".ui.activities.GoogleMapsActivity" />
+        <activity android:name=".ui.activities.SettingsActivity"
+            android:theme="@style/AppTheme.NoActionBar"/>
 
         <meta-data
             android:name="com.google.android.gms.version"
@@ -46,32 +46,21 @@
             android:name="com.google.android.geo.API_KEY"
             android:value="AIzaSyD1NsFNyD12H_4lzgzth7lUxUAbZzyKEL4" />
 
-        <activity android:name=".ui.activities.OpenGLActivity" />
-
-        <receiver
-            android:name="com.google.android.gms.gcm.GcmReceiver"
-            android:exported="true"
-            android:permission="com.google.android.c2dm.permission.SEND">
-            <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-                <category android:name="com.example.instabug" />
-            </intent-filter>
-        </receiver>
-
         <service
-            android:name="com.example.instabug.gcm.InstabugGCMListenerService"
+            android:name="com.example.instabug.fcm.InstabugFCMListenerService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
             </intent-filter>
         </service>
+
         <service
-            android:name="com.example.instabug.gcm.InstabugInstanceIDListenerService"
+            android:name="com.example.instabug.fcm.InstabugInstanceIDListenerService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.android.gms.iid.InstanceID" />
             </intent-filter>
         </service>
-        <service android:name="com.example.instabug.gcm.RegistrationIntentService"/>
+        <service android:name="com.example.instabug.fcm.RegistrationIntentService"/>
     </application>
 </manifest>

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

@@ -1,46 +1,47 @@
 package com.example.instabug;
 
 import android.app.Application;
+import android.content.Context;
 import android.support.multidex.MultiDex;
 
 import com.instabug.library.Instabug;
 import com.instabug.library.InstabugColorTheme;
 import com.instabug.library.InstabugCustomTextPlaceHolder;
-import com.instabug.library.bugreporting.model.ReportCategory;
 import com.instabug.library.internal.module.InstabugLocale;
 import com.instabug.library.invocation.InstabugInvocationEvent;
+import com.instabug.library.ui.onboarding.WelcomeMessage;
 
-import java.util.ArrayList;
 import java.util.Locale;
 
 
 public class SampleApplication extends Application {
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        MultiDex.install(this);
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();
-        MultiDex.install(this);
 
         //initialing instabug
-        new Instabug.Builder(this, "f501f761142981d54b1fdea93963a934")
+        new Instabug.Builder(this, "48ad905e141bc665d064945f423aa414")
                 .setInvocationEvent(InstabugInvocationEvent.SHAKE)
                 .build();
 
-        //adding some customizations
-        Instabug.setEmailFieldRequired(false);
         //Choosing instabug theme
         Instabug.setTheme(InstabugColorTheme.InstabugColorThemeLight);
         //Choosing type of attachments allowed
         //1. initial screenshot, 2. extra screenshot, 3. image from gallery, 4. voice note
         //5. screen record
-        Instabug.setAttachmentTypesEnabled(true, true, true, true, true);
-        //For setting instabug bug intro message enabled or disabled
-        Instabug.setIntroMessageEnabled(false);
+        Instabug.setWelcomeMessageState(WelcomeMessage.State.LIVE);
 
         // TODO the following are 3 acceptable ways to force Locale in Instabug (last one is the only 1 applied)
         Instabug.setLocale(new Locale(InstabugLocale.SIMPLIFIED_CHINESE.getCode(),
                 InstabugLocale.SIMPLIFIED_CHINESE.getCountry()));
         Instabug.setLocale(new Locale(InstabugLocale.FRENCH.getCode()));
-        Instabug.setLocale(Locale.GERMAN);
+        Instabug.setLocale(Locale.ENGLISH);
 
         //To show instabug debug logs if necessary
         Instabug.setDebugEnabled(true);
@@ -52,21 +53,9 @@ public void onCreate() {
 
         Instabug.setCustomTextPlaceHolders(placeHolder);
 
-        //Setting report categories
-        ArrayList<ReportCategory> reportCategories = new ArrayList<>();
-        reportCategories.add(
-                ReportCategory.getInstance().withLabel("Map").withIcon(android.R.drawable
-                        .ic_dialog_map));
-        reportCategories.add(ReportCategory.getInstance()
-                .withLabel("Alert")
-                .withIcon(android.R.drawable.ic_dialog_alert));
-        reportCategories.add(
-                ReportCategory.getInstance().withLabel("Mail").withIcon(android.R.drawable
-                        .ic_dialog_email));
-
-        Instabug.setReportCategories(reportCategories);
-
         //setting user attributes
         Instabug.setUserAttribute("USER_TYPE", "instabug user");
+
+        Instabug.setAutoScreenRecordingEnabled(true);
     }
 }

app/src/main/java/com/example/instabug/gcm/InstabugGCMListenerService.java renamed to app/src/main/java/com/example/instabug/fcm/InstabugFCMListenerService.java

@@ -1,8 +1,9 @@
-package com.example.instabug.gcm;
+package com.example.instabug.fcm;
 
 import com.example.instabug.R;
 import com.example.instabug.ui.activities.MainActivity;
-import com.google.android.gms.gcm.GcmListenerService;
+import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.firebase.messaging.RemoteMessage;
 import com.instabug.library.Instabug;
 
 import android.app.NotificationManager;
@@ -11,44 +12,37 @@
 import android.content.Intent;
 import android.media.RingtoneManager;
 import android.net.Uri;
-import android.os.Bundle;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 
 /**
  * Created by vezikon on 6/27/16.
  */
-public class InstabugGCMListenerService extends GcmListenerService {
-    private static final String TAG = "InstabugGCMListenerService";
+public class InstabugFCMListenerService extends FirebaseMessagingService {
+    private static final String TAG = "FCMListenerService";
 
-    /**
-     * Called when message is received.
-     *
-     * @param from SenderID of the sender.
-     * @param data Data bundle containing message data as key/value pairs.
-     *             For Set of keys use data.keySet().
-     */
-    // [START receive_message]
     @Override
-    public void onMessageReceived(String from, Bundle data) {
-        String message = data.getString("message");
-        Log.d(TAG, "From: " + from);
+    public void onMessageReceived(RemoteMessage remoteMessage) {
+        super.onMessageReceived(remoteMessage);
+
+        String message = remoteMessage.getData().get("message");
+        Log.d(TAG, "From: " + remoteMessage.getFrom());
         Log.d(TAG, "Message: " + message);
 
         //Check first if notification related to Instabug or not
-        if(Instabug.isInstabugNotification(data)){
+        if (Instabug.isInstabugNotification(remoteMessage.getData())) {
             //Shown notification related to Instabug
-            Instabug.showNotification(data);
-        }else {
+            Instabug.showNotification(remoteMessage.getData());
+        } else {
             sendNotification(message);
         }
+
     }
-    // [END receive_message]
 
     /**
-     * Create and show a simple notification containing the received GCM message.
+     * Create and show a simple notification containing the received FCM message.
      *
-     * @param message GCM message received.
+     * @param message FCM message received.
      */
     private void sendNotification(String message) {
         Intent intent = new Intent(this, MainActivity.class);
@@ -59,7 +53,7 @@ private void sendNotification(String message) {
         Uri defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
         NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this)
                 .setSmallIcon(R.mipmap.ic_launcher)
-                .setContentTitle("GCM Message")
+                .setContentTitle("FCM Message")
                 .setContentText(message)
                 .setAutoCancel(true)
                 .setSound(defaultSoundUri)

app/src/main/java/com/example/instabug/gcm/InstabugInstanceIDListenerService.java renamed to app/src/main/java/com/example/instabug/fcm/InstabugInstanceIDListenerService.java

@@ -1,13 +1,13 @@
-package com.example.instabug.gcm;
+package com.example.instabug.fcm;
 
 import android.content.Intent;
 
-import com.google.android.gms.iid.InstanceIDListenerService;
+import com.google.firebase.iid.FirebaseInstanceIdService;
 
 /**
  * Created by vezikon on 6/27/16.
  */
-public class InstabugInstanceIDListenerService extends InstanceIDListenerService {
+public class InstabugInstanceIDListenerService extends FirebaseInstanceIdService {
 
     private static final String TAG = "InstabugInstanceIDLS";
 

app/src/main/java/com/example/instabug/gcm/QuickstartPreferences.java renamed to app/src/main/java/com/example/instabug/fcm/QuickstartPreferences.java

@@ -1,4 +1,4 @@
-package com.example.instabug.gcm;
+package com.example.instabug.fcm;
 
 /**
  * Created by vezikon on 6/27/16.

app/src/main/java/com/example/instabug/gcm/RegistrationIntentService.java renamed to app/src/main/java/com/example/instabug/fcm/RegistrationIntentService.java

@@ -1,13 +1,12 @@
-package com.example.instabug.gcm;
+package com.example.instabug.fcm;
 
 import android.app.IntentService;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
-import com.google.android.gms.gcm.GoogleCloudMessaging;
-import com.google.android.gms.iid.InstanceID;
+import com.google.firebase.iid.FirebaseInstanceId;
 import com.instabug.library.Instabug;
 
 
@@ -28,17 +27,15 @@ protected void onHandleIntent(Intent intent) {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
 
         try {
-            // [START register_for_gcm]
+            // [START register_for_fcm]
             // Initially this call goes out to the network to retrieve the token, subsequent calls
             // are local.
-            // R.string.gcm_defaultSenderId (the Sender ID) is typically derived from google-services.json.
+            // R.string.fcm_defaultSenderId (the Sender ID) is typically derived from google-services.json.
             // See https://developers.google.com/cloud-messaging/android/start for details on this file.
             // [START get_token]
-            InstanceID instanceID = InstanceID.getInstance(this);
-            String token = instanceID.getToken(QuickstartPreferences.SENDER_ID,
-                    GoogleCloudMessaging.INSTANCE_ID_SCOPE, null);
+            String token = FirebaseInstanceId.getInstance().getToken();
             // [END get_token]
-            Log.i(TAG, "GCM Registration Token: " + token);
+            Log.i(TAG, "FCM Registration Token: " + token);
 
             // TODO: Implement this method to send any registration to your app's servers.
             sendRegistrationToServer(token);
@@ -47,7 +44,7 @@ protected void onHandleIntent(Intent intent) {
             // sent to your server. If the boolean is false, send the token to your server,
             // otherwise your server should have already received the token.
             sharedPreferences.edit().putBoolean(QuickstartPreferences.SENT_TOKEN_TO_SERVER, true).apply();
-            // [END register_for_gcm]
+            // [END register_for_fcm]
         } catch (Exception e) {
             Log.d(TAG, "Failed to complete token refresh", e);
             // If an exception happens while fetching the new token or updating our registration data
@@ -62,7 +59,7 @@ protected void onHandleIntent(Intent intent) {
     /**
      * Persist registration to third-party servers.
      *
-     * Modify this method to associate the user's GCM registration token with any server-side account
+     * Modify this method to associate the user's FCM registration token with any server-side account
      * maintained by your application.
      *
      * @param token The new token.