Skip to content

Commit

Permalink
Merge pull request #4 from ciscospark/master
Browse files Browse the repository at this point in the history
Sync up with master
  • Loading branch information
xionxiao authored Apr 11, 2018
2 parents 2e9e8cb + 5f88b77 commit eb488a4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
6 changes: 1 addition & 5 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017 Cisco Spark
Copyright (c) 2016-2018 Cisco Systems, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -19,7 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

This MIT license does not apply to the following libraries: "com.cisco.spark.android:common-lib",
"com.webex:wme4android-release". Those libraries are covered by
https://www.cisco.com/c/en/us/products/end-user-license-agreement.html.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Cisco Spark Android SDK Example

> This demo employs Cisco Spark service through [Spark Android SDK](https://github.com/ciscospark/spark-android-sdk).
> This demo support Android device with **Android 6.0** or later
This demo employs Cisco Spark service through [Spark Android SDK](https://github.com/ciscospark/spark-android-sdk).
This demo support Android device with **Android 6.0** or later

## Table of Contents

Expand Down Expand Up @@ -33,7 +33,7 @@
}
```

- Select tools->Android->SDK Manager in Anroid Studio, and install the following packages:
- Select tools->Android->SDK Manager in Android Studio, and install the following packages:
* Android SDK Tools
* Android SDK Platform-Tools
* Android SDK Build-Tools (latest)
Expand Down Expand Up @@ -63,5 +63,5 @@ In Android Studio,open "File" -> "Open", select project.
**Spark ID**
If you have a Spark ID (your email address), you can choose "**Spark ID**" to authorize your device.
**APP ID**
If you have a APP ID (a string token), choose "**App ID**" in the first page, then you need to enter your App JWT token and login.
**Guest ID**
If you have a Guest ID (a string token), choose "**Guest ID**" in the first page, then you need to enter your App JWT token and login.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ dependencies {
compile 'com.google.android.gms:play-services-plus:11.0.4'
compile 'com.android.support:cardview-v7:25.3.1'
compile 'org.greenrobot:eventbus:3.0.0'
compile('com.ciscospark:androidsdk:1.3.0-SNAPSHOT@aar', {
compile('com.ciscospark:androidsdk:1.3.0@aar', {
transitive = true
})
compile 'com.squareup.picasso:picasso:2.5.2'
Expand Down

0 comments on commit eb488a4

Please sign in to comment.