X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7392cfe5aba6d60f7d84dd335b759e08c94693a6..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 aaeac616..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,38 +49,23 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; -import com.owncloud.android.AccountUtils; -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 * uploaded instantly. The images can be selected for delete or for a try again * upload * - * The entrypoint for this activity is the 'Failed upload Notification" and a - * submenue underneath the 'Upload' menuentry + * The entry-point for this activity is the 'Failed upload Notification" and a + * 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 { private static final String LOG_TAG = InstantUploadActivity.class.getSimpleName(); private LinearLayout listView; private static final String retry_chexbox_tag = "retry_chexbox_tag"; + public static final boolean IS_ENABLED = false; private static int MAX_LOAD_IMAGES = 5; private int lastLoadImageIdx = 0; @@ -86,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); } @@ -131,7 +122,7 @@ public class InstantUploadActivity extends Activity { rowLayout.addView(getImageButton(imp_path, lastLoadImageIdx)); rowLayout.addView(getFileButton(imp_path, message, lastLoadImageIdx)); listView.addView(rowLayout); - Log.d(LOG_TAG, imp_path + " on idx: " + lastLoadImageIdx); + Log_OC.d(LOG_TAG, imp_path + " on idx: " + lastLoadImageIdx); if (lastLoadImageIdx % MAX_LOAD_IMAGES == 0) { break; } @@ -159,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 @@ -182,12 +173,12 @@ public class InstantUploadActivity extends Activity { private List getCheckboxList() { List list = new ArrayList(); for (int i = 0; i < listView.getChildCount(); i++) { - Log.d(LOG_TAG, "ListView has Childs: " + listView.getChildCount()); + Log_OC.d(LOG_TAG, "ListView has Childs: " + listView.getChildCount()); View childView = listView.getChildAt(i); if (childView != null && childView instanceof ViewGroup) { View checkboxView = getChildViews((ViewGroup) childView); if (checkboxView != null && checkboxView instanceof CheckBox) { - Log.d(LOG_TAG, "found Child: " + checkboxView.getId() + " " + checkboxView.getClass()); + Log_OC.d(LOG_TAG, "found Child: " + checkboxView.getId() + " " + checkboxView.getClass()); list.add((CheckBox) checkboxView); } } @@ -250,12 +241,12 @@ public class InstantUploadActivity extends Activity { for (CheckBox checkbox : list) { boolean to_retry = checkbox.isChecked(); - Log.d(LOG_TAG, "Checkbox for " + checkbox.getId() + " was checked: " + to_retry); + Log_OC.d(LOG_TAG, "Checkbox for " + checkbox.getId() + " was checked: " + to_retry); String img_path = fileList.get(checkbox.getId()); if (to_retry) { final String msg = "Image-Path " + checkbox.getId() + " was checked: " + img_path; - Log.d(LOG_TAG, msg); + Log_OC.d(LOG_TAG, msg); startUpload(img_path); } @@ -291,12 +282,12 @@ public class InstantUploadActivity extends Activity { for (CheckBox checkbox : list) { boolean to_be_delete = checkbox.isChecked(); - Log.d(LOG_TAG, "Checkbox for " + checkbox.getId() + " was checked: " + to_be_delete); + Log_OC.d(LOG_TAG, "Checkbox for " + checkbox.getId() + " was checked: " + to_be_delete); String img_path = fileList.get(checkbox.getId()); - Log.d(LOG_TAG, "Image-Path " + checkbox.getId() + " was checked: " + img_path); + Log_OC.d(LOG_TAG, "Image-Path " + checkbox.getId() + " was checked: " + img_path); if (to_be_delete) { boolean deleted = dbh.removeIUPendingFile(img_path); - Log.d(LOG_TAG, "removing " + checkbox.getId() + " was : " + deleted); + Log_OC.d(LOG_TAG, "removing " + checkbox.getId() + " was : " + deleted); } @@ -338,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)); @@ -362,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(); @@ -375,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; @@ -390,7 +381,7 @@ public class InstantUploadActivity extends Activity { // scale and add a thumbnail to the imagebutton int base_scale_size = 32; if (img_path != null) { - Log.d(LOG_TAG, "add " + img_path + " to Image Button"); + Log_OC.d(LOG_TAG, "add " + img_path + " to Image Button"); BitmapFactory.Options options = new BitmapFactory.Options(); options.inJustDecodeBounds = true; Bitmap bitmap = BitmapFactory.decodeFile(img_path, options); @@ -405,16 +396,16 @@ public class InstantUploadActivity extends Activity { scale++; } - Log.d(LOG_TAG, "scale Imgae with: " + scale); + Log_OC.d(LOG_TAG, "scale Imgae with: " + scale); BitmapFactory.Options options2 = new BitmapFactory.Options(); options2.inSampleSize = scale; bitmap = BitmapFactory.decodeFile(img_path, options2); if (bitmap != null) { - Log.d(LOG_TAG, "loaded Bitmap Bytes: " + bitmap.getRowBytes()); + Log_OC.d(LOG_TAG, "loaded Bitmap Bytes: " + bitmap.getRowBytes()); imageButton.setImageBitmap(bitmap); } else { - Log.d(LOG_TAG, "could not load imgage: " + img_path); + Log_OC.d(LOG_TAG, "could not load imgage: " + img_path); } } return imageButton; @@ -439,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 @@ -458,7 +449,7 @@ public class InstantUploadActivity extends Activity { i.putExtra(com.owncloud.android.files.services.FileUploader.KEY_INSTANT_UPLOAD, true); final String msg = "try to upload file with name :" + filename; - Log.d(LOG_TAG, msg); + Log_OC.d(LOG_TAG, msg); Toast toast = Toast.makeText(InstantUploadActivity.this, getString(R.string.failed_upload_retry_text) + filename, Toast.LENGTH_LONG); toast.show();