diff --git a/app/build.gradle b/app/build.gradle
index e3d5575..1182772 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,8 +48,8 @@ dependencies {
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
- implementation 'com.google.code.gson:gson:2.9.0'
+ implementation 'com.google.code.gson:gson:2.10.1'
-// implementation project(':libDriveBackup')
- implementation 'com.github.fcat97:driveBackupApi:1.0.4'
+ implementation project(':libDriveBackup')
+// implementation 'com.github.fcat97:driveBackupApi:1.0.5'
}
\ No newline at end of file
diff --git a/app/src/main/java/com/tos/drivebackup/MainActivity.kt b/app/src/main/java/com/tos/drivebackup/MainActivity.kt
index 2f76462..017682c 100644
--- a/app/src/main/java/com/tos/drivebackup/MainActivity.kt
+++ b/app/src/main/java/com/tos/drivebackup/MainActivity.kt
@@ -36,6 +36,7 @@ class MainActivity : ComponentActivity() {
private lateinit var terminal: TextView
private lateinit var emailTextView: TextView
private lateinit var signOutButton: Button
+ private lateinit var signInButton: Button
private val googleDriveBackupManager = GoogleDriveBackupManager(
appID = BuildConfig.APPLICATION_ID,
@@ -69,6 +70,7 @@ class MainActivity : ComponentActivity() {
terminal = findViewById(R.id.terminal)
emailTextView = findViewById(R.id.emailTextView)
signOutButton = findViewById(R.id.signOutButton)
+ signInButton = findViewById(R.id.signInButton)
createDemoBackupButton.setOnClickListener { createDemoBackup() }
downloadDemoBackupButton.setOnClickListener { downloadDemoBackup() }
@@ -90,6 +92,7 @@ class MainActivity : ComponentActivity() {
fetchFiles()
}
}
+ signInButton.setOnClickListener { singIn() }
signOutButton.setOnClickListener { signOut() }
clearTerminalButton.setOnClickListener { terminalOutputLiveData.value = "" }
@@ -156,6 +159,15 @@ class MainActivity : ComponentActivity() {
)
}
+ private fun singIn() {
+ googleDriveBackupManager.signIn(
+ onFailed = null,
+ onSuccess = {
+ printToTerminal(it.toString())
+ }
+ )
+ }
+
private fun signOut() {
googleDriveBackupManager.signOut(
onFailed = {
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 55556fa..a72df5d 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -120,6 +120,14 @@
android:layout_gravity="center_horizontal"
tools:text="Example\nexample@gmail.com"/>
+
+
Unit)?,
+ onSuccess: (UserInfo) -> Unit
+ ) = requestConsentAndProceed(onFailed) {
+ val info = GetSignedInEmail.getSignedInEmail(activity)
+ if (info != null) onSuccess(info)
+ else onFailed?.invoke(Exception(""))
+ }
+
/**
* Request for User Consent to grant access to his/her drive account.
*