Merge pull request #1 from sunnygleason/master

fix a few typos

Author: stephenlb

app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/flightpaths/FlightPathsTabContentFragment.java

@@ -96,7 +96,7 @@ public void onResponse(PNPublishResult result, PNStatus status) {
                                             if (!status.isError()) {
                                                 Log.v(TAG, "publish(" + JsonUtil.asJson(result) + ")");
                                             } else {
-                                                Log.v(TAG, "publishErr(" + JsonUtil.asJson(status) + ")");
+                                                Log.v(TAG, "publishErr(" + status.toString() + ")");
                                             }
                                         } catch (Exception e) {
                                             e.printStackTrace();

app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationpublish/LocationPublishMapAdapter.java

@@ -32,7 +32,6 @@ public void locationUpdated(final Map<String, String> newLocation) {
         } else {
             Log.w(TAG, "message ignored: " + newLocation.toString());
         }
-
     }
 
     private void doUiUpdate(final LatLng location) {
@@ -46,7 +45,6 @@ public void run() {
                 }
 
                 map.moveCamera(CameraUpdateFactory.newLatLng(location));
-
             }
         });
     }

app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationpublish/LocationPublishPnCallback.java

@@ -15,10 +15,10 @@
 
 public class LocationPublishPnCallback extends SubscribeCallback {
     private static final String TAG = LocationPublishPnCallback.class.getName();
-    private LocationSubscribeMapAdapter locationMapAdapter;
+    private LocationPublishMapAdapter locationMapAdapter;
     private String watchChannel;
 
-    public LocationPublishPnCallback(LocationSubscribeMapAdapter locationMapAdapter, String watchChannel) {
+    public LocationPublishPnCallback(LocationPublishMapAdapter locationMapAdapter, String watchChannel) {
         this.locationMapAdapter = locationMapAdapter;
         this.watchChannel = watchChannel;
     }

app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationpublish/LocationPublishTabContentFragment.java

@@ -60,7 +60,7 @@ public void setPubNub(PubNub pubNub) {
     public void onMapReady(GoogleMap map) {
         this.map = map;
 
-        this.pubNub.addListener(new LocationSubscribePnCallback(new LocationSubscribeMapAdapter((Activity) this.getContext(), map), Constants.PUBLISH_CHANNEL_NAME));
+        this.pubNub.addListener(new LocationPublishPnCallback(new LocationPublishMapAdapter((Activity) this.getContext(), map), Constants.PUBLISH_CHANNEL_NAME));
         this.pubNub.subscribe().channels(Arrays.asList(Constants.PUBLISH_CHANNEL_NAME)).execute();
 
         this.locationHelper = new LocationHelper((Activity) this.getContext(), this);
@@ -78,7 +78,7 @@ public void onResponse(PNPublishResult result, PNStatus status) {
                             if (!status.isError()) {
                                 Log.v(TAG, "publish(" + JsonUtil.asJson(result) + ")");
                             } else {
-                                Log.v(TAG, "publishErr(" + JsonUtil.asJson(status) + ")");
+                                Log.v(TAG, "publishErr(" + status.toString() + ")");
                             }
                         } catch (Exception e) {
                             e.printStackTrace();

app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationsubscribe/LocationSubscribePnCallback.java

@@ -24,7 +24,7 @@ public LocationSubscribePnCallback(LocationSubscribeMapAdapter locationMapAdapte
 
     @Override
     public void status(PubNub pubnub, PNStatus status) {
-        Log.d(TAG + "/PN_STATUS", "status: " + status.toString());
+        Log.d(TAG, "status: " + status.toString());
     }
 
     @Override
@@ -34,7 +34,7 @@ public void message(PubNub pubnub, PNMessageResult message) {
         }
 
         try {
-            Log.d(TAG + "/PN_MESSAGE", "message: " + message.toString());
+            Log.d(TAG, "message: " + message.toString());
 
             Map<String, String> newLocation = JsonUtil.fromJson(message.getMessage().toString(), LinkedHashMap.class);
             locationMapAdapter.locationUpdated(newLocation);
@@ -45,6 +45,10 @@ public void message(PubNub pubnub, PNMessageResult message) {
 
     @Override
     public void presence(PubNub pubnub, PNPresenceEventResult presence) {
-        Log.d(TAG + "/PN_PRESENCE", "presence: " + presence.toString());
+        if (!presence.getChannel().equals(watchChannel)) {
+            return;
+        }
+
+        Log.d(TAG, "presence: " + presence.toString());
     }
 }

app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationsubscribe/LocationSubscribeTabContentFragment.java

@@ -96,7 +96,7 @@ public void onResponse(PNPublishResult result, PNStatus status) {
                                             if (!status.isError()) {
                                                 Log.v(TAG, "publish(" + JsonUtil.asJson(result) + ")");
                                             } else {
-                                                Log.v(TAG, "publishErr(" + JsonUtil.asJson(status) + ")");
+                                                Log.v(TAG, "publishErr(" + status.toString() + ")");
                                             }
                                         } catch (Exception e) {
                                             e.printStackTrace();