From 3a5b5efa01bdfc874a7423dba418c5485d89fce8 Mon Sep 17 00:00:00 2001 From: Sunny Gleason Date: Fri, 1 Dec 2017 12:56:43 -0500 Subject: [PATCH] fix a few typos --- .../flightpaths/FlightPathsTabContentFragment.java | 2 +- .../locationpublish/LocationPublishMapAdapter.java | 2 -- .../locationpublish/LocationPublishPnCallback.java | 4 ++-- .../LocationPublishTabContentFragment.java | 4 ++-- .../locationsubscribe/LocationSubscribePnCallback.java | 10 +++++++--- .../LocationSubscribeTabContentFragment.java | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/flightpaths/FlightPathsTabContentFragment.java b/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/flightpaths/FlightPathsTabContentFragment.java index e4733f7..fb2293e 100644 --- a/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/flightpaths/FlightPathsTabContentFragment.java +++ b/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(); diff --git a/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationpublish/LocationPublishMapAdapter.java b/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationpublish/LocationPublishMapAdapter.java index 3631db6..6997391 100644 --- a/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationpublish/LocationPublishMapAdapter.java +++ b/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationpublish/LocationPublishMapAdapter.java @@ -32,7 +32,6 @@ public void locationUpdated(final Map 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)); - } }); } diff --git a/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationpublish/LocationPublishPnCallback.java b/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationpublish/LocationPublishPnCallback.java index 42c7e46..088cfc4 100644 --- a/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationpublish/LocationPublishPnCallback.java +++ b/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; } diff --git a/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationpublish/LocationPublishTabContentFragment.java b/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationpublish/LocationPublishTabContentFragment.java index 6c0b5fc..da2982c 100644 --- a/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationpublish/LocationPublishTabContentFragment.java +++ b/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(); diff --git a/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationsubscribe/LocationSubscribePnCallback.java b/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationsubscribe/LocationSubscribePnCallback.java index f73f59b..a77091f 100644 --- a/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationsubscribe/LocationSubscribePnCallback.java +++ b/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 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()); } } diff --git a/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationsubscribe/LocationSubscribeTabContentFragment.java b/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationsubscribe/LocationSubscribeTabContentFragment.java index ecbbb89..be15aea 100644 --- a/app/src/main/java/com/pubnub/tutorials/map/android/pubnubmaptutorialandroid/locationsubscribe/LocationSubscribeTabContentFragment.java +++ b/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();