Use v2.5.1

Author: mhmdnagy

CHANGELOG.md

@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 2.5.1 *(2016-07-11)*
+----------------------------
+
+ * Various bug fixes
+
 Version 2.5.0 *(2016-06-27)*
 ----------------------------
 

README.md

@@ -28,38 +28,38 @@ Using Instabug is as easy as "Get ready, Get set, Go".
 
     Grab your desired flavour via Gradle:
     ```groovy
-        compile 'com.instabug.library:instabug:2.5.0'
+        compile 'com.instabug.library:instabug:2.5.1'
     ```
     or
     ```groovy
-        compile 'com.instabug.library:instabugcompat:2.5.0'
+        compile 'com.instabug.library:instabugcompat:2.5.1'
     ```
     or
     ```groovy
-        compile 'com.instabug.library:instabugabs:2.5.0'
+        compile 'com.instabug.library:instabugabs:2.5.1'
     ```
     or via Maven: (if you're that kind of person :bowtie:)
     ```xml
         <dependency>
           <groupId>com.instabug.library</groupId>
           <artifactId>instabug</artifactId>
-          <version>2.5.0</version>
+          <version>2.5.1</version>
         </dependency>
     ```
     or 
     ```xml
         <dependency>
           <groupId>com.instabug.library</groupId>
           <artifactId>instabugcompat</artifactId>
-          <version>2.5.0</version>
+          <version>2.5.1</version>
         </dependency>
     ```
     or
     ```xml
         <dependency>
           <groupId>com.instabug.library</groupId>
           <artifactId>instabugabs</artifactId>
-          <version>2.5.0</version>
+          <version>2.5.1</version>
         </dependency>
     ```
 

app/build.gradle

@@ -36,11 +36,11 @@ dependencies {
     compile 'com.android.support:design:23.2.0'
     compile 'com.android.support:appcompat-v7:23.2.0'
     // 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
-    compile 'com.google.android.gms:play-services:9.0.0'
+    compile 'com.google.android.gms:play-services:9.2.0'
     // TODO add the following 2 lines if you exclude io.reactivex from Instabug
 //    compile 'io.reactivex:rxjava:1.0.13'
 //    compile 'io.reactivex:rxandroid:1.0.1'
-    compile('com.instabug.library:instabug:2.5.0') {
+    compile('com.instabug.library:instabug:2.5.1') {
         // 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/gcm/QuickstartPreferences.java

@@ -0,0 +1,10 @@
+package com.example.instabug.gcm;
+
+/**
+ * Created by vezikon on 6/27/16.
+ */
+public class QuickstartPreferences {
+    public static final String SENT_TOKEN_TO_SERVER = "sentTokenToServer";
+    public static final String REGISTRATION_COMPLETE = "registrationComplete";
+    public static final String SENDER_ID = "1069386656344";
+}

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

@@ -9,15 +9,16 @@
 import com.example.instabug.R;
 import com.example.instabug.ui.views.CustomGoogleMap;
 import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.SupportMapFragment;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.MarkerOptions;
 import com.instabug.library.Instabug;
 
-public class GoogleMapsActivity extends AppCompatActivity {
+public class GoogleMapsActivity extends AppCompatActivity implements OnMapReadyCallback {
 
     private GoogleMap mMap; // Might be null if Google Play services APK is not available.
-    private CustomGoogleMap customGoogleMap;
+    private SupportMapFragment mapFragment;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -30,45 +31,10 @@ public void onClick(View v) {
                 Toast.makeText(GoogleMapsActivity.this, "File saved to be uploaded", Toast.LENGTH_SHORT).show();
             }
         });
-        setUpMapIfNeeded();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        setUpMapIfNeeded();
-    }
-
-    /**
-     * Sets up the map if it is possible to do so (i.e., the Google Play services APK is correctly
-     * installed) and the map has not already been instantiated.. This will ensure that we only ever
-     * call {@link #setUpMap()} once when {@link #mMap} is not null.
-     * <p/>
-     * If it isn't installed {@link com.google.android.gms.maps.SupportMapFragment} (and
-     * {@link com.google.android.gms.maps.MapView MapView}) will show a prompt for the user to
-     * install/update the Google Play services APK on their device.
-     * <p/>
-     * A user can return to this FragmentActivity after following the prompt and correctly
-     * installing/updating/enabling the Google Play services. Since the FragmentActivity may not
-     * have been completely destroyed during this process (it is likely that it would only be
-     * stopped or paused), {@link #onCreate(Bundle)} may not be called again so we should call this
-     * method in {@link #onResume()} to guarantee that it will be called.
-     */
-    private void setUpMapIfNeeded() {
-        // Do a null check to confirm that we have not already instantiated the map.
-        if (mMap == null) {
-            // Try to obtain the map from the SupportMapFragment.
-            mMap = ((SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map))
-                    .getMap();
-            customGoogleMap = new CustomGoogleMap(getSupportFragmentManager().findFragmentById(R.id.map).getView(), mMap);
-            // TODO add this so that instabug recognizes you have a map and show it in the screenshot
-            Instabug.addCapturableView(customGoogleMap);
 
-            // Check if we were successful in obtaining the map.
-            if (mMap != null) {
-                setUpMap();
-            }
-        }
+        mapFragment =
+        (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map);
+        mapFragment.getMapAsync(this);
     }
 
     /**
@@ -80,4 +46,14 @@ private void setUpMapIfNeeded() {
     private void setUpMap() {
         mMap.addMarker(new MarkerOptions().position(new LatLng(0, 0)).title("Marker"));
     }
+
+    @Override
+    public void onMapReady(GoogleMap googleMap) {
+        mMap = googleMap;
+        CustomGoogleMap customGoogleMap = new CustomGoogleMap(mapFragment.getView(), mMap);
+        // TODO add this so that instabug recognizes you have a map and show it in the screenshot
+        Instabug.addCapturableView(customGoogleMap);
+
+        setUpMap();
+    }
 }