Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync upstream 2.1.7 #4

Closed
wants to merge 179 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
179 commits
Select commit Hold shift + click to select a range
11c22cd
Fix Android 6 crash.
Dec 6, 2017
4b73840
Bump version
Dec 6, 2017
81f3b11
Update to latest gradle and minimum supported build tools
Dec 6, 2017
bbbcfbc
Fix warning by aligning library versions
Dec 6, 2017
8a97fa9
Update file
Dec 6, 2017
c70d280
Add language specifier to code blocks
Jan 4, 2018
985aa22
Improve title.
Jan 4, 2018
718783e
Update repository location
Jan 4, 2018
7a5bc5f
Rename project.
Jan 4, 2018
19b7f6c
Improve comment slightly.
Jan 23, 2018
9d41573
Extract variable localBroadcastManager
Mar 22, 2018
ce69dca
Extract broadcastReceivers to member variables
Mar 22, 2018
1070a4f
Register receivers just before showing queue
Mar 22, 2018
3b9a05b
Unregister receivers when QueueActivity is being removed e.g. by leav…
Mar 22, 2018
cd37597
Bump version
Mar 22, 2018
01b4c15
Add google repository for new gradle
Mar 22, 2018
bc3758b
Use HTTPS for API Url instead of HTTP
Kevinrob Oct 12, 2018
18f0b0d
Merge pull request #7 from Kevinrob/patch-1
mbp Oct 12, 2018
deaf521
Upgrade gradle and build tools
Oct 15, 2018
eb018a0
Commit project files
Oct 15, 2018
1338002
Change to onDestroy so it's only called on back button and not when a…
Oct 15, 2018
0dd7481
Bump version to 2.0.16
Oct 15, 2018
d5e33f7
Call onDestroy instead of onStop
Oct 16, 2018
51abae9
Only broadcast queue activity closed when actually finishing, to solv…
Oct 16, 2018
10437a0
Bump version
Oct 16, 2018
5ef80ae
Add files via upload
mproqueueit Sep 18, 2019
e94aa0c
Added drawing
mproqueueit Sep 18, 2019
ceba98a
project files
MohammadMQ Nov 19, 2019
b93e822
error handling on click cancel
MohammadMQ Nov 19, 2019
40f7818
Revert "project files"
MohammadMQ Nov 21, 2019
99a99ff
reverted change
MohammadMQ Nov 21, 2019
8d1039e
Revert "reverted change"
MohammadMQ Nov 21, 2019
da11388
ignore slnx.sqlite
MohammadMQ Nov 21, 2019
f5c84a8
#5152, log ssl certificate error and send user to queue. Dialog box h…
MohammadMQ Nov 21, 2019
6a714ea
Update .gitignore
MohammadMQ Nov 21, 2019
1ed52fc
reformatting
MohammadMQ Nov 21, 2019
c4be7d1
Merge branch 'Bug/5152-Gracefully-handle-SSL-handshake-errors-in-App-…
MohammadMQ Nov 21, 2019
421256f
upgraded version number to 2.0.18
MohammadMQ Nov 21, 2019
92961c8
Merge pull request #9 from queueit/Bug/5152-Gracefully-handle-SSL-han…
MohammadMQ Nov 21, 2019
8149378
#5152 - Gracefully handle SSL certificate error in android sdk
MohammadMQ Nov 25, 2019
c7e668b
Fixed problem with SSL Certificate Error crash.
MohammadMQ Nov 25, 2019
758c47a
Revert to 2.0.17
MohammadMQ Dec 13, 2019
779fd50
revert to 2.0.17
MohammadMQ Dec 13, 2019
b6d40cf
SSL Error handling, retry (#10)
MohammadMQ Dec 18, 2019
90952d0
#6188 - Android SDK not returning queueittoken (in callback) for even…
MohammadMQ Apr 24, 2020
9612682
refactored code according to pull request
MohammadMQ Apr 24, 2020
a52e9ce
Update README.md
frwiqueueit May 11, 2020
28d96e6
Update README.md
frwiqueueit May 14, 2020
b0636ed
Update README.md
frwiqueueit Jun 17, 2020
802f630
Updated gradle and project files.
sp0x Jul 7, 2020
62387c9
Refactored `appenqueue` url generation and formatted QueueService.
sp0x Jul 7, 2020
32e796f
Added userId argument to `appenqueue` url.
sp0x Jul 7, 2020
156bddc
UserId argument is now added to all webview in-queue urls
sp0x Jul 7, 2020
587f200
Added a check for null urls, when an url is check if it needs to be u…
sp0x Jul 10, 2020
b2befc8
Cleanup
sp0x Jul 10, 2020
acfaa34
Tmp update
sp0x Jul 13, 2020
5a3262e
Fixed an issues with old webviews leaking js timers.
sp0x Jul 13, 2020
d01d003
Cache button works again now.
sp0x Jul 13, 2020
6e51e56
Bumped up version.
sp0x Jul 13, 2020
df0dc79
Queue activity now uses a single webview to store the previous webview.
sp0x Jul 13, 2020
3443847
Cleanup
sp0x Jul 13, 2020
4993131
Fixed a braking change.
sp0x Jul 13, 2020
0c4cc6f
Bugfix
sp0x Jul 13, 2020
f3f8890
Fixes an issue where a user would get his turn back, if he leaves the…
sp0x Jul 13, 2020
6b866ee
Renamed webview cleanup method.
sp0x Jul 13, 2020
629a368
Bugfix cookie issues.
sp0x Jul 14, 2020
1b9c5f2
Merge pull request #14 from sp0x/webviewFix
sarooghi Jul 20, 2020
7ef0856
Adding userExited method so users can implement it.
sp0x Jul 22, 2020
4a272f4
Merge pull request #3 from sp0x/consistency-add-userExited
sp0x Jul 22, 2020
7a8e32b
Added bintray publish action
sp0x Jul 22, 2020
2c4bd5d
Merge pull request #4 from sp0x/consistency-add-userExited
sp0x Jul 22, 2020
2054789
Updated bintrayPublish to include local.properties
sp0x Jul 23, 2020
023b694
fixed issue with *apiKey*
sp0x Jul 23, 2020
1e27142
Update bintray action.
sp0x Jul 23, 2020
e4f0e85
Added gradle build action on push
sp0x Jul 23, 2020
0f520fb
Updated workflows.
sp0x Jul 23, 2020
6cd21a5
Update
sp0x Jul 23, 2020
6e34a34
fixed gradle-build workflow.
sp0x Jul 23, 2020
0133594
Fixed demo app build.
sp0x Jul 23, 2020
84cfe39
Update outdated target sdk.
sp0x Jul 23, 2020
d289148
Merge branch 'consistency-add-userExited'
sp0x Jul 23, 2020
037640d
Merge pull request #5 from sp0x/consistency-add-userExited
sp0x Jul 23, 2020
773e0c0
Merge branch 'master' of https://github.com/sp0x/android-webui-sdk
sp0x Jul 23, 2020
3873a2b
fixed bad bintray-publish workflow.
sp0x Jul 23, 2020
47dd3cc
Updated com.android.support:appcompat-v7 to 26.1.0
sp0x Jul 23, 2020
12708dc
Adding ACCESS_NETWORK_STATE for library
sp0x Jul 23, 2020
ddf9767
Fixing bintray publish
sp0x Jul 23, 2020
4f839b9
Added pipe op to bintray publish
sp0x Jul 23, 2020
8e19ce4
fix bad local.properties
sp0x Jul 23, 2020
a711986
bintray-publish runs on closed PR
sp0x Jul 23, 2020
86cf1f8
temp
sp0x Jul 23, 2020
6378903
Merge pull request #6 from sp0x/temp
sp0x Jul 23, 2020
a9759f8
updated bintray publish workflow.
sp0x Jul 23, 2020
6e5a262
Merge branch 'master' of https://github.com/sp0x/android-webui-sdk
sp0x Jul 23, 2020
cbd99b8
Update
sp0x Jul 23, 2020
b4731fb
Reformat bintray-publish workflow.
sp0x Jul 23, 2020
5c77870
Merge pull request #15 from sp0x/master
sarooghi Jul 23, 2020
14e25d5
bintray-publish workflow runs on release only
sp0x Jul 24, 2020
7c3775f
Merge branch 'master' of https://github.com/queueit/android-webui-sdk
sp0x Jul 24, 2020
c024b00
Update README.md
sp0x Jul 28, 2020
2b5053b
Create LICENSE
sp0x Aug 11, 2020
890c2f2
Update LICENSE
sp0x Aug 17, 2020
c5f5b87
deep links are now handled by the SDK
sp0x Aug 27, 2020
76edd48
version bump, dependency update
sp0x Aug 27, 2020
246f1a9
lint update
sp0x Aug 27, 2020
050bcc4
renamed tests
sp0x Sep 8, 2020
6bcd43c
Merged PR 2154: Added CI pipeline
sp0x Sep 8, 2020
8451acb
renamed ci pipeline to ci.yml
sp0x Sep 9, 2020
ea0afa3
added a release pipeline
sp0x Sep 9, 2020
04c188b
Set up Release with Azure Pipelines
sp0x Sep 9, 2020
4d99e11
Merged PR 2245: Introduce an AndroidX build variant
sp0x Oct 9, 2020
880c31a
Merge branch 'add-release-pipeline'
sp0x Oct 9, 2020
1666364
fixed CI for release
sp0x Oct 9, 2020
fb4d2eb
version bump
sp0x Oct 9, 2020
a15ae2f
updated github release action
sp0x Oct 9, 2020
28998f9
added bintray userOrg property
sp0x Oct 9, 2020
4ea567f
added bintray userOrg property
sp0x Oct 9, 2020
ccc4c56
updated aar artifact path in publishing
sp0x Oct 12, 2020
e6a5a35
Version bump
sp0x Nov 23, 2020
96b1fb6
#2357 Updated navigation handling
sp0x Nov 23, 2020
ead4b21
Added onWebViewClosed callback whenever a closing link is clicked
sp0x Nov 23, 2020
e09748b
Update README.md
sp0x Dec 10, 2020
34cc2e6
QueueActivity now uses a plain Activity, added version to UserAgent
sp0x Jan 8, 2021
afe34bb
Merge branch 'master' of https://github.com/queueit/android-webui-sdk
sp0x Jan 8, 2021
efe223e
Merged PR 2513: Add SDK version to user-agent
sp0x Jan 21, 2021
9e00b49
Version bumped to 2.0.29
sp0x Jan 21, 2021
f1bde44
Updated handling of AppEnqueue response
sp0x Jan 21, 2021
db8b0b5
Cleanup
sp0x Jan 21, 2021
73c910b
Update README.md
sp0x Jan 26, 2021
bf06ac5
Updated API endpoint
sp0x Jan 27, 2021
f8720f8
Updated QueueCache to update the cache only if ttl > 0
sp0x Feb 4, 2021
85dbe5e
Merged PR 2521: Use the new enqueue route and always load the URL in …
sp0x Feb 4, 2021
ac1fd90
Version bumped
sp0x Feb 4, 2021
8036516
Merge branch 'task/7478/update-appenqueue-cache-handling'
sp0x Feb 4, 2021
4c63ae9
Merge remote-tracking branch 'github/master'
sp0x Feb 4, 2021
f4b6630
Update README.md
sp0x Feb 9, 2021
094f5b2
Fixed an issue in softblocked WRs
sp0x Feb 10, 2021
e967d94
Merge branch 'master' of https://github.com/queueit/android-webui-sdk
sp0x Feb 10, 2021
ae88326
Updated handling of userId in intercepted URLs
sp0x Feb 10, 2021
afcb72b
Merged PR 2588: Migrated from bintray to maven central
sp0x Feb 17, 2021
748c4b3
Update README.md
sp0x Feb 18, 2021
4828272
Added a demo app using a protected API
sp0x Jun 16, 2021
f47563f
Update protected_apis.md
sp0x Jun 16, 2021
38e45c9
Added QueueItEngineOptions to help with config
sp0x Jun 18, 2021
120ac01
Update protected_apis.md
sp0x Jul 19, 2021
9af75d5
Added methods to run with enqueue tokens and keys
sp0x Oct 5, 2021
6ef4105
Merge branch 'master' of https://github.com/queueit/android-webui-sdk
sp0x Oct 5, 2021
8175c45
Updated readme
sp0x Oct 6, 2021
dd49651
Delete pipelines directory
sp0x Nov 30, 2021
8f57f50
Delete .vscode directory
sp0x Nov 30, 2021
b34b58f
Delete gradle/wrapper directory
sp0x Nov 30, 2021
66a01d1
Preparing release 2.0.36
Feb 16, 2022
4036f22
Update README.md
sp0x Feb 17, 2022
0e4d29f
Update README.md
Reza-0 Jul 13, 2022
aba79b8
Preparing release 2.0.36
Jul 13, 2022
12082c2
Preparing release 2.0.36
Jul 14, 2022
dfc1e28
Preparing release 2.0.36
Jul 14, 2022
1313aa2
Preparing release 2.0.36
Jul 14, 2022
1549335
Preparing release 2.0.36
Jul 14, 2022
385681b
Preparing release 2.0.36
Jul 14, 2022
2058280
Preparing release 2.0.36
Jul 14, 2022
f6d22cc
Preparing release 2.1.0
Jul 15, 2022
0df5e30
Preparing release 2.0.36
Jul 15, 2022
10f5178
Preparing release 2.1.0
Jul 15, 2022
c76d9f3
Update readme
Reza-0 Jul 25, 2022
0bc412d
Updated documentation to reflect two client SDK integration possibili…
Ista-Queueit Jul 26, 2022
cd812b9
v2.1.1
Reza-0 Jul 28, 2022
1725032
Preparing release 2.1.1
Jul 28, 2022
7ee5431
Preparing release 2.1.1
Aug 3, 2022
9b87481
Merge pull request #23 from Ista-Queueit/updateDocs
queueitdevs Aug 3, 2022
b1666f0
Update README.md
sp0x Aug 4, 2022
7fc306c
Syncronized repository
sp0x Aug 4, 2022
6e990a7
Update readme
Reza-0 Aug 8, 2022
9b4ce83
Preparing release 2.1.3
Aug 8, 2022
1c10e46
Update version in README.md
bret-queueit Aug 11, 2022
b84df99
Preparing release 2.1.4
Aug 11, 2022
b811d56
Preparing release 2.1.5
Sep 13, 2023
3fc2521
Preparing release 2.1.6
Jan 31, 2024
51a24c7
Preparing release 2.1.7
Feb 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/workflows/bintray-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Publish to bintray on closed PR
on:
release:
types: [released]

jobs:
gradle:
strategy:
matrix:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
# Export properties
- name: Setup bintray credentials
env:
BINTRAY_APIKEY: ${{ secrets.BINTRAY_APIKEY }}
run: |
echo "bintray.user=queueitdevs" > ./local.properties
echo "bintray.apiKey=${BINTRAY_APIKEY}" >> ./local.properties
- uses: actions/setup-java@v1
with:
java-version: 11
- uses: eskatos/gradle-command-action@v1
with:
arguments: assembleLibrary_androidx :library:assembleLibrary bintrayUpload
18 changes: 18 additions & 0 deletions .github/workflows/gradle-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Run Gradle Build on Push
on: push
jobs:
gradle:
strategy:
matrix:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: Create local.properties
run: echo "" >> ./local.properties
- uses: actions/setup-java@v1
with:
java-version: 11
- uses: eskatos/gradle-command-action@v1
with:
arguments: build
17 changes: 16 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
*.iml
.gradle
/local.properties
/.idea/workspace.xml
/.idea/libraries
.DS_Store
/build
/captures
/.idea/caches/build_file_checksums.ser
/.idea/caches/gradle_models.ser
/.idea/codeStyles/Project.xml
/.vs/android-webui-sdk/v16/.suo
/.vs/slnx.sqlite
/.vs/VSWorkspaceState.json
/private_key_sender.asc
/public_key_sender.asc
.idea
*.gpg
**/build
node_modules
.classpath
.project
*.prefs
dist
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

22 changes: 0 additions & 22 deletions .idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/encodings.xml

This file was deleted.

20 changes: 0 additions & 20 deletions .idea/gradle.xml

This file was deleted.

46 changes: 0 additions & 46 deletions .idea/misc.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/modules.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

Binary file added App integration flow.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020 Queue-it

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
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.
Loading
Loading