fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

check for Google Play availability at Google Sync toggle

This commit is contained in:
tibbi 2017-01-29 22:31:32 +01:00
parent f285bee725
commit 31112a807e
1 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
app/src/main/kotlin/com/simplemobiletools/calendar/activities/SettingsActivity.kt
View File

@ -13,6 +13,8 @@ import android.support.v4.content.ContextCompat
import android.view.View import android.view.View
import android.widget.AdapterView import android.widget.AdapterView
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
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 import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential
import com.google.api.client.util.ExponentialBackOff import com.google.api.client.util.ExponentialBackOff
import com.google.api.services.calendar.CalendarScopes import com.google.api.services.calendar.CalendarScopes
@ -30,7 +32,8 @@ import kotlinx.android.synthetic.main.activity_settings.*
class SettingsActivity : SimpleActivity() { class SettingsActivity : SimpleActivity() {
private val GET_RINGTONE_URI = 1 private val GET_RINGTONE_URI = 1
private val ACCOUNTS_PERMISSION = 2 private val ACCOUNTS_PERMISSION = 2
private val REQUEST_ACCOUNT = 3 private val REQUEST_ACCOUNT_NAME = 3
private val REQUEST_GOOGLE_PLAY_SERVICES = 4
lateinit var credential: GoogleAccountCredential lateinit var credential: GoogleAccountCredential
@ -69,9 +72,7 @@ class SettingsActivity : SimpleActivity() {
config.googleSync = settings_google_sync.isChecked config.googleSync = settings_google_sync.isChecked
if (settings_google_sync.isChecked) { if (settings_google_sync.isChecked) {
if (config.syncAccountName.isEmpty()) { tryEnablingSync()
checkGetAccountsPermission()
}
} }
} }
} }
@ -213,18 +214,42 @@ class SettingsActivity : SimpleActivity() {
} }
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
if (resultCode == RESULT_OK && requestCode == GET_RINGTONE_URI) { if (resultCode == RESULT_OK) {
val uri = resultData?.getParcelableExtra<Parcelable>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI) if (requestCode == GET_RINGTONE_URI) {
if (uri == null) { val uri = resultData?.getParcelableExtra<Parcelable>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
config.reminderSound = "" if (uri == null) {
} else { config.reminderSound = ""
settings_reminder_sound.text = RingtoneManager.getRingtone(this, uri as Uri).getTitle(this) } else {
config.reminderSound = uri.toString() settings_reminder_sound.text = RingtoneManager.getRingtone(this, uri as Uri).getTitle(this)
config.reminderSound = uri.toString()
}
} else if (requestCode == REQUEST_ACCOUNT_NAME && resultData?.extras != null) {
val accountName = resultData!!.getStringExtra(AccountManager.KEY_ACCOUNT_NAME)
config.syncAccountName = accountName
credential.selectedAccountName = accountName
} }
} else if (resultCode == RESULT_OK && requestCode == REQUEST_ACCOUNT && resultData?.extras != null) { }
val accountName = resultData!!.getStringExtra(AccountManager.KEY_ACCOUNT_NAME) }
config.syncAccountName = accountName
credential.selectedAccountName = accountName private fun tryEnablingSync() {
if (!isGooglePlayServicesAvailable()) {
acquireGooglePlayServices()
} else if (config.syncAccountName.isEmpty()) {
checkGetAccountsPermission()
}
}
private fun isGooglePlayServicesAvailable(): Boolean {
val apiAvailability = GoogleApiAvailability.getInstance()
val connectionStatusCode = apiAvailability.isGooglePlayServicesAvailable(this)
return connectionStatusCode == ConnectionResult.SUCCESS
}
private fun acquireGooglePlayServices() {
val apiAvailability = GoogleApiAvailability.getInstance()
val connectionStatusCode = apiAvailability.isGooglePlayServicesAvailable(this)
if (apiAvailability.isUserResolvableError(connectionStatusCode)) {
GoogleApiAvailability.getInstance().getErrorDialog(this, connectionStatusCode, REQUEST_GOOGLE_PLAY_SERVICES).show()
} }
} }
@ -248,7 +273,7 @@ class SettingsActivity : SimpleActivity() {
private fun showAccountChooser() { private fun showAccountChooser() {
if (config.syncAccountName.isEmpty()) { if (config.syncAccountName.isEmpty()) {
startActivityForResult(credential.newChooseAccountIntent(), REQUEST_ACCOUNT) startActivityForResult(credential.newChooseAccountIntent(), REQUEST_ACCOUNT_NAME)
} }
} }
} }