removing some obvious warnings as first step to -Werror

diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index 244d6d1..161eb08 100644 (file)
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -38,7 +38,6 @@ import android.content.ContentValues;
 import android.content.OperationApplicationException;
 import android.database.Cursor;
 import android.net.Uri;
-import android.os.Environment;
 import android.os.RemoteException;
 import android.util.Log;
 

diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java
index f50a86f..f8208b7 100644 (file)
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@ -19,13 +19,7 @@
 package com.owncloud.android.datamodel;
 
 import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
 
-import com.owncloud.android.files.services.FileDownloader;
-
-
-import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 

diff --git a/src/com/owncloud/android/db/DbHandler.java b/src/com/owncloud/android/db/DbHandler.java
index 61d5655..7c0e343 100644 (file)
--- a/src/com/owncloud/android/db/DbHandler.java
+++ b/src/com/owncloud/android/db/DbHandler.java
@@ -1,5 +1,5 @@
 /* ownCloud Android client application\r
- *   Copyright (C) 2011  Bartek Przybylski\r
+ *   Copyright (C) 2011-2012  Bartek Przybylski\r
  *\r
  *   This program is free software: you can redistribute it and/or modify\r
  *   it under the terms of the GNU General Public License as published by\r
@@ -17,11 +17,6 @@
  */\r
 package com.owncloud.android.db;\r
 \r
-import java.util.Vector;\r
-\r
-import com.owncloud.android.OwnCloudSession;\r
-\r
-\r
 import android.content.ContentValues;\r
 import android.content.Context;\r
 import android.database.Cursor;\r
@@ -38,7 +33,6 @@ public class DbHandler {
     private SQLiteDatabase mDB;\r
     private OpenerHepler mHelper;\r
     private final String mDatabaseName = "ownCloud";\r
-    private final String TABLE_SESSIONS = "sessions";\r
     private final int mDatabaseVersion = 1;\r
     \r
     private final String TABLE_INSTANT_UPLOAD = "instant_upload";\r

diff --git a/src/com/owncloud/android/extensions/ExtensionsListActivity.java b/src/com/owncloud/android/extensions/ExtensionsListActivity.java
index 44aa819..d2887a0 100644 (file)
--- a/src/com/owncloud/android/extensions/ExtensionsListActivity.java
+++ b/src/com/owncloud/android/extensions/ExtensionsListActivity.java
@@ -2,7 +2,6 @@ package com.owncloud.android.extensions;
 
 import java.util.HashMap;
 import java.util.LinkedList;
-import java.util.Vector;
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.GetMethod;
@@ -14,7 +13,6 @@ import com.owncloud.android.utils.OwnCloudVersion;
 
 
 import android.R;
-import android.app.Activity;
 import android.app.ListActivity;
 import android.os.Bundle;
 import android.os.Handler;
@@ -115,20 +113,25 @@ public class ExtensionsListActivity extends ListActivity {
             return mDescription;
         }
 
+        @SuppressWarnings("unused")
         public String getIcon() {
             return mIcon;
         }
 
+        @SuppressWarnings("unused")
         public String getDownload() {
             return mDownload;
         }
 
+        @SuppressWarnings("unused")
         public String getPlayId() {
             return mPlayId;
         }
 
+        @SuppressWarnings("unused")
         public OwnCloudVersion getVersion() {
             return mVersion;
         }
     }
+    
 }

diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java
index 59d5daa..a1881df 100644 (file)
--- a/src/com/owncloud/android/files/services/FileDownloader.java
+++ b/src/com/owncloud/android/files/services/FileDownloader.java
@@ -5,14 +5,12 @@ import java.util.Collections;
 import java.util.HashMap;\r
 import java.util.Map;\r
 \r
-import com.owncloud.android.authenticator.AccountAuthenticator;\r
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;\r
 import eu.alefzero.webdav.OnDatatransferProgressListener;\r
 \r
 import com.owncloud.android.network.OwnCloudClientUtils;\r
 \r
 import android.accounts.Account;\r
-import android.accounts.AccountManager;\r
 import android.app.Notification;\r
 import android.app.NotificationManager;\r
 import android.app.PendingIntent;\r

diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java
index 1091691..ad8356d 100644 (file)
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@ -17,7 +17,6 @@ import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.UploadFileOperation;
 import com.owncloud.android.utils.OwnCloudVersion;
 
-import eu.alefzero.webdav.ChunkFromFileChannelRequestEntity;
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 
 import com.owncloud.android.network.OwnCloudClientUtils;
@@ -38,7 +37,6 @@ import android.os.Process;
 import android.util.Log;
 import android.widget.RemoteViews;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.R;
 import eu.alefzero.webdav.WebdavClient;
 

diff --git a/src/com/owncloud/android/network/AdvancedSslSocketFactory.java b/src/com/owncloud/android/network/AdvancedSslSocketFactory.java
index c6f1b16..755888f 100644 (file)
--- a/src/com/owncloud/android/network/AdvancedSslSocketFactory.java
+++ b/src/com/owncloud/android/network/AdvancedSslSocketFactory.java
@@ -25,7 +25,6 @@ import java.net.Socket;
 import java.net.SocketAddress;
 import java.net.UnknownHostException;
 import java.security.cert.X509Certificate;
-import java.util.Enumeration;
 
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLContext;
@@ -33,7 +32,6 @@ import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLHandshakeException;
 import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSessionContext;
 import javax.net.ssl.SSLSocket;
 
 import org.apache.commons.httpclient.ConnectTimeoutException;

diff --git a/src/com/owncloud/android/operations/RemoteOperationResult.java b/src/com/owncloud/android/operations/RemoteOperationResult.java
index eb895ca..b95f734 100644 (file)
--- a/src/com/owncloud/android/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/operations/RemoteOperationResult.java
@@ -25,7 +25,6 @@ import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 
 import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLPeerUnverifiedException;
 
 import org.apache.commons.httpclient.ConnectTimeoutException;
 import org.apache.commons.httpclient.HttpException;

diff --git a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
index 2508dcd..df69bd7 100644 (file)
--- a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
@@ -3,14 +3,11 @@ package com.owncloud.android.syncadapter;
 import java.io.FileInputStream;
 import java.io.IOException;
 
-import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.ByteArrayEntity;
 
 import com.owncloud.android.AccountUtils;
 import com.owncloud.android.authenticator.AccountAuthenticator;
-import com.owncloud.android.db.ProviderMeta;
-import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -24,7 +21,6 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.ContactsContract;
-import android.util.Log;
 
 public class ContactSyncAdapter extends AbstractOwnCloudSyncAdapter {
     private String mAddrBookUri;
@@ -53,7 +49,7 @@ public class ContactSyncAdapter extends AbstractOwnCloudSyncAdapter {
                     byte[] b = new byte[f.available()];
                     f.read(b);
                     query.setEntity(new ByteArrayEntity(b));
-                    HttpResponse response = fireRawRequest(query);
+                    fireRawRequest(query);
                 } catch (IOException e) {
                     e.printStackTrace();
                     return;

diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
index 50f7625..2942ebb 100644 (file)
--- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
+++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
@@ -19,9 +19,7 @@ import android.view.ContextMenu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.CheckedTextView;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
@@ -40,6 +38,8 @@ import com.owncloud.android.R;
 public class AccountSelectActivity extends SherlockListActivity implements
         AccountManagerCallback<Boolean> {
 
+    private static final String  TAG = "AccountSelectActivity";
+    
     private static final String PREVIOUS_ACCOUNT_KEY = "ACCOUNT";
     
     private final Handler mHandler = new Handler();
@@ -124,13 +124,20 @@ public class AccountSelectActivity extends SherlockListActivity implements
         return false;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public boolean onContextItemSelected(android.view.MenuItem item) {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) item
                 .getMenuInfo();
         int index = info.position;
-        HashMap<String, String> map = (HashMap<String, String>) getListAdapter()
-                .getItem(index);
+        HashMap<String, String> map = null;
+        try {
+            map = (HashMap<String, String>) getListAdapter().getItem(index);
+        } catch (ClassCastException e) {
+            Log.wtf(TAG, "getitem(index) from list adapter did not return hashmap, bailing out");
+            return false;
+        }
+        
         String accountName = map.get("NAME");
         AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
         Account accounts[] = am

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 1adbb1b..fb310ec 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -21,7 +21,6 @@ package com.owncloud.android.ui.activity;
 import java.io.File;\r
 \r
 import android.accounts.Account;\r
-import android.accounts.AccountManager;\r
 import android.app.AlertDialog;\r
 import android.app.ProgressDialog;\r
 import android.app.AlertDialog.Builder;\r
@@ -40,7 +39,6 @@ import android.content.res.Resources.NotFoundException;
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
-import android.os.Environment;\r
 import android.os.Handler;\r
 import android.preference.PreferenceManager;\r
 import android.provider.MediaStore;\r
@@ -65,10 +63,7 @@ import com.owncloud.android.authenticator.AccountAuthenticator;
 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
-import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;\r
-import com.owncloud.android.files.OwnCloudFileObserver;\r
 import com.owncloud.android.files.services.FileDownloader;\r
-import com.owncloud.android.files.services.FileObserverService;\r
 import com.owncloud.android.files.services.FileUploader;\r
 import com.owncloud.android.network.OwnCloudClientUtils;\r
 import com.owncloud.android.syncadapter.FileSyncService;\r
@@ -637,13 +632,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private class DirectoryCreator implements Runnable {\r
         private String mTargetPath;\r
         private Account mAccount;\r
-        private AccountManager mAm;\r
         private Handler mHandler; \r
     \r
         public DirectoryCreator(String targetPath, Account account, Handler handler) {\r
             mTargetPath = targetPath;\r
             mAccount = account;\r
-            mAm = (AccountManager) getSystemService(ACCOUNT_SERVICE);\r
             mHandler = handler;\r
         }\r
     \r

diff --git a/src/com/owncloud/android/ui/activity/PinCodeActivity.java b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
index 4cc224a..c545fb2 100644 (file)
--- a/src/com/owncloud/android/ui/activity/PinCodeActivity.java
+++ b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
@@ -27,25 +27,19 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.Typeface;
 import android.os.Bundle;
-import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.text.Editable;
-import android.text.InputType;
 import android.text.TextWatcher;
-import android.text.method.PasswordTransformationMethod;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
 import android.view.View.OnKeyListener;
-import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
-
 public class PinCodeActivity extends SherlockFragmentActivity {
 
   
@@ -238,8 +232,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {
-                // TODO Auto-generated method stub
-
                 if (keyCode == KeyEvent.KEYCODE_DEL && bChange) {
 
                     mText1.setText("");
@@ -260,8 +252,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
-                // TODO Auto-generated method stub
-                
                 mText2.setCursorVisible(true);
                 if (mText1.getText().toString().equals("")){
                     mText2.setSelected(false);
@@ -305,8 +295,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {
-                // TODO Auto-generated method stub
-
                 if (keyCode == KeyEvent.KEYCODE_DEL && bChange) {
                     mText2.requestFocus();
                     if (!confirmingPinCode)
@@ -326,7 +314,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
-                // TODO Auto-generated method stub
                 mText3.setCursorVisible(true);
                 if (mText1.getText().toString().equals("")){
                     mText3.setSelected(false);
@@ -411,8 +398,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {
-                // TODO Auto-generated method stub
-
                 if (keyCode == KeyEvent.KEYCODE_DEL && bChange) {
                     mText3.requestFocus();
                     if (!confirmingPinCode)
@@ -431,8 +416,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
-                // TODO Auto-generated method stub
-                
                 mText4.setCursorVisible(true);
                 
                 if (mText1.getText().toString().equals("")){
@@ -503,7 +486,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
-                    // TODO Auto-generated method stub("");
                    return; 
                 }
                 
@@ -549,7 +531,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
-                    // TODO Auto-generated method stub("");
                    return; 
                 }
                 
@@ -583,7 +564,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                // TODO Auto-generated method stub("");
                 finish();
                 return; 
             }

diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index ca13416..9dfce13 100644 (file)
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -19,8 +19,6 @@ package com.owncloud.android.ui.activity;
 \r
 import java.util.Vector;\r
 \r
-import android.accounts.Account;\r
-import android.accounts.AccountManager;\r
 import android.content.Intent;\r
 import android.content.SharedPreferences;\r
 import android.os.Bundle;\r
@@ -36,9 +34,7 @@ import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockPreferenceActivity;\r
 import com.actionbarsherlock.view.Menu;\r
 import com.actionbarsherlock.view.MenuItem;\r
-import com.owncloud.android.AccountUtils;\r
 import com.owncloud.android.OwnCloudSession;\r
-import com.owncloud.android.authenticator.AccountAuthenticator;\r
 import com.owncloud.android.db.DbHandler;\r
 \r
 import com.owncloud.android.R;\r

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 4772ddf..9dfb450 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -35,7 +35,6 @@ import org.apache.http.protocol.HTTP;
 import org.apache.jackrabbit.webdav.client.methods.DavMethodBase;\r
 import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;\r
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;\r
-import org.json.JSONException;\r
 import org.json.JSONObject;\r
 \r
 import android.accounts.Account;\r
@@ -79,7 +78,6 @@ import com.owncloud.android.authenticator.AccountAuthenticator;
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.files.services.FileDownloader;\r
-import com.owncloud.android.files.services.FileObserverService;\r
 import com.owncloud.android.files.services.FileUploader;\r
 import com.owncloud.android.network.OwnCloudClientUtils;\r
 import com.owncloud.android.ui.activity.FileDetailActivity;\r
@@ -649,6 +647,7 @@ public class FileDetailFragment extends SherlockFragment implements
     \r
 \r
     // this is a temporary class for sharing purposes, it need to be replaced in transfer service\r
+    @SuppressWarnings("unused")\r
     private class ShareRunnable implements Runnable {\r
         private String mPath;\r
 \r
@@ -741,17 +740,7 @@ public class FileDetailFragment extends SherlockFragment implements
                     String uri = am.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL) + SHARED_PATH + token; \r
                     Log.d("Actions:shareFile ok", "url: " + uri);   \r
                     \r
-                } catch (HttpException e) {\r
-                    // TODO Auto-generated catch block\r
-                    e.printStackTrace();\r
-                } catch (IOException e) {\r
-                    // TODO Auto-generated catch block\r
-                    e.printStackTrace();\r
-                } catch (JSONException e) {\r
-                    // TODO Auto-generated catch block\r
-                    e.printStackTrace();\r
                 } catch (Exception e) {\r
-                    // TODO Auto-generated catch block\r
                     e.printStackTrace();\r
                 }\r
                 \r

diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index 2e3ef87..f3aca3e 100644 (file)
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -22,7 +22,6 @@ import java.io.File;
 import java.io.FileOutputStream;\r
 import java.io.IOException;\r
 import java.io.InputStream;\r
-import java.util.Random;\r
 \r
 import org.apache.commons.httpclient.Credentials;\r
 import org.apache.commons.httpclient.HttpClient;\r
@@ -102,12 +101,12 @@ public class WebdavClient extends HttpClient {
                         mDataTransferListener.transferProgress(readResult);\r
                     fos.write(bytes, 0, readResult);\r
                 }\r
+                fos.close();\r
                 ret = true;\r
             } else {\r
                 exhaustResponse(get.getResponseBodyAsStream());\r
             }\r
             Log.e(TAG, "Download of " + remoteFilePath + " to " + targetFile + " finished with HTTP status " + status + (!ret?"(FAIL)":""));\r
-            \r
         } catch (Exception e) {\r
             logException(e, "dowloading " + remoteFilePath);\r
             \r