Dropbox v2 - Beta

.dockerignore

@@ -0,0 +1,10 @@
+.git
+.idea
+.gradle
+.settings
+
+local.properties
+
+**build/**
+
+**/*.zip

.gitignore

@@ -62,3 +62,11 @@ fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
 fastlane/readme.md
+
+# VS Code
+**/.project
+**/.settings/
+**/.classpath
+
+# Exclude local configurations
+**/dropbox.xml

ActionBar-PullToRefresh/build.gradle

@@ -18,7 +18,7 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            // proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 

Dockerfile

@@ -0,0 +1,31 @@
+# docker build -t android-build .
+
+FROM openjdk:8
+
+ENV SDK_URL="https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip" \
+    ANDROID_HOME="/usr/local/android-sdk" \
+    ANDROID_VERSION=26 \
+    ANDROID_BUILD_TOOLS_VERSION=26.0.2
+
+WORKDIR /usr/src/app
+
+RUN mkdir "$ANDROID_HOME" .android \
+    && cd "$ANDROID_HOME" \
+    && curl -o sdk.zip $SDK_URL \
+    && unzip sdk.zip \
+    && rm sdk.zip \
+    && yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses
+
+ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools
+
+RUN sdkmanager --update
+RUN sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
+    "platforms;android-${ANDROID_VERSION}" \
+    "platform-tools"
+
+COPY gradlew build.gradle ./
+COPY gradle/ ./gradle/
+
+RUN ./gradlew
+
+COPY . .

app/build.gradle

@@ -8,12 +8,21 @@ android {
     defaultConfig {
 
         applicationId 'com.todotxt.todotxttouch'
-        minSdkVersion 14
-        targetSdkVersion 17
+        minSdkVersion 21
+        targetSdkVersion 21
         versionCode 35
         versionName "release35"
+
+        multiDexEnabled true
+
     }
 
+    lintOptions {
+        checkReleaseBuilds true
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        abortOnError false
+    }
 
     buildTypes {
 
@@ -23,8 +32,8 @@ android {
         }
 
         release {
-            minifyEnabled true // Enables code shrinking for the release build type.
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            // minifyEnabled true // Enables code shrinking for the release build type.
+            // proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
     flavorDimensions "free"
@@ -73,7 +82,8 @@ dependencies {
     compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
     compile 'com.android.support:support-v4:26.1.0'
     compile 'com.dropbox.core:dropbox-core-sdk:3.0.6'
+    // compile 'net.sf.proguard:proguard-gradle:6.0.3'
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:2.15.0'
-}
+}

app/src/main/AndroidManifest.xml

@@ -51,7 +51,7 @@ You should have received a copy of the GNU General Public License along with Tod
         android:label="@string/app_label"
         android:theme="@style/Theme.TodoTxt">
         <activity
-            android:name="com.dropbox.client2.android.AuthActivity"
+            android:name="com.dropbox.core.android.AuthActivity"
             android:configChanges="orientation|keyboard"
             android:launchMode="singleTask">
             <intent-filter>

app/src/main/java/com/todotxt/todotxttouch/LoginScreen.java

@@ -24,6 +24,7 @@
  */
 package com.todotxt.todotxttouch;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -45,6 +46,7 @@ public class LoginScreen extends Activity {
     private Button m_LoginButton;
     private BroadcastReceiver m_broadcastReceiver;
 
+    @SuppressLint("WrongViewCast")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/src/main/java/com/todotxt/todotxttouch/TodoPreferences.java

@@ -109,6 +109,10 @@ public String getAccessTokenSecret() {
         return m_prefs.getString(PREF_ACCESSTOKEN_SECRET, null);
     }
 
+    public void storeAccessToken(String accessTokenKey) {
+        storeAccessToken(accessTokenKey, null);
+    }
+
     public void storeAccessToken(String accessTokenKey, String accessTokenSecret) {
         Editor editor = m_prefs.edit();
         editor.putString(PREF_ACCESSTOKEN_KEY, accessTokenKey);

app/src/main/java/com/todotxt/todotxttouch/remote/DropboxClientFactory.java

@@ -0,0 +1,32 @@
+package com.todotxt.todotxttouch.remote;
+
+import com.dropbox.core.DbxHost;
+import com.dropbox.core.DbxRequestConfig;
+import com.dropbox.core.http.OkHttp3Requestor;
+import com.dropbox.core.v2.DbxClientV2;
+
+public class DropboxClientFactory {
+
+    private static DbxClientV2 sDbxClient;
+    private static String clientId = "todo.txt-android";
+
+    public static void init(String accessToken) {
+        if (sDbxClient == null) {
+            DbxRequestConfig requestConfig = new DbxRequestConfig(clientId);
+
+            sDbxClient = new DbxClientV2(requestConfig, accessToken);
+        }
+    }
+
+    public static DbxClientV2 getClient() {
+        if (sDbxClient == null) {
+            throw new IllegalStateException("Client not initialized.");
+        }
+        return sDbxClient;
+    }
+
+    public static DbxClientV2 initAndGetClient(String accessToken) {
+        init(accessToken);
+        return getClient();
+    }
+}

app/src/main/java/com/todotxt/todotxttouch/remote/DropboxFile.java

@@ -25,15 +25,15 @@
 
 package com.todotxt.todotxttouch.remote;
 
-import com.dropbox.client2.DropboxAPI;
+import com.dropbox.core.v2.files.FileMetadata;
 
 import java.io.File;
 
 public class DropboxFile {
     private String remoteFile;
     private File localFile;
     private String originalRev;
-    private DropboxAPI.Entry loadedMetadata;
+    private FileMetadata loadedMetadata;
     private DropboxFileStatus status;
     private Exception error;
 
@@ -52,14 +52,14 @@ public DropboxFile(String remoteFile, File localFile, String originalRev) {
     /**
      * @return the loadedMetadata
      */
-    public DropboxAPI.Entry getLoadedMetadata() {
+    public FileMetadata getLoadedMetadata() {
         return loadedMetadata;
     }
 
     /**
      * @param loadedMetadata the loadedMetadata to set
      */
-    public void setLoadedMetadata(DropboxAPI.Entry loadedMetadata) {
+    public void setLoadedMetadata(FileMetadata loadedMetadata) {
         this.loadedMetadata = loadedMetadata;
     }
 

app/src/main/java/com/todotxt/todotxttouch/remote/DropboxFileDownloader.java

@@ -27,9 +27,13 @@
 
 import android.util.Log;
 
-import com.dropbox.client2.DropboxAPI;
-import com.dropbox.client2.exception.DropboxException;
-import com.dropbox.client2.exception.DropboxServerException;
+import com.dropbox.core.DbxDownloader;
+import com.dropbox.core.DbxException;
+import com.dropbox.core.v2.DbxClientV2;
+import com.dropbox.core.v2.files.DeletedMetadata;
+import com.dropbox.core.v2.files.FileMetadata;
+import com.dropbox.core.v2.files.GetMetadataErrorException;
+import com.dropbox.core.v2.files.Metadata;
 import com.todotxt.todotxttouch.util.Util;
 
 import java.io.File;
@@ -41,16 +45,16 @@
 public class DropboxFileDownloader {
     final static String TAG = DropboxFileDownloader.class.getSimpleName();
 
-    private DropboxAPI<?> dropboxApi;
+    private DbxClientV2 dbxClient;
     private DropboxFileStatus status;
     private Collection<DropboxFile> files;
 
     /**
      * @param files
      */
-    public DropboxFileDownloader(DropboxAPI<?> dropboxApi,
+    public DropboxFileDownloader(DbxClientV2 client,
                                  Collection<DropboxFile> files) {
-        this.dropboxApi = dropboxApi;
+        this.dbxClient = client;
         this.files = files;
         status = DropboxFileStatus.INITIALIZED;
     }
@@ -92,36 +96,44 @@ public void pullFiles() {
     private void loadMetadata(DropboxFile file) {
         Log.d(TAG, "Loading metadata for " + file.getRemoteFile());
 
-        DropboxAPI.Entry metadata = null;
+        Metadata metadata = null;
 
         try {
-            metadata = dropboxApi.metadata(file.getRemoteFile(), 0, null,
-                    false, null);
-        } catch (DropboxServerException se) {
-            if (se.error == DropboxServerException._404_NOT_FOUND) {
+            metadata = dbxClient.files().getMetadata(file.getRemoteFile());
+        } catch (GetMetadataErrorException mde) {
+            if (mde.errorValue.isPath() && mde.errorValue.getPathValue().isNotFound()) {
                 Log.d(TAG, "metadata NOT found! Returning NOT_FOUND status.");
 
                 file.setStatus(DropboxFileStatus.NOT_FOUND);
 
                 return;
             }
 
-            throw new RemoteException("Server Exception: " + se.error + " " + se.reason, se);
-        } catch (DropboxException e) {
+            throw new RemoteException("Server Exception: " + mde.errorValue + " " + mde.getUserMessage(), mde);
+        } catch (DbxException e) {
             throw new RemoteException("Dropbox Exception: " + e.getMessage(), e);
         }
 
-        Log.d(TAG, "Metadata retrieved. rev on Dropbox = " + metadata.rev);
-        Log.d(TAG, "local rev = " + file.getOriginalRev());
+        FileMetadata fileMetadata = null;
+        if(metadata instanceof FileMetadata) {
+            file.setLoadedMetadata((FileMetadata) metadata);
+            fileMetadata = (FileMetadata) metadata;
+            Log.d(TAG, "Metadata retrieved. rev on Dropbox = " + fileMetadata.getRev());
+        }
 
-        file.setLoadedMetadata(metadata);
+        DeletedMetadata deletedMetadata = null;
+        if(metadata instanceof DeletedMetadata){
+            deletedMetadata = (DeletedMetadata) metadata;
+        }
+
+        Log.d(TAG, "local rev = " + file.getOriginalRev());
 
-        if (metadata.rev.equals(file.getOriginalRev())) {
+        if (fileMetadata != null && fileMetadata.getRev().equals(file.getOriginalRev())) {
             // don't bother downloading if the rev is the same
             Log.d(TAG, "revs match. returning NOT_CHANGED status.");
 
             file.setStatus(DropboxFileStatus.NOT_CHANGED);
-        } else if (metadata.isDeleted) {
+        } else if (deletedMetadata != null) {
             Log.d(TAG, "File marked as deleted on Dropbox! Returning NOT_FOUND status.");
             file.setStatus(DropboxFileStatus.NOT_FOUND);
         } else {
@@ -134,7 +146,7 @@ private void loadMetadata(DropboxFile file) {
     private void loadFile(DropboxFile file) {
         Log.d(TAG,
                 "Downloading " + file.getRemoteFile() + " at rev = "
-                        + file.getLoadedMetadata().rev);
+                        + file.getLoadedMetadata().getRev());
 
         File localFile = file.getLocalFile();
 
@@ -156,11 +168,12 @@ private void loadFile(DropboxFile file) {
         }
 
         try {
-            dropboxApi.getFile(file.getRemoteFile(), file.getLoadedMetadata().rev, outputStream,
-                    null);
+            DbxDownloader downloader =  dbxClient.files().download(file.getRemoteFile(),
+                    file.getLoadedMetadata().getRev());
+            downloader.download(outputStream);
             outputStream.flush();
             outputStream.close();
-        } catch (DropboxException e) {
+        } catch (DbxException e) {
             throw new RemoteException("Cannot get file from Dropbox", e);
         } catch (IOException e) {
             throw new RemoteException("Failed to find file", e);