wbrawner/Simple-Calendar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disable google sync if we dont have the Get Accounts permission

Browse source
This commit is contained in:
tibbi 2017-07-12 23:50:36 +02:00
parent cfeaf7bfc8
commit 553e658b88
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
View file

@ -83,6 +83,10 @@ class MainActivity : SimpleActivity(), NavigationListener {
}
storeStateVariables()
updateViewPager()
if (!hasGetAccountsPermission()) {
config.googleSync = false
}
}
override fun onResume() {

11
app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
View file

@ -11,7 +11,6 @@ import android.net.Uri
import android.os.Bundle
import android.os.Parcelable
import android.support.v4.app.ActivityCompat
import android.support.v4.content.ContextCompat
import com.google.android.gms.common.ConnectionResult
import com.google.android.gms.common.GoogleApiAvailability
import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential
@ -313,8 +312,7 @@ class SettingsActivity : SimpleActivity() {
tryEnablingSync()
}
} else if (resultCode == Activity.RESULT_CANCELED && requestCode == REQUEST_ACCOUNT_NAME) {
settings_google_sync.toggle()
config.googleSync = false
disableGoogleSync()
}
}
@ -345,7 +343,10 @@ class SettingsActivity : SimpleActivity() {
}
}
private fun hasGetAccountsPermission() = ContextCompat.checkSelfPermission(this, Manifest.permission.GET_ACCOUNTS) == PackageManager.PERMISSION_GRANTED
private fun disableGoogleSync() {
settings_google_sync.toggle()
config.googleSync = false
}
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
@ -353,6 +354,8 @@ class SettingsActivity : SimpleActivity() {
if (requestCode == ACCOUNTS_PERMISSION) {
if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
showAccountChooser()
} else {
disableGoogleSync()
}
}
}

5
app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Activity.kt
View file

@ -1,7 +1,10 @@
package com.simplemobiletools.calendar.extensions
import android.Manifest
import android.app.Activity
import android.content.Intent
import android.content.pm.PackageManager
import android.support.v4.content.ContextCompat
import android.support.v4.content.FileProvider
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.activities.SimpleActivity
@ -9,6 +12,8 @@ import com.simplemobiletools.calendar.helpers.IcsExporter
import com.simplemobiletools.commons.extensions.toast
import java.io.File
fun Activity.hasGetAccountsPermission() = ContextCompat.checkSelfPermission(this, Manifest.permission.GET_ACCOUNTS) == PackageManager.PERMISSION_GRANTED
fun SimpleActivity.shareEvents(ids: List<Int>) {
val file = getTempFile()
if (file == null) {