Merge branch 'googledrive'

orgzly · Jun 22, 2021 · 1ef1b1b · 1ef1b1b
2 parents 4425eb5 + 4cf9112
commit 1ef1b1b
Show file tree

Hide file tree

Showing 14 changed files with 979 additions and 14 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -70,18 +70,22 @@ android {
         premium {
             buildConfigField "boolean", "IS_DROPBOX_ENABLED", "true"
 
+            buildConfigField "boolean", "IS_GOOGLE_DRIVE_ENABLED", "true"
+
             buildConfigField "String", "VERSION_NAME_SUFFIX", '""'
 
             dimension "store"
         }
 
         fdroid {
             /*
-             * Disable Dropbox.
+             * Disable Dropbox and Google Drive.
              * Properties file which contains the required API key is not included with the code.
              */
             buildConfigField "boolean", "IS_DROPBOX_ENABLED", "false"
 
+            buildConfigField "boolean", "IS_GOOGLE_DRIVE_ENABLED", "false"
+
             buildConfigField "String", "VERSION_NAME_SUFFIX", '" (fdroid)"'
 
             dimension "store"
@@ -169,6 +173,21 @@ dependencies {
 
     implementation "com.dropbox.core:dropbox-core-sdk:$versions.dropbox_core_sdk"
 
+    // Google Drive
+    // implementation 'com.google.api-client:google-api-client:1.23.0'
+    // implementation 'com.google.oauth-client:google-oauth-client-jetty:1.23.0'
+    // implementation 'com.google.apis:google-api-services-drive:v3-rev110-1.23.0'
+
+    implementation 'com.google.android.gms:play-services-auth:19.0.0'
+    // implementation 'com.google.android.gms:play-services-drive:17.0.0'
+    implementation 'com.google.http-client:google-http-client-gson:1.26.0'
+    implementation('com.google.api-client:google-api-client-android:1.26.0') {
+        exclude group: 'org.apache.httpcomponents'
+    }
+    implementation('com.google.apis:google-api-services-drive:v3-rev136-1.25.0') {
+        exclude group: 'org.apache.httpcomponents'
+    }
+
     implementation "com.googlecode.juniversalchardet:juniversalchardet:$versions.juniversalchardet"
 
     implementation "com.evernote:android-job:$versions.evernote_android_job"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -93,6 +93,11 @@
             android:windowSoftInputMode="stateAlwaysHidden">
         </activity>
 
+        <activity
+            android:name=".android.ui.repo.googledrive.GoogleDriveRepoActivity"
+            android:windowSoftInputMode="stateAlwaysHidden">
+        </activity>
+
         <activity
             android:name="com.dropbox.core.android.AuthActivity"
             android:configChanges="orientation|keyboard"

diff --git a/app/src/main/java/com/orgzly/android/di/AppComponent.kt b/app/src/main/java/com/orgzly/android/di/AppComponent.kt
@@ -24,6 +24,7 @@ import com.orgzly.android.ui.refile.RefileFragment
 import com.orgzly.android.ui.repo.BrowserActivity
 import com.orgzly.android.ui.repo.directory.DirectoryRepoActivity
 import com.orgzly.android.ui.repo.dropbox.DropboxRepoActivity
+import com.orgzly.android.ui.repo.googledrive.GoogleDriveRepoActivity
 import com.orgzly.android.ui.repo.git.GitRepoActivity
 import com.orgzly.android.ui.repo.webdav.WebdavRepoActivity
 import com.orgzly.android.ui.repos.ReposActivity
@@ -51,6 +52,7 @@ interface AppComponent {
     fun inject(arg: MainActivity)
     fun inject(arg: ReposActivity)
     fun inject(arg: DropboxRepoActivity)
+    fun inject(arg: GoogleDriveRepoActivity)
     fun inject(arg: DirectoryRepoActivity)
     fun inject(arg: WebdavRepoActivity)
     fun inject(arg: GitRepoActivity)
@@ -83,4 +85,4 @@ interface AppComponent {
     fun inject(arg: ListWidgetProvider)
     fun inject(arg: NewNoteBroadcastReceiver)
     fun inject(arg: TimeChangeBroadcastReceiver)
-}
+}