Commit Graph

2282 Commits

Author SHA1 Message Date
4a0c59bf54 Merge branch 'release/1.5.7' 2020-12-19 13:33:39 +01:00
f0634fc548 Fix apksigner input ak 2020-12-19 13:26:54 +01:00
3dbcddcb85 Merge tag '1.5.7' into develop
1.5.7
2020-12-19 13:18:33 +01:00
ba50285216 Merge branch 'release/1.5.7' 2020-12-19 13:18:27 +01:00
39ee2fbe17 Fix apksigner path 2020-12-19 13:01:14 +01:00
37a4fec61a Merge tag '1.5.7' into develop
1.5.7
2020-12-19 12:53:04 +01:00
7fd1c70481 Merge branch 'release/1.5.7' 2020-12-19 12:52:56 +01:00
fa97455c24 Revert "Update signing step"
This reverts commit 7f1d9f05
2020-12-19 12:46:27 +01:00
7f1d9f05c9 Update signing step 2020-12-19 12:39:08 +01:00
48532fa7de Fix zipalign step 2020-12-19 11:40:17 +01:00
82f311a5d3 Revert "Fix zipalign path in Travis CI"
This reverts commit e33acdeb
2020-12-19 11:16:29 +01:00
3931cb1208 Merge tag '1.5.7' into develop
1.5.7
2020-12-19 10:32:46 +01:00
3f443bb3d2 Merge branch 'release/1.5.7' 2020-12-19 10:32:39 +01:00
e33acdeb8d Fix zipalign path in Travis CI 2020-12-19 10:26:18 +01:00
9dbab7d50a Merge tag '1.5.7' into develop
1.5.7
2020-12-19 10:13:07 +01:00
f6b98f6be3 Merge branch 'release/1.5.7' 2020-12-19 10:12:57 +01:00
8045b2d885
Disable indoor location module (#307) 2020-12-19 10:05:57 +01:00
dependabot-preview[bot]
b3ea153c37
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
d939b86c21 Fix APK signing 2020-12-15 21:28:29 +01:00
84719af512 Disable cleanup in Travis CI 2020-12-14 20:31:30 +01:00
119475c840 Merge tag '1.6.0' into develop
1.6.0
2020-12-14 20:24:59 +01:00
e983322337 Merge branch 'release/1.6.0' 2020-12-14 20:24:52 +01:00
a02858ab78 Enable skip_cleanup in Travis CI 2020-12-14 20:18:26 +01:00
fb2db21dc6 Merge tag '1.6.0' into develop
1.6.0
2020-12-14 20:05:59 +01:00
8ca8eaa2d0 Merge branch 'release/1.6.0' 2020-12-14 20:05:52 +01:00
87622cd05e Updated deploy token for Travis CI 2020-12-14 19:58:55 +01:00
f1e989cbed Merge tag '1.6.0' into develop
1.6.0
2020-12-14 18:51:58 +01:00
11c63dd248 Merge branch 'release/1.6.0' 2020-12-14 18:51:50 +01:00
43ce80cc90 Fix APK release path 2020-12-14 18:45:43 +01:00
e2b40cf370 Merge tag '1.6.0' into develop
1.6.0
2020-12-14 18:33:06 +01:00
1afa9ed982 Merge branch 'release/1.6.0' 2020-12-14 18:32:58 +01:00
facc5d477d Fix APK release path 2020-12-14 18:26:05 +01:00
acb19c5da6 Merge tag '1.6.0' into develop
1.6.0
2020-12-14 18:12:32 +01:00
b396a35d57 Merge branch 'release/1.6.0' 2020-12-14 18:11:59 +01:00
eb3c77c559 Release start 2020-12-14 18:05:39 +01:00
4b1fb9a739 Update Build Tools to 30.0.3 2020-12-12 23:41:17 +01:00
09bd807d5b Update Build Tools to 30.0.3 2020-12-12 23:29:58 +01:00
dependabot-preview[bot]
9ca7d27d6c
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]
3f6b9930ff
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]
c0b6af767d
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]
20ce0b34cf
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]
d6a2d30fe8
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
e9a0f6fa6f
Update README.md 2020-10-15 18:07:39 +02:00
29efcd13b6
Update CHANGELOG and authors (#299)
* Update CHANGELOG

* Update authors
2020-10-14 23:16:57 +02:00
7e2c51d649 Remove firebase-core dependency 2020-10-14 22:19:01 +02:00
f9766b65ea
Add Firebase dependencies (#298) 2020-10-14 21:10:03 +02:00
Javier Bueno López
c272ffc372
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]
fc2a29b7f0
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]
37f3db5598
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]
94375b0015
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