fix: Removed cloudrail service and added dropbox sdk (#2885)

Author: codedsun

app/build.gradle

@@ -201,8 +201,7 @@ dependencies {
     implementation "org.twitter4j:twitter4j-core:3.0.5"
     implementation "org.twitter4j:twitter4j-media-support:3.0.5"
 
-    //cloud rail
-    implementation 'com.cloudrail:cloudrail-si-android:2.20.1'
+    implementation 'com.dropbox.core:dropbox-core-sdk:3.1.1'
 
     //next cloud
     implementation "com.github.nextcloud:android-library:$rootProject.nextCloudVersion"

app/src/main/AndroidManifest.xml

@@ -368,6 +368,21 @@
         <activity
             android:name=".share.imgur.ImgurAuthActivity"
             android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name="com.dropbox.core.android.AuthActivity"
+            android:configChanges="orientation|keyboard"
+            android:launchMode="singleTask">
+            <intent-filter>
+
+                <!-- Change this to be db- followed by your app key -->
+                <data android:scheme="db-7fhwc9meece1m9g" />
+
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".share.owncloud.OwnCloudActivity"
             android:label="@string/title_activity_own_cloud"

app/src/main/java/org/fossasia/phimpme/accounts/AccountActivity.java

@@ -34,9 +34,8 @@
 import com.box.androidsdk.content.BoxConfig;
 import com.box.androidsdk.content.auth.BoxAuthentication;
 import com.box.androidsdk.content.models.BoxSession;
-import com.cloudrail.si.CloudRail;
+import com.dropbox.core.android.Auth;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
-import com.google.android.material.snackbar.Snackbar;
 import com.pinterest.android.pdk.PDKCallback;
 import com.pinterest.android.pdk.PDKClient;
 import com.pinterest.android.pdk.PDKException;
@@ -74,8 +73,6 @@ public class AccountActivity extends ThemedActivity
   private static final int OWNCLOUD_REQUEST_CODE = 9;
   private static final int RESULT_OK = 1;
   public static final String BROWSABLE = "android.intent.category.BROWSABLE";
-  public static final String CLOUDRAIL_APP_KEY =
-      Constants.CLOUDRAIL_LICENSE_KEY; // CloudRail_App-Key
 
   @BindView(R.id.accounts_parent)
   RelativeLayout parentLayout;
@@ -101,7 +98,6 @@ public class AccountActivity extends ThemedActivity
   private AccountDatabase account;
   private DatabaseHelper databaseHelper;
   private Context context;
-  private CloudRailServices cloudRailServices;
   private PDKClient pdkClient;
   // private GoogleApiClient mGoogleApiClient;
   private BoxSession sessionBox;
@@ -129,7 +125,6 @@ public void onCreate(Bundle savedInstanceState) {
     accountPresenter.loadFromDatabase(); // Calling presenter function to load data from database
     getSupportActionBar().setTitle(R.string.title_account);
     phimpmeProgressBarHandler.show();
-    cloudRailServices = CloudRailServices.getInstance();
     pdkClient = PDKClient.configureInstance(this, PINTEREST_APP_ID);
     pdkClient.onConnect(this);
     setDebugMode(true);
@@ -249,13 +244,7 @@ public void onItemClick(final View childView, final int position) {
           break;
 
         case DROPBOX:
-          if (CLOUDRAIL_APP_KEY == null || CLOUDRAIL_APP_KEY.equals("")) {
-            SnackBarHandler.create(
-                    findViewById(android.R.id.content),
-                    getString(R.string.Cloudrail_License_key),
-                    Snackbar.LENGTH_SHORT)
-                .show();
-          } else signInDropbox();
+          Auth.startOAuth2Authentication(this, Constants.DROPBOX_APP_KEY);
           break;
 
         case OWNCLOUD:
@@ -367,74 +356,6 @@ public void onLoginFailed(RuntimeException e) {
               .initiateInActivity(AccountActivity.this);
   }*/
 
-  private void signInDropbox() {
-    if (accountPresenter.checkAlreadyExist(DROPBOX)) {
-      SnackBarHandler.create(coordinatorLayout, getString(R.string.already_signed_in)).show();
-    } else cloudRailServices.prepare(this);
-    cloudRailServices.login();
-    BasicCallBack basicCallBack =
-        new BasicCallBack() {
-          @Override
-          public void callBack(int status, Object data) {
-            if (status == 1) {
-              dropboxAuthentication(data.toString());
-            }
-          }
-        };
-    CloudRailServices.setCallBack(basicCallBack);
-  }
-  /*
-  Catching the intent of the external browser login and getting that data
-   */
-
-  @Override
-  protected void onNewIntent(Intent intent) {
-    try {
-
-      if (intent.getCategories().contains(BROWSABLE)) {
-        CloudRail.setAuthenticationResponse(intent);
-      }
-    } catch (Exception e) {
-      // Nothing is to be done when the BROWSABLE Intent is null
-    }
-    super.onNewIntent(intent);
-  }
-
-  /* private void signInGoogleDrive() {
-      if(accountPresenter.checkAlreadyExist(GOOGLEDRIVE))
-          SnackBarHandler.show(coordinatorLayout,"Already Signed In");
-      else
-          cloudRailServices.prepare(this);
-          cloudRailServices.googleDriveLogin();
-          BasicCallBack basicCallBack = new BasicCallBack() {
-              @Override
-              public void callBack(int status, Object data) {
-                  if(status == 2){
-                      Log.e("TAG", "callBack: GOOGLE DRIVE"+data.toString() );
-                      googleDriveAuthentication(data.toString());
-                  }
-              }
-          };
-          CloudRailServices.setCallBack(basicCallBack);
-  }*/
-
-  /* private void signInOneDrive(){
-      if(accountPresenter.checkAlreadyExist(ONEDRIVE))
-          SnackBarHandler.show(coordinatorLayout,"Already Signed In");
-      else
-          cloudRailServices.prepare(this);
-          cloudRailServices.oneDriveLogin();
-          BasicCallBack  basicCallBack = new BasicCallBack() {
-              @Override
-              public void callBack(int status, Object data) {
-                  if(status==3){
-                      oneDriveAuthentication(data.toString());
-                  }
-              }
-          };
-          CloudRailServices.setCallBack(basicCallBack);
-  }*/
-
   private void signInImgur() {
     BasicCallBack basicCallBack =
         new BasicCallBack() {
@@ -566,6 +487,9 @@ public void onResume() {
     toolbar.setBackgroundColor(ThemeHelper.getPrimaryColor(this));
     // dropboxAuthentication();
     boxAuthentication();
+    if (Auth.getOAuth2Token() != null) {
+      dropBoxAuthentication(Auth.getOAuth2Token());
+    }
     setStatusBarColor();
     setNavBarColor();
     accountPresenter.loadFromDatabase();
@@ -601,59 +525,6 @@ private void boxAuthentication() {
     }
   }
 
-  private void dropboxAuthentication(String tokens) {
-    try {
-      String result = cloudRailServices.db.saveAsString();
-      Log.d(
-          getString(R.string.AccountsActivity),
-          getString(R.string.dropboxAuthentication) + tokens + " " + result);
-      String accessToken = cloudRailServices.getToken();
-      realm.beginTransaction();
-      account = realm.createObject(AccountDatabase.class, DROPBOX.toString());
-      account.setUsername(DROPBOX.toString());
-      account.setToken(String.valueOf(accessToken));
-      realm.commitTransaction();
-
-    } catch (Exception e) {
-      // catches exception dont need handling
-    }
-    accountPresenter.loadFromDatabase();
-  }
-
-  /* private void oneDriveAuthentication(String tokens){
-      try {
-          String result = cloudRailServices.oneDrive.saveAsString();
-          Log.d("AccountsActivity", "oneDriveAuthentication: "+tokens+" "+result );
-          String accessToken = cloudRailServices.getOneDriveToken();
-          realm.beginTransaction();
-          account = realm.createObject(AccountDatabase.class,ONEDRIVE.toString());
-          account.setUsername(ONEDRIVE.toString());
-          account.setToken(String.valueOf(accessToken));
-          realm.commitTransaction();
-      }
-      catch (Exception e){
-          //No need of handling it
-      }
-      accountPresenter.loadFromDatabase();
-  }*/
-
-  /* private void googleDriveAuthentication(String tokens) {
-      try{
-          String token = cloudRailServices.googleDrive.saveAsString();
-          Log.e("AccountsActivity", "googleDriveAuthentication: "+token + "Matching Token "+tokens);
-          String accessToken = cloudRailServices.getGoogleDriveToken();
-          realm.beginTransaction();
-          account = realm.createObject(AccountDatabase.class,GOOGLEDRIVE.toString());
-          account.setUsername(GOOGLEDRIVE.toString());
-          account.setToken(String.valueOf(accessToken));
-          realm.commitTransaction();
-      }catch (Exception e)
-      {
-          //No need for handling
-      }
-      accountPresenter.loadFromDatabase();
-  }*/
-
   @Override
   protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     super.onActivityResult(requestCode, resultCode, data);
@@ -692,4 +563,13 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
           SnackBarHandler.show(parentLayout,R.string.google_auth_fail);
       }
   }*/
+
+  // Handles the Auth Activity result of DropBox signIn flow
+  private void dropBoxAuthentication(String token) {
+    realm.beginTransaction();
+    account = realm.createObject(AccountDatabase.class, DROPBOX.toString());
+    account.setUsername(DROPBOX.toString());
+    account.setToken(token);
+    realm.commitTransaction();
+  }
 }