v3.2.0 release

app/src/main/AndroidManifest.xml

@@ -85,6 +85,9 @@
         <activity
             android:name=".auth.JWTLoginActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".auth.AccessTokenLoginActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".auth.OAuthWebLoginActivity"
             android:screenOrientation="portrait" />
@@ -134,6 +137,9 @@
         <activity
             android:name=".setup.SetupActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".setup.SetupCameraActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".calling.DialerActivity"
             android:screenOrientation="portrait" />
@@ -156,6 +162,9 @@
             android:name=".webhooks.WebhooksActivity"
             android:screenOrientation="portrait" />
 
+        <activity android:name=".calling.calendarMeeting.details.CalendarMeetingDetailsActivity"
+            android:screenOrientation="portrait" />
+
         <service
             android:name=".firebase.KitchenSinkFCMService"
             android:exported="false">

app/src/main/java/com/ciscowebex/androidsdk/kitchensink/AccessTokenWebexModule.kt

@@ -0,0 +1,14 @@
+package com.ciscowebex.androidsdk.kitchensink
+
+import com.ciscowebex.androidsdk.Webex
+import com.ciscowebex.androidsdk.auth.JWTAuthenticator
+import com.ciscowebex.androidsdk.auth.TokenAuthenticator
+import org.koin.android.ext.koin.androidApplication
+import org.koin.dsl.module
+
+val AccessTokenWebexModule = module {
+
+    factory {
+        Webex(androidApplication(), TokenAuthenticator())
+    }
+}

app/src/main/java/com/ciscowebex/androidsdk/kitchensink/HomeActivity.kt

@@ -7,7 +7,9 @@ import android.util.Log
 import android.view.View
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Observer
+import com.ciscowebex.androidsdk.CompletionHandler
 import com.ciscowebex.androidsdk.auth.OAuthWebViewAuthenticator
+import com.ciscowebex.androidsdk.auth.TokenAuthenticator
 import com.ciscowebex.androidsdk.kitchensink.auth.LoginActivity
 import com.ciscowebex.androidsdk.kitchensink.databinding.ActivityHomeBinding
 import com.ciscowebex.androidsdk.kitchensink.messaging.MessagingActivity
@@ -24,6 +26,9 @@ import com.ciscowebex.androidsdk.kitchensink.calling.CallActivity
 import com.ciscowebex.androidsdk.kitchensink.extras.ExtrasActivity
 import com.ciscowebex.androidsdk.kitchensink.search.SearchActivity
 import com.ciscowebex.androidsdk.kitchensink.setup.SetupActivity
+import com.ciscowebex.androidsdk.kitchensink.utils.FileUtils
+import com.ciscowebex.androidsdk.kitchensink.utils.SharedPrefUtils
+import com.ciscowebex.androidsdk.message.LocalFile
 import com.ciscowebex.androidsdk.phone.Phone
 import org.koin.android.ext.android.inject
 
@@ -51,6 +56,10 @@ class HomeActivity : BaseActivity() {
                 is OAuthWebViewAuthenticator -> {
                     saveLoginTypePref(this, LoginActivity.LoginType.OAuth)
                 }
+                is TokenAuthenticator -> {
+                    saveLoginTypePref(this, LoginActivity.LoginType.AccessToken)
+                    webexViewModel.setOnTokenExpiredListener()
+                }
                 else -> {
                     saveLoginTypePref(this, LoginActivity.LoginType.JWT)
                 }
@@ -156,6 +165,7 @@ class HomeActivity : BaseActivity() {
         webexViewModel.setSpaceObserver()
         webexViewModel.setMembershipObserver()
         webexViewModel.setMessageObserver()
+        webexViewModel.setCalendarMeetingObserver()
     }
 
     override fun onBackPressed() {
@@ -188,6 +198,7 @@ class HomeActivity : BaseActivity() {
         super.onResume()
         updateUCData()
         webexViewModel.setGlobalIncomingListener()
+        addVirtualBackground()
     }
 
     private fun updateUCData() {
@@ -213,4 +224,24 @@ class HomeActivity : BaseActivity() {
             }
         }
     }
+
+    private fun addVirtualBackground() {
+        if (SharedPrefUtils.isVirtualBgAdded(this)) {
+            Log.d(tag, "Virtual Bg is already added")
+        } else {
+
+            val thumbnailFile = FileUtils.getFileFromResource(this, "nature-thumb")
+            val file = FileUtils.getFileFromResource(this, "nature")
+            val thumbnail = LocalFile.Thumbnail(thumbnailFile, null,
+                resources.getInteger(R.integer.virtual_bg_thumbnail_width),
+                resources.getInteger(R.integer.virtual_bg_thumbnail_height))
+
+            val localFile = LocalFile(file, null, thumbnail, null)
+            webexViewModel.addVirtualBackground(localFile, CompletionHandler {
+                if (it.isSuccessful && it.data != null) {
+                    SharedPrefUtils.setVirtualBgAdded(this, true)
+                }
+            })
+        }
+    }
 }

app/src/main/java/com/ciscowebex/androidsdk/kitchensink/KitchenSinkApp.kt

@@ -9,6 +9,7 @@ import androidx.lifecycle.ProcessLifecycleOwner
 import com.ciscowebex.androidsdk.kitchensink.auth.LoginActivity
 import com.ciscowebex.androidsdk.kitchensink.auth.loginModule
 import com.ciscowebex.androidsdk.kitchensink.calling.callModule
+import com.ciscowebex.androidsdk.kitchensink.calling.calendarMeeting.calendarMeetingsModule
 import com.ciscowebex.androidsdk.kitchensink.extras.extrasModule
 import com.ciscowebex.androidsdk.kitchensink.messaging.messagingModule
 import com.ciscowebex.androidsdk.kitchensink.messaging.search.searchPeopleModule
@@ -72,15 +73,18 @@ class KitchenSinkApp : Application(), LifecycleObserver {
     fun loadKoinModules(type: LoginActivity.LoginType) {
         when (type) {
             LoginActivity.LoginType.JWT -> {
-                loadKoinModules(listOf(mainAppModule, webexModule, loginModule, JWTWebexModule, searchModule, callModule, messagingModule, personModule, searchPeopleModule, webhooksModule, extrasModule))
+                loadKoinModules(listOf(mainAppModule, webexModule, loginModule, JWTWebexModule, searchModule, callModule, messagingModule, personModule, searchPeopleModule, webhooksModule, extrasModule, calendarMeetingsModule))
+            }
+            LoginActivity.LoginType.AccessToken -> {
+                loadKoinModules(listOf(mainAppModule, webexModule, loginModule, AccessTokenWebexModule, searchModule, callModule, messagingModule, personModule, searchPeopleModule, webhooksModule, extrasModule, calendarMeetingsModule))
             }
             else -> {
-                loadKoinModules(listOf(mainAppModule, webexModule, loginModule, OAuthWebexModule, searchModule, callModule, messagingModule, personModule, searchPeopleModule, webhooksModule, extrasModule))
+                loadKoinModules(listOf(mainAppModule, webexModule, loginModule, OAuthWebexModule, searchModule, callModule, messagingModule, personModule, searchPeopleModule, webhooksModule, extrasModule, calendarMeetingsModule))
             }
         }
     }
 
     fun unloadKoinModules() {
-        unloadKoinModules(listOf(mainAppModule, webexModule, loginModule, JWTWebexModule, OAuthWebexModule, searchModule, callModule, messagingModule, personModule, searchPeopleModule, webhooksModule, extrasModule))
+        unloadKoinModules(listOf(mainAppModule, webexModule, loginModule, JWTWebexModule, AccessTokenWebexModule, OAuthWebexModule, searchModule, callModule, messagingModule, personModule, searchPeopleModule, webhooksModule, extrasModule, calendarMeetingsModule))
     }
 }

app/src/main/java/com/ciscowebex/androidsdk/kitchensink/WebexRepository.kt

@@ -11,15 +11,18 @@ import com.ciscowebex.androidsdk.CompletionHandler
 import com.ciscowebex.androidsdk.auth.PhoneServiceRegistrationFailureReason
 import com.ciscowebex.androidsdk.auth.UCLoginServerConnectionStatus
 import com.ciscowebex.androidsdk.kitchensink.utils.CallObjectStorage
+import com.ciscowebex.androidsdk.calendarMeeting.CalendarMeetingObserver
 import com.ciscowebex.androidsdk.membership.Membership
 import com.ciscowebex.androidsdk.membership.MembershipObserver
+import com.ciscowebex.androidsdk.message.LocalFile
 import com.ciscowebex.androidsdk.message.MessageObserver
 import com.ciscowebex.androidsdk.phone.CallMembership
 import com.ciscowebex.androidsdk.phone.CallObserver
 import com.ciscowebex.androidsdk.phone.NotificationCallType
 import com.ciscowebex.androidsdk.phone.Call
 import com.ciscowebex.androidsdk.phone.MediaOption
 import com.ciscowebex.androidsdk.phone.Phone
+import com.ciscowebex.androidsdk.phone.VirtualBackground
 import com.ciscowebex.androidsdk.space.SpaceObserver
 
 class WebexRepository(val webex: Webex) : WebexUCLoginDelegate {
@@ -79,6 +82,12 @@ class WebexRepository(val webex: Webex) : WebexUCLoginDelegate {
         MeetingPinOrPasswordRequired
     }
 
+    enum class CalendarMeetingEvent {
+        Created,
+        Updated,
+        Deleted
+    }
+
     data class CallLiveData(val event: CallEvent,
                             val call: Call? = null,
                             val sharingLabel: String? = null,
@@ -99,6 +108,7 @@ class WebexRepository(val webex: Webex) : WebexUCLoginDelegate {
     var enableBgStreamtoggle = true
     var enableBgConnectiontoggle = true
     var enablePhoneStatePermission = true
+    var enableHWAcceltoggle = true
     var logFilter = LogLevel.ALL.name
     var isConsoleLoggerEnabled = true
     var callCapability: CallCap = CallCap.Audio_Video
@@ -124,6 +134,7 @@ class WebexRepository(val webex: Webex) : WebexUCLoginDelegate {
     var _spaceEventLiveData: MutableLiveData<Pair<SpaceEvent, Any?>>? = null
     var _membershipEventLiveData: MutableLiveData<Pair<MembershipEvent, Membership?>>? = null
     var _messageEventLiveData: MutableLiveData<Pair<MessageEvent, Any?>>? = null
+    var _calendarMeetingEventLiveData: MutableLiveData<Pair<CalendarMeetingEvent, Any>>? = null
 
     init {
         webex.delegate = this
@@ -223,6 +234,31 @@ class WebexRepository(val webex: Webex) : WebexUCLoginDelegate {
         })
     }
 
+    fun setCalendarMeetingObserver() {
+        webex.calendarMeetings.setObserver(object : CalendarMeetingObserver
+        {
+            override fun onEvent(event: CalendarMeetingObserver.CalendarMeetingEvent) {
+                Log.d(tag, "onCalendarMeetingEvent: $event")
+                when (event) {
+                    is CalendarMeetingObserver.CalendarMeetingAdded -> {
+                        _calendarMeetingEventLiveData?.postValue(Pair(CalendarMeetingEvent.Created, event.getCalendarMeeting()))
+                    }
+                    is CalendarMeetingObserver.CalendarMeetingUpdated -> {
+                        _calendarMeetingEventLiveData?.postValue(Pair(CalendarMeetingEvent.Updated, event.getCalendarMeeting()))
+                    }
+                    is CalendarMeetingObserver.CalendarMeetingRemoved -> {
+                        _calendarMeetingEventLiveData?.postValue(Pair(CalendarMeetingEvent.Deleted, event.getCalendarMeetingId()))
+                    }
+                }
+            }
+        })
+    }
+
+    fun removeCalendarMeetingObserver() {
+        _calendarMeetingEventLiveData = null
+        webex.calendarMeetings.setObserver(null)
+    }
+
     fun setIncomingListener() {
         Log.d(tag, "setIncomingListener")
         if (webex.phone.getIncomingCallListener() != null) {
@@ -264,6 +300,30 @@ class WebexRepository(val webex: Webex) : WebexUCLoginDelegate {
         webex.messages.list(spaceId, null, 10000, null, handler)
     }
 
+    fun getVirtualBackgrounds(handler: CompletionHandler<List<VirtualBackground>> ) {
+        webex.phone.fetchVirtualBackgrounds(handler)
+    }
+
+    fun addVirtualBackground(imgFile: LocalFile, handler: CompletionHandler<VirtualBackground>) {
+        webex.phone.addVirtualBackground(imgFile, handler)
+    }
+
+    fun applyVirtualBackground(background: VirtualBackground, mode: Phone.VirtualBackgroundMode, handler: CompletionHandler<Boolean>) {
+        webex.phone.applyVirtualBackground(background, mode, handler)
+    }
+
+    fun removeVirtualBackground(background: VirtualBackground, handler: CompletionHandler<Boolean>) {
+        webex.phone.removeVirtualBackground(background, handler)
+    }
+
+    fun setMaxVirtualBackgrounds(limit: Int) {
+        webex.phone.setMaxVirtualBackgroundItems(limit)
+    }
+
+    fun getMaxVirtualBackgrounds(): Int {
+        return webex.phone.getMaxVirtualBackgroundItems()
+    }
+
     // Callbacks
     override fun showUCSSOLoginView(ssoUrl: String) {
         _cucmLiveData?.postValue(Pair(CucmEvent.ShowSSOLogin, ssoUrl))