Skip to content

Commit 50210cd

Browse files
Anthony CorreiaKannan Goundan
Anthony Correia
authored and
Kannan Goundan
committed
examples/android: Added Dbx prefix to class name imports.
1 parent 5456ace commit 50210cd

11 files changed

Lines changed: 76 additions & 75 deletions

‎examples/android/src/main/java/com/dropbox/core/examples/android/DownloadFileTask.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import android.os.Environment;
88

99
import com.dropbox.core.DbxException;
10-
import com.dropbox.core.v2.Files;
10+
import com.dropbox.core.v2.DbxFiles;
1111

1212
import java.io.File;
1313
import java.io.FileOutputStream;
@@ -17,10 +17,10 @@
1717
/**
1818
* Task to download a file from Dropbox and put it in the Downloads folder
1919
*/
20-
class DownloadFileTask extends AsyncTask<Files.FileMetadata, Void, File> {
20+
class DownloadFileTask extends AsyncTask<DbxFiles.FileMetadata, Void, File> {
2121

2222
private final Context mContext;
23-
private final Files mFilesClient;
23+
private final DbxFiles mFilesClient;
2424
private Exception mException;
2525
private Callback mCallback;
2626

@@ -29,7 +29,7 @@ public interface Callback {
2929
void onError(Exception e);
3030
}
3131

32-
DownloadFileTask(Context context, Files filesClient, Callback callback) {
32+
DownloadFileTask(Context context, DbxFiles filesClient, Callback callback) {
3333
mContext = context;
3434
mFilesClient = filesClient;
3535
mCallback = callback;
@@ -46,8 +46,8 @@ protected void onPostExecute(File result) {
4646
}
4747

4848
@Override
49-
protected File doInBackground(Files.FileMetadata... params) {
50-
Files.FileMetadata metadata = params[0];
49+
protected File doInBackground(DbxFiles.FileMetadata... params) {
50+
DbxFiles.FileMetadata metadata = params[0];
5151
try {
5252
File path = Environment.getExternalStoragePublicDirectory(
5353
Environment.DIRECTORY_DOWNLOADS);

‎examples/android/src/main/java/com/dropbox/core/examples/android/DropboxActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected void onResume() {
3838

3939
private void initAndLoadData(String accessToken) {
4040
DropboxClient.init(accessToken);
41-
PicassoClient.init(getApplicationContext(), DropboxClient.files());
41+
PicassoClient.init(getApplicationContext(), DropboxClient.DbxFiles());
4242
loadData();
4343
}
4444

‎examples/android/src/main/java/com/dropbox/core/examples/android/DropboxClient.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import com.dropbox.core.v2.DbxClientV2;
55
import com.dropbox.core.DbxHost;
66
import com.dropbox.core.DbxRequestConfig;
7-
import com.dropbox.core.v2.Files;
8-
import com.dropbox.core.v2.Sharing;
9-
import com.dropbox.core.v2.Users;
7+
import com.dropbox.core.v2.DbxFiles;
8+
import com.dropbox.core.v2.DbxSharing;
9+
import com.dropbox.core.v2.DbxUsers;
1010

1111
import java.util.Locale;
1212

@@ -29,21 +29,21 @@ public static void init(String accessToken) {
2929
}
3030
}
3131

32-
public static Files files() {
32+
public static DbxFiles DbxFiles() {
3333
if (sDbxClient != null)
3434
return sDbxClient.files;
3535
else
3636
return null;
3737
}
3838

39-
public static Users users() {
39+
public static DbxUsers DbxUsers() {
4040
if (sDbxClient != null)
4141
return sDbxClient.users;
4242
else
4343
return null;
4444
}
4545

46-
public static Sharing sharing() {
46+
public static DbxSharing sharing() {
4747
if (sDbxClient != null)
4848
return sDbxClient.sharing;
4949
else

‎examples/android/src/main/java/com/dropbox/core/examples/android/FileThumbnailRequestHandler.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import com.dropbox.core.DbxDownloader;
66
import com.dropbox.core.DbxException;
7-
import com.dropbox.core.v2.Files;
7+
import com.dropbox.core.v2.DbxFiles;
88
import com.squareup.picasso.Picasso;
99
import com.squareup.picasso.Request;
1010
import com.squareup.picasso.RequestHandler;
@@ -20,16 +20,16 @@ public class FileThumbnailRequestHandler extends RequestHandler {
2020

2121
private static final String SCHEME = "dropbox";
2222
private static final String HOST = "dropbox";
23-
private final Files mFilesClient;
23+
private final DbxFiles mFilesClient;
2424

25-
public FileThumbnailRequestHandler(Files filesClient) {
25+
public FileThumbnailRequestHandler(DbxFiles filesClient) {
2626
mFilesClient = filesClient;
2727
}
2828

2929
/**
3030
* Builds a {@link Uri} for a Dropbox file thumbnail suitable for handling by this handler
3131
*/
32-
public static Uri buildPicassoUri(Files.FileMetadata file) {
32+
public static Uri buildPicassoUri(DbxFiles.FileMetadata file) {
3333
return new Uri.Builder()
3434
.scheme(SCHEME)
3535
.authority(HOST)
@@ -45,14 +45,14 @@ public boolean canHandleRequest(Request data) {
4545
public Result load(Request request, int networkPolicy) throws IOException {
4646

4747
try {
48-
DbxDownloader<Files.FileMetadata> downloader =
48+
DbxDownloader<DbxFiles.FileMetadata> downloader =
4949
mFilesClient.getThumbnailBuilder(request.uri.getPath())
50-
.format(Files.ThumbnailFormat.jpeg)
51-
.size(Files.ThumbnailSize.m)
50+
.format(DbxFiles.ThumbnailFormat.jpeg)
51+
.size(DbxFiles.ThumbnailSize.w1024h768)
5252
.start();
5353

5454
return new Result(downloader.body, Picasso.LoadedFrom.NETWORK);
55-
} catch (Files.GetThumbnailException e) {
55+
} catch (DbxFiles.GetThumbnailException e) {
5656
throw new IOException(e);
5757
} catch (DbxException e) {
5858
throw new IOException(e);

‎examples/android/src/main/java/com/dropbox/core/examples/android/FilesActivity.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import android.webkit.MimeTypeMap;
1515
import android.widget.Toast;
1616

17-
import com.dropbox.core.v2.Files;
17+
import com.dropbox.core.v2.DbxFiles;
1818

1919
import java.io.File;
2020
import java.util.List;
@@ -58,12 +58,12 @@ public void onClick(View v) {
5858
RecyclerView recyclerView = (RecyclerView) findViewById(R.id.files_list);
5959
mFilesAdapter = new FilesAdapter(PicassoClient.getPicasso(), new FilesAdapter.Callback() {
6060
@Override
61-
public void onFolderClicked(Files.FolderMetadata folder) {
61+
public void onFolderClicked(DbxFiles.FolderMetadata folder) {
6262
startActivity(FilesActivity.getIntent(FilesActivity.this, folder.pathLower));
6363
}
6464

6565
@Override
66-
public void onFileClicked(Files.FileMetadata file) {
66+
public void onFileClicked(DbxFiles.FileMetadata file) {
6767
downloadFile(file);
6868

6969
}
@@ -102,9 +102,9 @@ protected void loadData() {
102102
dialog.setMessage("Loading");
103103
dialog.show();
104104

105-
new ListFolderTask(DropboxClient.files(), new ListFolderTask.Callback() {
105+
new ListFolderTask(DropboxClient.DbxFiles(), new ListFolderTask.Callback() {
106106
@Override
107-
public void onDataLoaded(Files.ListFolderResult result) {
107+
public void onDataLoaded(DbxFiles.ListFolderResult result) {
108108
dialog.dismiss();
109109

110110
mFilesAdapter.setFiles(result.entries);
@@ -122,15 +122,15 @@ public void onError(Exception e) {
122122
}).execute(mPath);
123123
}
124124

125-
private void downloadFile(Files.FileMetadata file) {
125+
private void downloadFile(DbxFiles.FileMetadata file) {
126126

127127
final ProgressDialog dialog = new ProgressDialog(this);
128128
dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
129129
dialog.setCancelable(false);
130130
dialog.setMessage("Downloading");
131131
dialog.show();
132132

133-
new DownloadFileTask(FilesActivity.this, DropboxClient.files(), new DownloadFileTask.Callback() {
133+
new DownloadFileTask(FilesActivity.this, DropboxClient.DbxFiles(), new DownloadFileTask.Callback() {
134134
@Override
135135
public void onDownloadComplete(File result) {
136136
dialog.dismiss();
@@ -176,9 +176,9 @@ private void uploadFile(String fileUri) {
176176
dialog.setMessage("Uploading");
177177
dialog.show();
178178

179-
new UploadFileTask(this, DropboxClient.files(), new UploadFileTask.Callback() {
179+
new UploadFileTask(this, DropboxClient.DbxFiles(), new UploadFileTask.Callback() {
180180
@Override
181-
public void onUploadComplete(Files.FileMetadata result) {
181+
public void onUploadComplete(DbxFiles.FileMetadata result) {
182182
dialog.dismiss();
183183

184184
Toast.makeText(FilesActivity.this,

‎examples/android/src/main/java/com/dropbox/core/examples/android/FilesAdapter.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,28 @@
99
import android.widget.ImageView;
1010
import android.widget.TextView;
1111

12-
import com.dropbox.core.v2.Files;
12+
import com.dropbox.core.v2.DbxFiles;
1313
import com.squareup.picasso.Picasso;
1414

15+
import java.util.ArrayList;
1516
import java.util.List;
1617

1718
/**
1819
* Adapter for file list
1920
*/
2021
public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.MetadataViewHolder> {
21-
private List<Files.Metadata> mFiles;
22+
private List<DbxFiles.Metadata> mFiles;
2223
private final Picasso mPicasso;
2324
private final Callback mCallback;
2425

25-
public void setFiles(List<Files.Metadata> files) {
26+
public void setFiles(ArrayList<DbxFiles.Metadata> files) {
2627
mFiles = files;
2728
notifyDataSetChanged();
2829
}
2930

3031
public interface Callback {
31-
void onFolderClicked(Files.FolderMetadata folder);
32-
void onFileClicked(Files.FileMetadata file);
32+
void onFolderClicked(DbxFiles.FolderMetadata folder);
33+
void onFileClicked(DbxFiles.FileMetadata file);
3334
}
3435

3536
public FilesAdapter(Picasso picasso, Callback callback) {
@@ -63,7 +64,7 @@ public int getItemCount() {
6364
public class MetadataViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
6465
private final TextView mTextView;
6566
private final ImageView mImageView;
66-
private Files.Metadata mItem;
67+
private DbxFiles.Metadata mItem;
6768

6869
public MetadataViewHolder(View itemView) {
6970
super(itemView);
@@ -75,27 +76,27 @@ public MetadataViewHolder(View itemView) {
7576
@Override
7677
public void onClick(View v) {
7778

78-
if (mItem instanceof Files.FolderMetadata) {
79-
mCallback.onFolderClicked((Files.FolderMetadata) mItem);
80-
} else if (mItem instanceof Files.FileMetadata) {
81-
mCallback.onFileClicked((Files.FileMetadata)mItem);
79+
if (mItem instanceof DbxFiles.FolderMetadata) {
80+
mCallback.onFolderClicked((DbxFiles.FolderMetadata) mItem);
81+
} else if (mItem instanceof DbxFiles.FileMetadata) {
82+
mCallback.onFileClicked((DbxFiles.FileMetadata)mItem);
8283
}
8384
}
8485

85-
public void bind(Files.Metadata item) {
86+
public void bind(DbxFiles.Metadata item) {
8687
mItem = item;
8788
mTextView.setText(mItem.name);
8889

8990
// Load based on file path
9091
// Prepending a magic scheme to get it to
9192
// be picked up by DropboxPicassoRequestHandler
9293

93-
if (item instanceof Files.FileMetadata) {
94+
if (item instanceof DbxFiles.FileMetadata) {
9495
MimeTypeMap mime = MimeTypeMap.getSingleton();
9596
String ext = item.name.substring(item.name.indexOf(".") + 1);
9697
String type = mime.getMimeTypeFromExtension(ext);
9798
if (type != null && type.startsWith("image/")) {
98-
mPicasso.load(FileThumbnailRequestHandler.buildPicassoUri((Files.FileMetadata)item))
99+
mPicasso.load(FileThumbnailRequestHandler.buildPicassoUri((DbxFiles.FileMetadata)item))
99100
.placeholder(R.drawable.ic_photo_grey_600_36dp)
100101
.error(R.drawable.ic_photo_grey_600_36dp)
101102
.into(mImageView);
@@ -104,7 +105,7 @@ public void bind(Files.Metadata item) {
104105
.noFade()
105106
.into(mImageView);
106107
}
107-
} else if (item instanceof Files.FolderMetadata) {
108+
} else if (item instanceof DbxFiles.FolderMetadata) {
108109
mPicasso.load(R.drawable.ic_folder_blue_36dp)
109110
.noFade()
110111
.into(mImageView);

‎examples/android/src/main/java/com/dropbox/core/examples/android/GetCurrentAccountTask.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@
33
import android.os.AsyncTask;
44

55
import com.dropbox.core.DbxException;
6-
import com.dropbox.core.v2.Users;
6+
import com.dropbox.core.v2.DbxUsers;
77

88
/**
99
* Async task for getting user account info
1010
*/
11-
class GetCurrentAccountTask extends AsyncTask<Void, Void, Users.FullAccount> {
11+
class GetCurrentAccountTask extends AsyncTask<Void, Void, DbxUsers.FullAccount> {
1212

13-
private final Users mUsersClient;
13+
private final DbxUsers mDbxUsersClient;
1414
private final Callback mCallback;
1515
private Exception mException;
1616

1717
public interface Callback {
18-
void onComplete(Users.FullAccount result);
18+
void onComplete(DbxUsers.FullAccount result);
1919
void onError(Exception e);
2020
}
2121

22-
GetCurrentAccountTask(Users usersClient, Callback callback) {
23-
mUsersClient = usersClient;
22+
GetCurrentAccountTask(DbxUsers DbxUsersClient, Callback callback) {
23+
mDbxUsersClient = DbxUsersClient;
2424
mCallback = callback;
2525
}
2626

2727
@Override
28-
protected void onPostExecute(Users.FullAccount account) {
28+
protected void onPostExecute(DbxUsers.FullAccount account) {
2929
super.onPostExecute(account);
3030
if (mException != null) {
3131
mCallback.onError(mException);
@@ -35,10 +35,10 @@ protected void onPostExecute(Users.FullAccount account) {
3535
}
3636

3737
@Override
38-
protected Users.FullAccount doInBackground(Void... params) {
38+
protected DbxUsers.FullAccount doInBackground(Void... params) {
3939

4040
try {
41-
return mUsersClient.getCurrentAccount();
41+
return mDbxUsersClient.getCurrentAccount();
4242

4343
} catch (DbxException e) {
4444
mException = e;

‎examples/android/src/main/java/com/dropbox/core/examples/android/ListFolderTask.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33
import android.os.AsyncTask;
44

55
import com.dropbox.core.DbxException;
6-
import com.dropbox.core.v2.Files;
6+
import com.dropbox.core.v2.DbxFiles;
77

88
/**
99
* Async task to list items in a folder
1010
*/
11-
class ListFolderTask extends AsyncTask<String, Void, Files.ListFolderResult> {
11+
class ListFolderTask extends AsyncTask<String, Void, DbxFiles.ListFolderResult> {
1212

13-
private final Files mFilesClient;
13+
private final DbxFiles mDbxFilesClient;
1414
private Exception mException;
1515
private Callback mCallback;
1616

1717
public interface Callback {
18-
void onDataLoaded(Files.ListFolderResult result);
18+
void onDataLoaded(DbxFiles.ListFolderResult result);
1919

2020
void onError(Exception e);
2121
}
2222

23-
public ListFolderTask(Files filesClient, Callback callback) {
24-
mFilesClient = filesClient;
23+
public ListFolderTask(DbxFiles DbxFilesClient, Callback callback) {
24+
mDbxFilesClient = DbxFilesClient;
2525
mCallback = callback;
2626
}
2727

2828
@Override
29-
protected void onPostExecute(Files.ListFolderResult result) {
29+
protected void onPostExecute(DbxFiles.ListFolderResult result) {
3030
super.onPostExecute(result);
3131

3232
if (mException != null) {
@@ -37,9 +37,9 @@ protected void onPostExecute(Files.ListFolderResult result) {
3737
}
3838

3939
@Override
40-
protected Files.ListFolderResult doInBackground(String... params) {
40+
protected DbxFiles.ListFolderResult doInBackground(String... params) {
4141
try {
42-
return mFilesClient.listFolder(params[0]);
42+
return mDbxFilesClient.listFolder(params[0]);
4343
} catch (DbxException e) {
4444
mException = e;
4545
e.printStackTrace();

0 commit comments

Comments
 (0)