Merge pull request #5 from freshbits/v2.2

Add nullable email for user and custome
freshbits · Sep 10, 2018 · 43866f4 · 43866f4
2 parents bbc7dd1 + fe6333f
commit 43866f4
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 19 deletions.
diff --git a/android-example-app/app-kotlin/build.gradle b/android-example-app/app-kotlin/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "ch.freshbits.pathshare.example"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 2_1_0
-        versionName "2.1.0"
+        versionCode 2_2_0
+        versionName "2.2.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -41,7 +41,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.1.0'
+    implementation 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.2.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'com.android.support:design:27.1.1'
 }
diff --git a/android-example-app/app-kotlin/src/main/java/ch/freshbits/pathshare/example/MainActivity.kt b/android-example-app/app-kotlin/src/main/java/ch/freshbits/pathshare/example/MainActivity.kt
@@ -35,11 +35,6 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        createButton = findViewById<View>(R.id.create_session) as Button
-        joinButton = findViewById<View>(R.id.join_session) as Button
-        inviteButton = findViewById<View>(R.id.invite_customer) as Button
-        leaveButton = findViewById<View>(R.id.leave_session) as Button
-
         initializeCreateButton()
         initializeJoinButton()
         initializeInviteButton()
@@ -49,9 +44,10 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun initializeCreateButton() {
+        createButton = findViewById<View>(R.id.create_session) as Button
         createButton.isEnabled = true
         createButton.setOnClickListener {
-            Pathshare.client().saveUser("SDK User Android", "+12345678901", UserType.DRIVER, object: ResponseListener {
+            Pathshare.client().saveUser("SDK User Android", "me@email.com", "+12345678901", UserType.DRIVER, object: ResponseListener {
                 override fun onSuccess() {
                     Log.d("User", "Success")
                     createSession()
@@ -65,16 +61,19 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun initializeJoinButton() {
+        joinButton = findViewById<View>(R.id.join_session) as Button
         joinButton.isEnabled = false
         joinButton.setOnClickListener { joinSession() }
     }
 
     private fun initializeInviteButton() {
+        inviteButton = findViewById<View>(R.id.invite_customer) as Button
         inviteButton.isEnabled = false
         inviteButton.setOnClickListener { inviteCustomer() }
     }
 
     private fun initializeLeaveButton() {
+        leaveButton = findViewById<View>(R.id.leave_session) as Button
         leaveButton.isEnabled = false
         leaveButton.setOnClickListener { leaveSession() }
     }
@@ -225,7 +224,6 @@ class MainActivity : AppCompatActivity() {
             deleteSessionIdentifier()
             showToast("Session expired")
         }
-
     }
 
     private fun showToast(message: String) {

diff --git a/android-example-app/app/build.gradle b/android-example-app/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "ch.freshbits.pathshare.example"
         minSdkVersion 25
         targetSdkVersion 27
-        versionCode 2_1_0
-        versionName "2.1.0"
+        versionCode 2_2_0
+        versionName "2.2.0"
     }
 
     lintOptions {
@@ -40,5 +40,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
     //noinspection GradleCompatible
     compile 'com.android.support:appcompat-v7:27.1.1'
-    compile 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.1.0'
+    compile 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.2.0'
 }
diff --git a/android-example-app/app/src/main/java/ch/freshbits/pathshare/example/MainActivity.java b/android-example-app/app/src/main/java/ch/freshbits/pathshare/example/MainActivity.java
@@ -41,11 +41,6 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        mCreateButton = findViewById(R.id.create_session);
-        mJoinButton = findViewById(R.id.join_session);
-        mInviteButton = findViewById(R.id.invite_customer);
-        mLeaveButton = findViewById(R.id.leave_session);
-
         initializeCreateButton();
         initializeJoinButton();
         initializeInviteButton();
@@ -55,11 +50,12 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void initializeCreateButton() {
+        setCreateButton((Button) findViewById(R.id.create_session));
         getCreateButton().setEnabled(true);
         getCreateButton().setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Pathshare.client().saveUser("SDK User", "+12345678901", UserType.DRIVER, new ResponseListener() {
+                Pathshare.client().saveUser("SDK User", "me@email.com", "+12345678901", UserType.DRIVER, new ResponseListener() {
                     @Override
                     public void onSuccess() {
                         Log.d("User", "Success");
@@ -76,6 +72,7 @@ public void onError() {
     }
 
     private void initializeJoinButton() {
+        setJoinButton((Button) findViewById(R.id.join_session));
         getJoinButton().setEnabled(false);
         getJoinButton().setOnClickListener(new View.OnClickListener() {
             @Override
@@ -86,6 +83,7 @@ public void onClick(View v) {
     }
 
     private void initializeInviteButton() {
+        setInviteButton((Button) findViewById(R.id.invite_customer));
         getInviteButton().setEnabled(false);
         getInviteButton().setOnClickListener(new View.OnClickListener() {
             @Override
@@ -96,6 +94,7 @@ public void onClick(View v) {
     }
 
     private void initializeLeaveButton() {
+        setLeaveButton((Button) findViewById(R.id.leave_session));
         getLeaveButton().setEnabled(false);
         getLeaveButton().setOnClickListener(new View.OnClickListener() {
             @Override
@@ -281,6 +280,22 @@ public Session getSession() {
         return mSession;
     }
 
+    public void setCreateButton(Button createButton) {
+        this.mCreateButton = createButton;
+    }
+
+    public void setJoinButton(Button joinButton) {
+        this.mJoinButton = joinButton;
+    }
+
+    public void setInviteButton(Button inviteButton) {
+        this.mInviteButton = inviteButton;
+    }
+
+    public void setLeaveButton(Button leaveButton) {
+        this.mLeaveButton = leaveButton;
+    }
+
     public Button getCreateButton() {
         return mCreateButton;
     }