Commit Graph

2269 Commits

Author SHA1 Message Date
555a8daae2 Fix zipalign path in Travis CI 2020-12-19 10:26:18 +01:00
e101021374 Merge tag '1.5.7' into develop
1.5.7
2020-12-19 10:13:07 +01:00
29e2738660 Merge branch 'release/1.5.7' 2020-12-19 10:12:57 +01:00
6d8bd8aee6 Disable indoor location module (#307) 2020-12-19 10:05:57 +01:00
dependabot-preview[bot]
663b947f98 Bump firebase-bom from 26.1.1 to 26.2.0 (#306)
Bumps firebase-bom from 26.1.1 to 26.2.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-12-17 19:42:47 +01:00
c988f0b3af Fix APK signing 2020-12-15 21:28:29 +01:00
598923db7a Disable cleanup in Travis CI 2020-12-14 20:31:30 +01:00
b03c0ac1ad Merge tag '1.6.0' into develop
1.6.0
2020-12-14 20:24:59 +01:00
c2eae55f09 Merge branch 'release/1.6.0' 2020-12-14 20:24:52 +01:00
d7c6eb3937 Enable skip_cleanup in Travis CI 2020-12-14 20:18:26 +01:00
59b3213f2f Merge tag '1.6.0' into develop
1.6.0
2020-12-14 20:05:59 +01:00
c04ca8ddea Merge branch 'release/1.6.0' 2020-12-14 20:05:52 +01:00
34d91f1e0c Updated deploy token for Travis CI 2020-12-14 19:58:55 +01:00
55d2f6bb25 Merge tag '1.6.0' into develop
1.6.0
2020-12-14 18:51:58 +01:00
c38a6883c6 Merge branch 'release/1.6.0' 2020-12-14 18:51:50 +01:00
1ba6588148 Fix APK release path 2020-12-14 18:45:43 +01:00
57bde5c7fe Merge tag '1.6.0' into develop
1.6.0
2020-12-14 18:33:06 +01:00
db267632d2 Merge branch 'release/1.6.0' 2020-12-14 18:32:58 +01:00
c0e3bc4c63 Fix APK release path 2020-12-14 18:26:05 +01:00
bdf4a656d0 Merge tag '1.6.0' into develop
1.6.0
2020-12-14 18:12:32 +01:00
41e81b6bc2 Merge branch 'release/1.6.0' 2020-12-14 18:11:59 +01:00
39160cb2c8 Release start 2020-12-14 18:05:39 +01:00
90abf17501 Update Build Tools to 30.0.3 2020-12-12 23:41:17 +01:00
c556f23903 Update Build Tools to 30.0.3 2020-12-12 23:29:58 +01:00
dependabot-preview[bot]
3fbcae3c33 Bump firebase-bom from 26.1.0 to 26.1.1 (#304)
Bumps firebase-bom from 26.1.0 to 26.1.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-12-04 09:05:18 +01:00
dependabot-preview[bot]
6c63f1492c Bump firebase-bom from 26.0.0 to 26.1.0 (#303)
Bumps firebase-bom from 26.0.0 to 26.1.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-11-13 08:02:51 +01:00
dependabot-preview[bot]
cda35f9995 Bump gradle from 4.1.0 to 4.1.1 (#302)
Bumps gradle from 4.1.0 to 4.1.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-11-11 09:58:35 +01:00
dependabot-preview[bot]
d9d74d6dfd Bump firebase-bom from 25.13.0 to 26.0.0 (#301)
Bumps firebase-bom from 25.13.0 to 26.0.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-10-28 18:45:08 +01:00
dependabot-preview[bot]
4ab58545d1 Bump firebase-bom from 25.12.0 to 25.13.0 (#300)
* Bump firebase-bom from 25.12.0 to 25.13.0

Bumps firebase-bom from 25.12.0 to 25.13.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Update SWADroid/build.gradle

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
2020-10-27 22:43:49 +01:00
e545548862 Update README.md 2020-10-15 18:07:39 +02:00
3df5d9224d Update CHANGELOG and authors (#299)
* Update CHANGELOG

* Update authors
2020-10-14 23:16:57 +02:00
b3a9dc5ad4 Remove firebase-core dependency 2020-10-14 22:19:01 +02:00
bd985c9cf3 Add Firebase dependencies (#298) 2020-10-14 21:10:03 +02:00
Javier Bueno López
ab0898c571 Indoor Location new module (#287)
* Adding icons and text for manage location

* Adding manage location to main menu

* Adding class to manage location

* Adding view layout to manage location

* Share location switch created

* Basic listener added to switch

* Moving manage location to users menu

* Adding icons and text for manage location

* Adding manage location to main menu

* Adding class to manage location

* Adding view layout to manage location

* Share location switch created

* Basic listener added to switch

* Moving manage location to users menu

* Adding elements to indoor_location view

* Improving indoor_location with default text

* Logic to calculate distance

* Trying to connect to the API.

* Adding model to location distance

* Changing textview to listview

* Making request to MacStore API to get location of Mac

* Search user menu

* New designs manage location activity

* Connecting to swad api

* Connection to swad api working

* Location history showing up in activity

* Adding button and user code to find user

* Sorting locations and saving only one

* Implementing GetLastLocation API method

* Adding location preferences translations

* Adding translations to location menu toast

* Return without error from searching user

* Removing warning

* Adding translations

* Changing permissions

* Changing module name

* Making location serializable

* Changing deprecated implementation

* Cleaning code and refactoring deprecated classes

* Changing location name in menu

* Scanning all wifi networks

* Hiding white activities

* Showing more information in each location

* Fixing bug when searching user

* Fixing available networks sort

* Using roomCode instead of institutionCode

* Changes scheduling tasks

* Deleting dependencies

* Deleting useless import

* Getting correct mac

* Requesting permissions to user

* LocationTimeStamp inherits from Location

* Using new variable to soap object

* Setting const defaultValue

* Extracting common lines on update location click

* Extracting common lines on activity result

* Update SWADroid/src/main/res/values/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/res/values/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/res/values-es/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Using functions to reduce code

* Update SWADroid/src/main/res/values/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/GetLastLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/model/UserFilter.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/GetLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/GetLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/GetLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/IndoorLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/IndoorLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/IndoorLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/IndoorLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/IndoorLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/IndoorLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/IndoorLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/IndoorLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/IndoorLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Constant moved to class level

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/SendCurrentLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/SendCurrentLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/indoorlocation/SendCurrentLocation.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/SearchUsers.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/res/values-es/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/res/values-es/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/res/values-es/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/res/values-es/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/res/values-es/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/res/values-es/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/res/values-es/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/res/values/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/res/values/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/res/values/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/res/values/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/res/values/strings.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Adding dependency to preferences

* Changing indoor location title text

* Showing text when no location is found

* Allow always location option

* Adding new button to show mac

* Find mac button added and working

* Stopping scheduler when user can't be located

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/model/LocationTimeStamp.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/model/LocationTimeStamp.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/java/es/ugr/swad/swadroid/model/LocationTimeStamp.java

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update SWADroid/src/main/res/xml/preferences.xml

Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>

* Update material version to 1.2.1

* Updating plugin

* Fixing API permissions

* Update gradle/wrapper/gradle-wrapper.properties

* Minor code style improvements

* Fix IndexOutOfBoundsException

* Add default locale to SimpleDateFormat

* Use complete Gradle distribution

* Update authors

* Update CHANGELOG

* Remove unused import

* Minor code style improvements

Co-authored-by: javibl8@correo.ugr.es <javier.bueno@jitkey.com>
Co-authored-by: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
2020-10-14 19:50:20 +02:00
dependabot-preview[bot]
df40491a2f Bump gradle from 4.0.2 to 4.1.0 (#297)
* Bump gradle from 4.0.2 to 4.1.0

Bumps gradle from 4.0.2 to 4.1.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Update Gradle version to 6.6.1

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Amab <juanmi1982@gmail.com>
2020-10-13 17:05:33 +02:00
dependabot-preview[bot]
0618081fda Bump firebase-core from 17.5.0 to 17.5.1 (#296)
Bumps firebase-core from 17.5.0 to 17.5.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-10-07 08:32:55 +02:00
dependabot-preview[bot]
a71911cf69 Bump gradle from 4.0.1 to 4.0.2 (#295)
Bumps gradle from 4.0.1 to 4.0.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-10-07 08:25:41 +02:00
dependabot-preview[bot]
9546faeb9e Bump google-services from 4.3.3 to 4.3.4 (#294)
Bumps google-services from 4.3.3 to 4.3.4.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-30 07:48:32 +02:00
dependabot-preview[bot]
7a7de175ff Bump core from 3.4.0 to 3.4.1 (#293)
Bumps [core](https://github.com/zxing/zxing) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/zxing/zxing/releases)
- [Changelog](https://github.com/zxing/zxing/blob/master/CHANGES)
- [Commits](https://github.com/zxing/zxing/compare/zxing-3.4.0...zxing-3.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-30 07:38:55 +02:00
58240541f7 Use the standard directory for file downloads. Fixes #291 (#292)
* Use the standard directory for file downloads. Fixes #291

* Use OS independent file separator
2020-09-29 18:19:34 +02:00
dependabot-preview[bot]
086a70421f Bump commons-io from 2.7 to 2.8.0 (#289)
Bumps commons-io from 2.7 to 2.8.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-09-18 16:47:57 +02:00
8da102888c Fix Travis CI encrypted vars for Pull Requests (#288)
* Fix Travis CI encrypted vars for Pull Requests

* Fix Travis CI encrypted vars for Pull Requests (try 2)

* Fix misspelled command

* Double quote vars in shell scripts
2020-09-06 12:30:16 +02:00
95472cd80e Update Build Tools to 30.0.2 (#286) 2020-08-18 18:34:32 +02:00
dependabot-preview[bot]
785a255648 Bump firebase-core from 17.4.4 to 17.5.0 (#285)
Bumps firebase-core from 17.4.4 to 17.5.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-08-14 08:27:46 +02:00
dependabot-preview[bot]
99bfc45b79 Bump appcompat from 1.1.0 to 1.2.0 (#284)
Bumps appcompat from 1.1.0 to 1.2.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-08-06 17:13:19 +02:00
84f25e646c Update Build Tools to 30.0.1 (#283) 2020-07-20 21:37:18 +02:00
dependabot-preview[bot]
acb8d33992 Bump gradle from 4.0.0 to 4.0.1 (#282)
Bumps gradle from 4.0.0 to 4.0.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-15 15:57:58 +02:00
dependabot-preview[bot]
eeac30121a Bump firebase-core from 17.4.3 to 17.4.4 (#281)
Bumps firebase-core from 17.4.3 to 17.4.4.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-07 07:20:40 +02:00
9e5d0b281e Add support for Android 10.0+ (R) (#280) 2020-06-25 18:27:31 +02:00
dependabot-preview[bot]
797a098c58 Bump firebase-core from 17.4.2 to 17.4.3 (#279)
Bumps firebase-core from 17.4.2 to 17.4.3.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-06-05 07:36:27 +02:00