warnging and legacy class removing

project.properties

@@ -9,4 +9,4 @@
 
 # Project target.
 target=android-13
-android.library.reference.1=actionbarsherlock/library
+android.library.reference.1=../../../Downloads/JakeWharton-ActionBarSherlock-436230d/library

res/layout/action_bar.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="#F7F7F7"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:id="@+id/linearLayout1"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical" >
-
-        <LinearLayout
-            android:id="@+id/linearLayout7"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:background="@drawable/main_header_bg"
-            android:gravity="top"
-            android:orientation="horizontal" >
-
-            <ImageView
-                android:id="@+id/main_header_small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|left"
-                android:src="@drawable/icon" >
-            </ImageView>
-
-            <eu.alefzero.owncloud.ui.fragment.PathLayout
-                android:id="@+id/pathLayout1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical" >
-            </eu.alefzero.owncloud.ui.fragment.PathLayout>
-        </LinearLayout>
-    </LinearLayout>
-</LinearLayout>

src/eu/alefzero/owncloud/DisplayUtils.java

@@ -20,8 +20,6 @@ package eu.alefzero.owncloud;
 
 import java.util.HashMap;
 
-import android.util.Log;
-
 /**
  * A helper class for some string operations.
  * @author Bartek Przybylski

src/eu/alefzero/owncloud/FileDownloader.java

@@ -11,7 +11,6 @@ import android.app.Service;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Binder;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -21,7 +20,6 @@ import android.os.Message;
 import android.os.Process;
 import android.util.Log;
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.db.DbHandler;
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;
 import eu.alefzero.webdav.WebdavClient;

src/eu/alefzero/owncloud/Uploader.java

@@ -19,7 +19,6 @@ package eu.alefzero.owncloud;
 
 import java.io.File;
 import java.net.FileNameMap;
-import java.net.URI;
 import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Stack;

src/eu/alefzero/owncloud/authenticator/AccountAuthenticator.java

@@ -178,7 +178,6 @@ public class AccountAuthenticator extends AbstractAccountAuthenticator {
     }
 
     private void validateRequiredFeatures(String[] requiredFeatures) throws UnsupportedFeaturesException {
-        // TODO
     }
 
     private void validateCreaditials(String username, String password, String path) throws AccessDeniedException {

src/eu/alefzero/owncloud/authenticator/AuthUtils.java

@@ -22,25 +22,6 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.UnknownHostException;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.UnrecoverableKeyException;
-
-import javax.net.SocketFactory;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
-import javax.security.cert.CertificateException;
-import javax.security.cert.X509Certificate;
-
-import org.apache.http.client.HttpClient;
 import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.conn.scheme.Scheme;
 import org.apache.http.conn.scheme.SchemeRegistry;
@@ -58,8 +39,6 @@ import org.apache.http.client.methods.HttpHead;
 import org.apache.http.conn.params.ConnManagerPNames;
 import org.apache.http.conn.params.ConnPerRouteBean;
 import org.apache.http.conn.scheme.PlainSocketFactory;
-import org.apache.http.conn.ssl.SSLSocketFactory;
-import org.apache.http.impl.conn.SingleClientConnManager;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
 import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpParams;

src/eu/alefzero/owncloud/cp.java

@@ -80,8 +80,6 @@ public class cp extends ContentProvider {
     mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "dir/#", DIRECTORY);
   }
   
-  private static final String TAG = "OC_ContentProvider";
-  
   @Override
   public int delete(Uri uri, String where, String[] whereArgs) {
     SQLiteDatabase db = mDbHelper.getWritableDatabase();

src/eu/alefzero/owncloud/db/DbHandler.java

@@ -26,7 +26,6 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
 
 /**
  * Custom database helper for ownCloud

src/eu/alefzero/owncloud/ui/QuickAction.java

@@ -37,9 +37,6 @@ import android.view.ViewGroup;
 import java.util.ArrayList;
 
 import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.R.id;
-import eu.alefzero.owncloud.R.layout;
-import eu.alefzero.owncloud.R.style;
 
 /**
  * Popup window, shows action list as icon and text like the one in Gallery3D app. 

src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java

@@ -19,20 +19,10 @@ package eu.alefzero.owncloud.ui.activity;
 
 
 import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.R.id;
-import eu.alefzero.owncloud.R.layout;
-import eu.alefzero.owncloud.ui.fragment.ActionBar;
 import eu.alefzero.owncloud.ui.fragment.FileDetail;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Configuration;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTransaction;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.View;
 import android.view.Window;
 
 /**

src/eu/alefzero/owncloud/ui/activity/Preferences.java

@@ -23,9 +23,6 @@ import java.util.Vector;
 
 import eu.alefzero.owncloud.OwnCloudSession;
 import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.R.id;
-import eu.alefzero.owncloud.R.menu;
-import eu.alefzero.owncloud.R.xml;
 import eu.alefzero.owncloud.db.DbHandler;
 
 import android.app.Activity;

src/eu/alefzero/owncloud/ui/activity/PreferencesNewSession.java

@@ -1,26 +1,12 @@
 package eu.alefzero.owncloud.ui.activity;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import eu.alefzero.owncloud.authenticator.AccountAuthenticatorService;
-
-import android.accounts.Account;
 import android.accounts.AccountAuthenticatorActivity;
-import android.accounts.AccountManager;
 import android.app.Activity;
-import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
 
 public class PreferencesNewSession extends AccountAuthenticatorActivity implements OnClickListener {
-  private Intent mReturnData;
-  private final String TAG = "OwnCloudPreferencesNewSession";
   @Override
   public void onCreate(Bundle savedInstanceState){
     super.onCreate(savedInstanceState);
@@ -99,9 +85,9 @@ public class PreferencesNewSession extends AccountAuthenticatorActivity implemen
     }*/
   }
   
-  private URI prepareURI() {
+  /*private URI prepareURI() {
     URI uri = null;
-   /* String url = "";
+    String url = "";
     try {
       String username = ((EditText) findViewById(R.id.newSession_username)).getText().toString().trim();
       String password = ((EditText) findViewById(R.id.newSession_password)).getText().toString().trim();
@@ -127,12 +113,12 @@ public class PreferencesNewSession extends AccountAuthenticatorActivity implemen
       Log.e(TAG, "Incorrect URI syntax " + e.getLocalizedMessage());
       Toast.makeText(this, R.string.new_session_uri_error, Toast.LENGTH_LONG).show();
     }
-    */return uri;
+    return uri;
   }
   
   private boolean isNameValid(String string) {
     return string.matches("[A-Za-z0-9 _-]*");
-  }
+  }*/
   
   @Override
   public void onBackPressed() {

src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java

@@ -17,29 +17,20 @@
  */
 package eu.alefzero.owncloud.ui.adapter;
 
-import java.security.Provider;
-
 import eu.alefzero.owncloud.DisplayUtils;
 import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.R.drawable;
-import eu.alefzero.owncloud.R.id;
-import eu.alefzero.owncloud.R.layout;
 import eu.alefzero.owncloud.db.ProviderMeta;
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.database.DataSetObserver;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.View.OnLongClickListener;
-import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.TextView;
-import android.widget.AdapterView.OnItemClickListener;
 
 /**
  * This Adapter populates a ListView with all files and 

src/eu/alefzero/owncloud/ui/fragment/ActionBar.java

@@ -1,66 +0,0 @@
-/* ownCloud Android client application
- *   Copyright (C) 2011  Bartek Przybylski
- *
- *   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 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/>.
- *
- */
-package eu.alefzero.owncloud.ui.fragment;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.SupportActivity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import eu.alefzero.owncloud.R;
-
-/**
- * A custom ActionBar implementation used in the FileDisplayActivity
- * @author Bartek Przybylski
- *
- */
-public class ActionBar extends Fragment {
-
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    
-  }
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container,
-      Bundle savedInstanceState) {
-    View v = inflater.inflate(R.layout.action_bar, container, false);
-    return v;
-  }
-  
-  @Override
-  public void onAttach(SupportActivity activity) {
-    super.onAttach(activity);
-  }
-  
-  public void setPath(String path) {
-    if (getPathLayout() != null)
-      getPathLayout().addPath(path);
-  }
-  
-  public String getCurrentPath() {
-    if (getPathLayout() != null)
-       return getPathLayout().getFullPath();
-    return "";
-  }
-  
-  private PathLayout getPathLayout() {
-    return (PathLayout) getActivity().findViewById(R.id.pathLayout1);
-  }
-}

src/eu/alefzero/owncloud/ui/fragment/PathLayout.java

@@ -1,117 +0,0 @@
-/* ownCloud Android client application
- *   Copyright (C) 2011  Bartek Przybylski
- *
- *   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 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/>.
- *
- */
-package eu.alefzero.owncloud.ui.fragment;
-
-import java.util.LinkedList;
-import java.util.Stack;
-
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.R.drawable;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.HorizontalScrollView;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-/**
- * Part of the ActionBar Layout
- * @author Bartek Przybylski
- *
- */
-public class PathLayout extends LinearLayout {
-
-  private LinkedList<String> paths;
-  ScrollView internalScroll;
-  LinearLayout view;
-
-  public PathLayout(Context context) {
-    super(context);
-    initialize();
-  }
-  
-  public PathLayout(Context context, AttributeSet attrs) {
-    super(context, attrs);
-    initialize();
-  }
-
-  public String pop() {
-    if (paths.size() == 0) {
-      return null;
-    }
-    int start = paths.size()*2-2;
-    int count = 2;
-    if (paths.size() == 1) {
-      start++;
-      count--;
-    }
-    view.removeViews(start, count);
-    return paths.removeLast();
-  }
-
-  public void addPath(String path) {
-    for (String s : path.split("/")) if (s.length() != 0) push(s);
-  }
-  
-  public void push(String path) {
-    // its weird that we cannot declare static imgView as path separator
-    if (paths.size() != 0) {
-      ImageView iv = new ImageView(getContext());
-      iv.setImageDrawable(getResources().getDrawable(R.drawable.breadcrumb));
-      iv.setPadding(2, 0, 2, 0);
-      view.addView(iv);
-    }
-    TextView tv = new TextView(getContext());
-    tv.setLayoutParams(getLayoutParams());
-    tv.setText(path);
-    view.addView(tv);
-    HorizontalScrollView hsv = (HorizontalScrollView) internalScroll.getChildAt(0);
-    hsv.smoothScrollTo(hsv.getMaxScrollAmount()*2, 0);
-    paths.addLast(path);
-  }
-  
-  public String peek() {
-    return paths.peek();
-  }
-
-  public String getFullPath() {
-    String ret = new String();
-    for (int i = 0; i < paths.size(); i++) {
-      ret += "/" + paths.get(i);
-    }
-    return ret;
-  }
-  
-  private void initialize() {
-    paths = new LinkedList<String>();
-    internalScroll = new ScrollView(getContext());
-    internalScroll.setFillViewport(true);
-    HorizontalScrollView hsv = new HorizontalScrollView(getContext());
-    hsv.setSmoothScrollingEnabled(true);
-    internalScroll.addView(hsv);
-    view = new LinearLayout(getContext());
-    addView(internalScroll);
-    hsv.addView(view);
-    ImageView iv = new ImageView(getContext());
-    iv.setImageDrawable(getResources().getDrawable(R.drawable.breadcrumb));
-    view.addView(iv);
-  }
-
-}

src/eu/alefzero/webdav/TreeNodeContainer.java

@@ -22,8 +22,6 @@ import java.util.ListIterator;
 
 import org.w3c.dom.Document;
 
-import android.util.Xml;
-
 public class TreeNodeContainer extends TreeNode {
   
   @Override

src/eu/alefzero/webdav/TreeNodeFile.java

@@ -18,21 +18,11 @@
 
 package eu.alefzero.webdav;
 
-import java.sql.Date;
-
 import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-import eu.alefzero.webdav.TreeNode.NodeProperty;
-
-import android.util.Xml;
 
 public class TreeNodeFile extends TreeNode {
 
   public TreeNodeFile() {
-    is_pinned_ = false;
-    pathToDownloadedFile_ = "";
-    lastUpdateDate_ = new Date(1970, 1, 1);
   }
   
   @Override
@@ -49,8 +39,4 @@ public class TreeNodeFile extends TreeNode {
       //TODO: update file
     }*/
   }
-  
-  private boolean is_pinned_;
-  private String pathToDownloadedFile_;
-  private Date lastUpdateDate_;
 }

src/eu/alefzero/webdav/WebdavClient.java

@@ -18,12 +18,9 @@
 package eu.alefzero.webdav;
 
 import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
@@ -129,7 +126,6 @@ public class WebdavClient {
     method.setHeader("User-Agent", "Android-ownCloud");
 
     try {
-      FileBody fb = new FileBody(new File(localFile, contentType));
       final FileEntity fileEntity = new FileEntity(new File(localFile), contentType);
 
       method.setEntity(fileEntity);

src/eu/alefzero/webdav/WebdavUtils.java

@@ -39,7 +39,6 @@ import org.xml.sax.SAXException;
 
 import eu.alefzero.webdav.TreeNode.NodeProperty;
 
-import android.text.Html;
 import android.util.Log;
 
 public class WebdavUtils {