X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c3ca5b5a4fda44999f215a3559921a4781f310f8..bcc972d63d3ed1d76b51a8a03a27e809983dc756:/src/com/owncloud/android/ui/activity/InstantUploadActivity.java diff --git a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java index eb0b4d5a..0d455bd2 100644 --- a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java +++ b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,6 +19,14 @@ package com.owncloud.android.ui.activity; import java.util.ArrayList; import java.util.List; +import com.owncloud.android.R; +import com.owncloud.android.authentication.AccountUtils; +import com.owncloud.android.db.DbHandler; +import com.owncloud.android.files.InstantUploadBroadcastReceiver; +import com.owncloud.android.files.services.FileUploader; +import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.utils.Log_OC; + import android.accounts.Account; import android.app.Activity; import android.content.Intent; @@ -27,7 +34,6 @@ import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.Bundle; -import android.util.Log; import android.util.SparseArray; import android.view.Gravity; import android.view.View; @@ -43,13 +49,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; -import com.owncloud.android.AccountUtils; -import com.owncloud.android.Log_OC; -import com.owncloud.android.R; -import com.owncloud.android.db.DbHandler; -import com.owncloud.android.files.InstantUploadBroadcastReceiver; -import com.owncloud.android.files.services.FileUploader; -import com.owncloud.android.utils.FileStorageUtils; /** * This Activity is used to display a list with images they could not be @@ -60,16 +59,6 @@ import com.owncloud.android.utils.FileStorageUtils; * sub-menu underneath the 'Upload' menu-item * * @author andomaex / Matthias Baumann - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more de/ */ public class InstantUploadActivity extends Activity { @@ -88,14 +77,14 @@ public class InstantUploadActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.failed_upload_files); - Button delete_all_btn = (Button) findViewById(R.id.failed_upload_delete_all_btn); - delete_all_btn.setOnClickListener(getDeleteListner()); - Button retry_all_btn = (Button) findViewById(R.id.failed_upload_retry_all_btn); - retry_all_btn.setOnClickListener(getRetryListner()); + Button deleteAllBtn = (Button) findViewById(R.id.failed_upload_delete_all_btn); + deleteAllBtn.setOnClickListener(getDeleteListner()); + Button retryAllBtn = (Button) findViewById(R.id.failed_upload_retry_all_btn); + retryAllBtn.setOnClickListener(getRetryListner()); this.failed_upload_all_cb = (CheckBox) findViewById(R.id.failed_upload_headline_cb); failed_upload_all_cb.setOnCheckedChangeListener(getCheckAllListener()); listView = (LinearLayout) findViewById(R.id.failed_upload_scrollviewlayout); - + loadListView(true); } @@ -161,7 +150,7 @@ public class InstantUploadActivity extends Activity { loadmoreBtn = new Button(this); loadmoreBtn.setId(42); loadmoreBtn.setText(getString(R.string.failed_upload_load_more_images)); - loadmoreBtn.setBackgroundResource(R.color.owncloud_white); + loadmoreBtn.setBackgroundResource(R.color.background_color); loadmoreBtn.setTextSize(12); loadmoreBtn.setOnClickListener(new OnClickListener() { @Override @@ -340,14 +329,14 @@ public class InstantUploadActivity extends Activity { TextView failureTextView = new TextView(this); failureTextView.setText(getString(R.string.failed_upload_failure_text) + message); - failureTextView.setBackgroundResource(R.color.owncloud_white); + failureTextView.setBackgroundResource(R.color.background_color); failureTextView.setTextSize(8); failureTextView.setOnLongClickListener(getOnLongClickListener(message)); failureTextView.setPadding(5, 5, 5, 10); TextView retryButton = new TextView(this); retryButton.setId(id); retryButton.setText(img_path); - retryButton.setBackgroundResource(R.color.owncloud_white); + retryButton.setBackgroundResource(R.color.background_color); retryButton.setTextSize(8); retryButton.setOnClickListener(getImageButtonOnClickListener(img_path)); retryButton.setOnLongClickListener(getOnLongClickListener(message)); @@ -364,7 +353,7 @@ public class InstantUploadActivity extends Activity { @Override public boolean onLongClick(View v) { - Log.d(LOG_TAG, message); + Log_OC.d(LOG_TAG, message); Toast toast = Toast.makeText(InstantUploadActivity.this, getString(R.string.failed_upload_retry_text) + message, Toast.LENGTH_LONG); toast.show(); @@ -377,7 +366,7 @@ public class InstantUploadActivity extends Activity { private CheckBox getFileCheckbox(int id) { CheckBox retryCB = new CheckBox(this); retryCB.setId(id); - retryCB.setBackgroundResource(R.color.owncloud_white); + retryCB.setBackgroundResource(R.color.background_color); retryCB.setTextSize(8); retryCB.setTag(retry_chexbox_tag); return retryCB; @@ -441,7 +430,7 @@ public class InstantUploadActivity extends Activity { */ private void startUpload(String img_path) { // extract filename - String filename = FileStorageUtils.getInstantUploadFilePath(img_path); + String filename = FileStorageUtils.getInstantUploadFilePath(this, img_path); if (canInstantUpload()) { Account account = AccountUtils.getCurrentOwnCloudAccount(InstantUploadActivity.this); // add file again to upload queue