-
Notifications
You must be signed in to change notification settings - Fork 539
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update DropBox API from v1 to v2 - fixes #552
Remove DropBox sync API libraries and dependencies Fixes bug where Dropbox production app_key is used in development mode Now there should be no conflict when linking dropbox app from production and development flavours on the same device
- Loading branch information
1 parent
a30b36b
commit a74a9cb
Showing
13 changed files
with
179 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
app/src/main/java/org/gnucash/android/export/DropboxHelper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * Copyright (c) 2016 Ngewi Fet <ngewif@gmail.com> | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.gnucash.android.export; | ||
|
|
||
| import android.app.Activity; | ||
| import android.content.Context; | ||
| import android.content.SharedPreferences; | ||
| import android.support.v7.preference.PreferenceManager; | ||
|
|
||
| import com.dropbox.core.DbxRequestConfig; | ||
| import com.dropbox.core.android.Auth; | ||
| import com.dropbox.core.v2.DbxClientV2; | ||
|
|
||
| import org.gnucash.android.BuildConfig; | ||
| import org.gnucash.android.R; | ||
| import org.gnucash.android.app.GnuCashApplication; | ||
|
|
||
| /** | ||
| * Helper class for commonly used DropBox methods | ||
| */ | ||
| public class DropboxHelper { | ||
|
|
||
| /** | ||
| * DropBox API v2 client for making requests to DropBox | ||
| */ | ||
| private static DbxClientV2 sDbxClient; | ||
| /** | ||
| * Retrieves the access token after DropBox OAuth authentication and saves it to preferences file | ||
| * <p>This method should typically by called in the {@link Activity#onResume()} method of the | ||
| * Activity or Fragment which called {@link Auth#startOAuth2Authentication(Context, String)} | ||
| * </p> | ||
| * @return Retrieved access token. Could be null if authentication failed or was canceled. | ||
| */ | ||
| public static String retrieveAndSaveToken(){ | ||
| Context context = GnuCashApplication.getAppContext(); | ||
| SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); | ||
| String keyAccessToken = context.getString(R.string.key_dropbox_access_token); | ||
| String accessToken = sharedPrefs.getString(keyAccessToken, null); | ||
| if (accessToken != null) | ||
| return accessToken; | ||
|
|
||
| accessToken = Auth.getOAuth2Token(); | ||
| sharedPrefs.edit() | ||
| .putString(keyAccessToken, accessToken) | ||
| .apply(); | ||
| return accessToken; | ||
| } | ||
|
|
||
| /** | ||
| * Return a DropBox client for making requests | ||
| * @return DropBox client for API v2 | ||
| */ | ||
| public static DbxClientV2 getClient(){ | ||
| if (sDbxClient != null) | ||
| return sDbxClient; | ||
|
|
||
| Context context = GnuCashApplication.getAppContext(); | ||
| String accessToken = PreferenceManager.getDefaultSharedPreferences(context) | ||
| .getString(context.getString(R.string.key_dropbox_access_token), null); | ||
| if (accessToken == null) | ||
| accessToken = Auth.getOAuth2Token(); | ||
|
|
||
| DbxRequestConfig config = new DbxRequestConfig(BuildConfig.APPLICATION_ID); | ||
| sDbxClient = new DbxClientV2(config, accessToken); | ||
|
|
||
| return sDbxClient; | ||
| } | ||
|
|
||
| /** | ||
| * Checks if the app holds an access token for dropbox | ||
| * @return {@code true} if token exists, {@code false} otherwise | ||
| */ | ||
| public static boolean hasToken(){ | ||
| Context context = GnuCashApplication.getAppContext(); | ||
| SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); | ||
| String accessToken = prefs.getString(context.getString(R.string.key_dropbox_access_token), null); | ||
| return accessToken != null; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.