Small refatorings.

Author: jhabr

android-example-app/app/src/main/java/ch/freshbits/pathshare/example/MainActivity.java

@@ -109,10 +109,10 @@ public void onClick(View v) {
     private void createSession() {
         try {
             Destination destination = new Destination.Builder()
-                .setIdentifier("w9823")
-                .setLatitude(37.7951616)
-                .setLongitude(-122.4049222)
-                .build();
+                    .setIdentifier("w9823")
+                    .setLatitude(37.7875694)
+                    .setLongitude(-122.4112239)
+                    .build();
 
             Date expirationDate = new Date(System.currentTimeMillis() + 3600000);
 
@@ -137,6 +137,7 @@ public void onSuccess() {
 
                     getCreateButton().setEnabled(false);
                     getJoinButton().setEnabled(true);
+                    getLeaveButton().setEnabled(true);
                 }
 
                 @Override
@@ -163,7 +164,7 @@ private void joinSession() {
     private void inviteCustomer() {
         if (getSession().isExpired()) { return; }
 
-        getSession().inviteUser("Customer", UserType.CLIENT, "[email protected]", "+14159495533", new InvitationResponseListener() {
+        getSession().inviteUser("Customer", UserType.MOTORIST, "[email protected]", "+14159495533", new InvitationResponseListener() {
             @Override
             public void onSuccess(URL url) {
                 Log.d("Invite", "Success");
@@ -208,8 +209,10 @@ private void performJoinSession() {
                 @Override
                 public void onSuccess() {
                     Log.d("Join", "Success");
+                    getCreateButton().setEnabled(false);
                     getJoinButton().setEnabled(false);
                     getInviteButton().setEnabled(true);
+                    getLeaveButton().setEnabled(true);
                 }
 
                 @Override
@@ -230,8 +233,11 @@ private void leaveSession() {
                 @Override
                 public void onSuccess() {
                     Log.d("Leave", "Success");
-                    getLeaveButton().setEnabled(false);
                     getCreateButton().setEnabled(true);
+                    getJoinButton().setEnabled(false);
+                    getInviteButton().setEnabled(false);
+                    getLeaveButton().setEnabled(false);
+
 
                     deleteSessionIdentifier();
                 }
@@ -301,26 +307,30 @@ private void findSession() {
         Pathshare.client().findSession(identifier, new SessionResponseListener() {
             @Override
             public void onSuccess(Session session) {
-                Log.d("Session", "Name: " + session.getName());
-
-                if (session.isExpired()) {
+                if (session == null || session.isExpired()) {
                     deleteSessionIdentifier();
-                    return;
-                }
 
-                session.setSessionExpirationListener(new SessionExpirationListener() {
-                    @Override
-                    public void onExpiration() {
-                        handleSessionExpiration();
-                    }
-                });
+                    getCreateButton().setEnabled(true);
+                    getJoinButton().setEnabled(false);
+                    getInviteButton().setEnabled(false);
+                    getLeaveButton().setEnabled(false);
+
+                } else {
+                    Log.d("Session", "Name: " + session.getName());
+                    session.setSessionExpirationListener(new SessionExpirationListener() {
+                        @Override
+                        public void onExpiration() {
+                            handleSessionExpiration();
+                        }
+                    });
 
-                setSession(session);
+                    setSession(session);
 
-                getCreateButton().setEnabled(false);
-                getJoinButton().setEnabled(true);
-                getInviteButton().setEnabled(false);
-                getLeaveButton().setEnabled(false);
+                    getCreateButton().setEnabled(false);
+                    getJoinButton().setEnabled(true);
+                    getInviteButton().setEnabled(false);
+                    getLeaveButton().setEnabled(true);
+                }
             }
 
             @Override

android-example-app/app/src/main/res/values/pathshare.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="pathshare_account_token">example_token</string>
+    <string name="pathshare_account_token">Place your API token here.</string>
 </resources>