DropBox looking good!

Added sync & thumbnail functions

Author: BrandoCommando

AndroidManifest.xml

@@ -59,12 +59,13 @@
         android:icon="@drawable/icon_flat"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:uiOptions="splitActionBarWhenNarrow" >
+        android:theme="@style/AppTheme.Dark" >
         <activity
             android:name="org.brandroid.openmanager.activities.OpenExplorer"
             android:configChanges="screenSize|keyboard|keyboardHidden"
             android:label="@string/app_name"
             android:launchMode="singleTop"
+      		android:uiOptions="splitActionBarWhenNarrow"
             android:theme="@style/AppTheme.Dark" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -124,6 +125,7 @@
             android:launchMode="singleTop" />
         <activity
             android:name="org.brandroid.openmanager.activities.ServerSetupActivity"
+      		android:uiOptions="none"
             android:configChanges="screenSize|keyboard|keyboardHidden" >
         </activity>
         <activity
@@ -136,8 +138,8 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
 
-                <data android:scheme="db-vjbm22k8blhj61g" />
-            </intent-filter>
+                <data android:scheme="db-vajaedmhzkkp3sw" />
+			</intent-filter>
         </activity>
         <activity
             android:name="org.brandroid.openmanager.activities.FolderPickerActivity"

lint.xml

@@ -14,6 +14,9 @@
         <ignore path="res\layout\title_bar.xml" />
     </issue>
     <issue id="MissingTranslation" severity="ignore" />
+    <issue id="StringFormatInvalid">
+        <ignore path="res/values-de/strings.xml" />
+    </issue>
     <issue id="UnusedResources" severity="warning" />
     <issue id="UseCompoundDrawables">
         <ignore path="res\layout\grid_content_layout.xml" />

res/drawable-hdpi/icon_dropbox.png

@@ -14,7 +14,7 @@
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

res/drawable-xhdpi/icon_dropbox.png

@@ -142,7 +142,7 @@
     <string name="s_menu_delete_all">Alle löschen</string>
     <string name="s_menu_move_all">Hierhin verschieben</string>
     <string name="s_menu_copy_all">Hierher kopieren</string>
-    <string name="s_confirm_delete" formatted="false">Wollen Sie %s wirklich löschen?</string>
+    <string name="s_confirm_delete">Wollen Sie %s wirklich löschen?</string>
     <string name="s_error_same_destination">Das Zielverzeichnis ist gleich dem Quellverzeichnis.</string>
     <string name="s_sample_notification">Kopieren -> SD-Karte:  \\n3 Dateien</string>
     <string name="s_pref_fullscreen">Vollbild</string>

res/layout/search_grid.xml

@@ -149,7 +149,7 @@ public static class Account implements Serializable {
          *  "uid": "174"}
          * </pre>
          */
-        protected Account(Map<String, Object> map) {
+        public Account(Map<String, Object> map) {
             country = (String) map.get("country");
             displayName = (String) map.get("display_name");
             uid = getFromMapAsLong(map, "uid");

res/values-de/strings.xml

@@ -4,8 +4,12 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
+import org.brandroid.utils.Logger;
+
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -110,6 +114,9 @@ protected void onSaveInstanceState(Bundle outState) {
     @Override
     protected void onResume() {
         super.onResume();
+        
+        Logger.LogDebug("DropBox Auth: Resume!");
+        onNewIntent(getIntent());
 
         if (consumerKey == null || consumerSecret == null) {
             finish();
@@ -148,6 +155,8 @@ protected void onResume() {
     @Override
     protected void onNewIntent(Intent intent) {
         String token = null, secret = null, uid = null;
+        
+        Logger.LogDebug("DropBox Auth: onNewIntent (" + intent.getExtras().toString() + ")!");
 
         if (intent.hasExtra(EXTRA_ACCESS_TOKEN)) {
             // Dropbox app auth.
@@ -168,6 +177,12 @@ protected void onNewIntent(Intent intent) {
                 }
             }
         }
+        
+        SharedPreferences sp = (SharedPreferences)getSharedPreferences("dropbox", Context.MODE_PRIVATE);
+        sp.edit().putString("token", token).putString("secret", secret).putString("uid", uid).apply();
+        
+        setIntent(intent);
+        setResult(1, intent);
 
         // Pass along everything to the calling app.
         lastResult = new Intent();

src/com/dropbox/client2/DropboxAPI.java

@@ -34,6 +34,8 @@
 import com.box.androidlib.GetTicketListener;
 import com.box.androidlib.LogoutListener;
 import com.box.androidlib.User;
+import com.dropbox.client2.DropboxAPI;
+import com.dropbox.client2.DropboxAPI.Account;
 import com.dropbox.client2.android.AndroidAuthSession;
 import com.dropbox.client2.android.AuthActivity;
 import com.dropbox.client2.session.AppKeyPair;
@@ -43,6 +45,7 @@
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
@@ -67,7 +70,7 @@
 import android.widget.Toast;
 
 public class ServerSetupActivity
-        extends Activity
+        extends SherlockActivity
         implements OnCheckedChangeListener, OnClickListener, OnItemSelectedListener,
         OnMenuItemClickListener, LogoutListener {
 
@@ -92,9 +95,9 @@ public class ServerSetupActivity
     private OpenServer server;
     private View mBaseView;
     private Bundle mArgs;
-    private int iServersIndex = -1;
     private boolean mAuthTokenFound = false;
     private WebView mLoginWebView;
+    private static boolean DEBUG = OpenExplorer.IS_DEBUG_BUILD && true;
 
     public int getThemeId() {
         String themeName = new Preferences(this)
@@ -123,13 +126,15 @@ protected void onCreate(Bundle savedInstanceState) {
         if (mArgs == null)
             mArgs = new Bundle();
 
-        iServersIndex = mArgs.getInt("server_index", -1);
+        int iServersIndex = mArgs.getInt("server_index", -1);
         int serverType = mArgs.getInt("server_type", -1);
 
         final Context context = this;
         servers = LoadDefaultServers(context);
         server = iServersIndex > -1 ? servers.get(iServersIndex)
                 : new OpenServer().setName("New Server");
+        
+        server.setServerIndex(iServersIndex);
 
         String t2 = server.getType().toLowerCase(Locale.US);
         if (serverType > -1) {
@@ -226,6 +231,12 @@ public void onFocusChange(View v, boolean hasFocus) {
 
         DialogHandler.showServerWarning(context);
     }
+    
+    @Override
+    protected void onResume() {
+        super.onResume();
+        handleIntent(getIntent());
+    }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -242,7 +253,9 @@ protected void onNewIntent(Intent intent) {
     }
 
     private void handleIntent(Intent data) {
-        if(data.getExtras() != null && data.getExtras().containsKey("AUTH_TOKEN"))
+        if(DEBUG)
+            Logger.LogDebug("ServerSetupActivity.handleIntent(" + data.getExtras() + ")");
+        if(data != null && data.getExtras() != null && data.getExtras().containsKey("AUTH_TOKEN"))
         {
             String token = data.getStringExtra("AUTH_TOKEN");
             server.setPassword(token);
@@ -258,20 +271,59 @@ private void handleIntent(Intent data) {
             ViewUtils.setViewsEnabled(mBaseView, false, R.id.server_authenticate);
             ViewUtils.setViewsEnabled(mBaseView, true, R.id.server_logout);
         } else {
-            String[] vals = new String[3];
-            if(OpenDropBox.handleIntent(data, vals))
+            if(OpenDropBox.handleIntent(data, server))
+            {
+                ViewUtils.setText(mBaseView, server.getPassword(), R.id.text_password);
+                ViewUtils.setViewsVisible(mBaseView, false, R.id.server_webview);
+                ViewUtils.setViewsEnabled(mBaseView, false, R.id.server_authenticate);
+                ViewUtils.setViewsEnabled(mBaseView, true, R.id.server_logout);
+            }
+        }
+        SharedPreferences sp = getSharedPreferences("dropbox", Context.MODE_PRIVATE);
+        if(sp != null && sp.contains("token"))
+        {
+            String pass = sp.getString("token", "") + "," + sp.getString("secret", "");
+            String uid = sp.getString("uid", "dropbox");
+            boolean found = false;
+            for(OpenServer s : servers)
+                if(s.getPassword().equals(pass) || s.getUser().equals(uid))
+                    found = true;
+            if(!found)
             {
                 server.setType("db");
-                server.setUser(vals[2]); // uid
-                AppKeyPair userKP = new AppKeyPair(
-                        vals[0],  // token
-                        vals[1]); // secret
-                server.setPassword(userKP.toString());
-                ViewUtils.setText(mBaseView, userKP.toString(), R.id.text_password);
+                server.setName("DropBox");
+                server.setPassword(pass);
+                server.setUser(uid);
+                ViewUtils.setText(mBaseView, server.getPassword(), R.id.text_password);
                 ViewUtils.setViewsVisible(mBaseView, false, R.id.server_webview);
                 ViewUtils.setViewsEnabled(mBaseView, false, R.id.server_authenticate);
                 ViewUtils.setViewsEnabled(mBaseView, true, R.id.server_logout);
+                AndroidAuthSession sess = OpenDropBox.buildSession(server);
+                sess.finishAuthentication();
+                getDropboxAccountInfo();
             }
+            sp.edit().clear().commit();
+        }
+    }
+    
+    private void getDropboxAccountInfo()
+    {
+        final OpenDropBox db = (OpenDropBox)(server.getOpenPath());
+        if(db.getAccountInfo() != null)
+        {
+            db.getAccountInfo(new OpenDropBox.GetAccountInfoCallback() {
+                public void onException(Exception e) {
+                    // TODO Auto-generated method stub
+                    
+                }
+                public void onGetAccountInfo(Account account) {
+                    server.setName(account.displayName);
+                    db.setName(account.displayName);
+                    ViewUtils.setText(mBaseView, account.displayName, R.id.text_name);
+                    server.setSetting("quota", account.quota);
+                    SaveToDefaultServers(servers, ServerSetupActivity.this);
+                }
+            });
         }
     }
 
@@ -280,6 +332,8 @@ private int getServerTypeDrawable(int serverType) {
         {
             case 3:
                 return R.drawable.icon_box;
+            case 4:
+                return R.drawable.icon_dropbox;
             default:
                 return R.drawable.lg_ftp;
         }
@@ -357,8 +411,8 @@ else if (v instanceof Spinner)
                         server.setSetting(key, val);
                     }
                 }
-                if (iServersIndex > -1)
-                    servers.set(iServersIndex, server);
+                if (server.getServerIndex() > -1)
+                    servers.set(server.getServerIndex(), server);
                 else
                     servers.add(server);
                 SaveToDefaultServers(servers, this);
@@ -370,9 +424,9 @@ else if (v instanceof Spinner)
                 finish();
                 return true;
             case R.string.s_remove:
-                if (iServersIndex > -1)
+                if (server.getServerIndex() > -1)
                 {
-                    servers.remove(iServersIndex);
+                    servers.remove(server.getServerIndex());
                     SaveToDefaultServers(servers, this);
                     Toast.makeText(this,
                             server.getName() + " " + getString(R.string.s_msg_deleted),
@@ -543,31 +597,31 @@ private void onBoxAuthTokenRetreived(final User authToken) {
         onActivityResult(OpenExplorer.REQ_AUTHENTICATE_BOX, RESULT_OK, intent);
     }
 
-//    @Override
-//    public boolean onCreateOptionsMenu(Menu menu) {
-//        getSupportMenuInflater().inflate(R.menu.dialog_buttons, menu);
-//        return true;
-//    }
-//
-//    @Override
-//    public boolean onOptionsItemSelected(MenuItem item) {
-//        if (onClick(item.getItemId()))
-//            return true;
-//        return super.onOptionsItemSelected(item);
-//    }
-    
     @Override
-    public boolean onCreateOptionsMenu(android.view.Menu menu) {
-        getMenuInflater().inflate(R.menu.dialog_buttons, menu);
-        return super.onCreateOptionsMenu(menu);
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getSupportMenuInflater().inflate(R.menu.dialog_buttons, menu);
+        return true;
     }
-    
+
     @Override
-    public boolean onOptionsItemSelected(android.view.MenuItem item) {
-        if(onClick(item.getItemId()))
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (onClick(item.getItemId()))
             return true;
         return super.onOptionsItemSelected(item);
     }
+    
+//    @Override
+//    public boolean onCreateOptionsMenu(android.view.Menu menu) {
+//        getMenuInflater().inflate(R.menu.dialog_buttons, menu);
+//        return super.onCreateOptionsMenu(menu);
+//    }
+//    
+//    @Override
+//    public boolean onOptionsItemSelected(android.view.MenuItem item) {
+//        if(onClick(item.getItemId()))
+//            return true;
+//        return super.onOptionsItemSelected(item);
+//    }
 
     @Override
     public void onItemSelected(AdapterView<?> arg0, View arg1, int position, long id) {
@@ -580,7 +634,7 @@ public void onItemSelected(AdapterView<?> arg0, View arg1, int position, long id
         if (position < 3)
         {
             ViewUtils.setViewsVisible(v, false, R.id.server_auth_buttons);
-            ViewUtils.setViewsVisible(v, true, R.id.server_texts, R.id.check_port, R.id.text_port);
+            ViewUtils.setViewsVisible(v, true, R.id.server_texts, R.id.check_port, R.id.text_port, R.id.label_port);
         }
         if (OnlyOnSMB.length > 0)
             ViewUtils.setViewsVisible(v, position == 2, OnlyOnSMB);
@@ -596,8 +650,12 @@ else if (position >= 3)
             if(position == 3)
                 server.setType("box");
             else if(position == 4)
+            {
                 server.setType("db");
-            ViewUtils.setViewsVisible(v, false, R.id.server_texts, R.id.check_port, R.id.text_port);
+                if(!server.get("account", "").equals(""))
+                    getDropboxAccountInfo();
+            }
+            ViewUtils.setViewsVisible(v, false, R.id.server_texts, R.id.check_port, R.id.text_port, R.id.label_port);
             ViewUtils.setViewsVisible(v, true, R.id.server_auth_buttons);
             if (!server.getPassword().equals(""))
             {

src/com/dropbox/client2/android/AuthActivity.java

@@ -359,6 +359,19 @@ public View getView(int position, View view, ViewGroup parent) {
                         getContext(), mWidth > 72));
             else if (!mShowThumbnails || !file.hasThumbnail()) {
                 mIcon.setImageResource(ThumbnailCreator.getDefaultResourceId(file, mWidth, mHeight));
+            } else if (file instanceof OpenPath.ThumbnailHandler) {
+                ((OpenPath.ThumbnailHandler)file).getThumbnail(mWidth, new OpenPath.ThumbnailReturnCallback() {
+                    public void onThumbReturned(Bitmap bmp) {
+                        if(!OpenExplorer.BEFORE_HONEYCOMB)
+                        {
+                            BitmapDrawable d = new BitmapDrawable(getResources(), bmp);
+                            d.setGravity(Gravity.CENTER);
+                            ImageUtils.fadeToDrawable(mIcon, d);
+                        } else
+                            mIcon.setImageBitmap(bmp);
+                        mIcon.setTag(file);
+                    }
+                });
             } else { // if(!ThumbnailCreator.getImagePath(mIcon).equals(file.getPath()))
                 // {
                 // Logger.LogDebug("Bitmapping " + file.getPath());