hft-informatik/ubiquitous-computing-geo-timetracking
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '82-update-geofence-for-api-29' into 'master'

Browse Source 
Resolve "Update geofence for API 29"

Closes #82

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!57
This commit is contained in:
Tobias Wieck 2020-05-18 21:13:15 +00:00
commit 0aa257dbaf
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
android/app/src/main/java/de/hft/geotracker/activities/Login.kt
View File

@ -1,11 +1,15 @@
package de.hft.geotracker.activities
import android.Manifest
import android.content.Intent
import android.content.pm.PackageManager
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import de.hft.geotracker.*
import de.hft.geotracker.data.JWToken
import de.hft.geotracker.retrofit.GeofenceService
@ -29,6 +33,19 @@ class Login : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_login)
if (ContextCompat.checkSelfPermission(this,
Manifest.permission.ACCESS_BACKGROUND_LOCATION
) != PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(
this,
arrayOf(Manifest.permission.ACCESS_BACKGROUND_LOCATION),
1000
)
} else {
// Background location runtime permission already granted.
// You can now call geofencingClient.addGeofences().
}
val retrofit = Retrofit.Builder()
.baseUrl("http://plesk.icaotix.de:5000")
.addConverterFactory(GsonConverterFactory.create())

2
android/app/src/main/java/de/hft/geotracker/activities/MainActivity.kt
View File

@ -111,7 +111,7 @@ class MainActivity : AppCompatActivity() {
}
private fun getGeofencingRequest() : GeofencingRequest {
return GeofencingRequest.Builder().apply {
setInitialTrigger(GeofencingRequest.INITIAL_TRIGGER_DWELL)
setInitialTrigger(GeofencingRequest.INITIAL_TRIGGER_ENTER)
addGeofence(geofence)
}.build()
}