mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #294 from owncloud/setup_buttons

Browse source 
Allow setting up style for buttons
This commit is contained in:
David A. Velasco 2013-11-06 02:47:01 -08:00
commit 15d22fa7d6
90 changed files with 293 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/drawable-hdpi/common_error.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
res/drawable-ldpi/common_error.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 802 B

BIN
res/drawable-mdpi/common_error.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 884 B

41
res/layout-land/account_setup.xml
View file

@ -187,29 +187,26 @@
</LinearLayout>
<Button
android:id="@id/buttonOK"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:drawable/btn_default"
android:layout_above="@id/account_register"
android:layout_centerHorizontal="true"
android:enabled="false"
android:onClick="onOkClick"
android:text="@string/setup_btn_connect"
/>
android:id="@id/buttonOK"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/welcome_link"
android:layout_centerHorizontal="true"
android:enabled="false"
android:onClick="onOkClick"
android:text="@string/setup_btn_connect" />
<Button
android:id="@+id/account_register"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:background="@android:color/transparent"
android:textColor="#0000FF"
android:onClick="onRegisterClick"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:text="@string/auth_register"
/>
android:id="@id/welcome_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@android:color/transparent"
android:onClick="onRegisterClick"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/auth_register"
android:textColor="#0000FF"/>
</RelativeLayout>

10
res/layout/account_setup.xml
View file

@ -171,24 +171,22 @@
android:id="@+id/buttonOK"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:drawable/btn_default"
android:layout_gravity="center_horizontal"
android:enabled="false"
android:onClick="onOkClick"
android:text="@string/setup_btn_connect"
/>
android:text="@string/setup_btn_connect" />
<Button
android:id="@+id/account_register"
android:id="@+id/welcome_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:textColor="#0000FF"
android:onClick="onRegisterClick"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/auth_register"
/>
android:textColor="#0000FF"/>
</LinearLayout>
</ScrollView>

3
res/layout/log_send_file.xml
View file

@ -24,7 +24,8 @@
android:layout_height="wrap_content"
android:gravity="bottom">
<Button android:id="@+id/deleteLogHistoryButton"
<Button
android:id="@+id/deleteLogHistoryButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/prefs_log_delete_history_button"/>

9
res/layout/pincodelock.xml
View file

@ -68,9 +68,10 @@
style="@style/PassCodeStyle" />
</LinearLayout>
<Button android:layout_width="wrap_content"
<Button
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/common_cancel"
android:textColor="@android:color/black"
android:id="@+id/cancel"/>
android:text="@string/common_cancel" />
</LinearLayout>

2
res/layout/uploader_layout.xml
View file

@ -35,6 +35,6 @@
android:layout_width="fill_parent" android:layout_alignParentBottom="true" android:layout_height="wrap_content" android:orientation="vertical">
<Button android:layout_gravity="bottom" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:id="@+id/uploader_choose_folder"
android:text="@string/uploader_btn_upload_text"></Button>
android:text="@string/uploader_btn_upload_text"/>
</LinearLayout>
</RelativeLayout>

9
res/values-v11/versioned_styles.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="Theme.ownCloud.ButtonStyle" parent="@android:style/Widget.Holo.Light.Button">
<item name="android:background">@android:drawable/btn_default</item>
<item name="android:textColor">@color/button_text_color</item>
</style>
</resources>

7
res/values/setup.xml
View file

@ -12,7 +12,8 @@
<!-- URLs and flags related -->
<string name="server_url"></string>
<bool name="show_server_url_input">true</bool>
<string name="url_account_register">"https://owncloud.com/mobile/new"</string>
<bool name="show_welcome_link">true</bool>
<string name="welcome_link_url">"https://owncloud.com/mobile/new"</string>
<!-- Flags to setup the authentication methods available in the app -->
<string name="auth_method_oauth2">off</string>
@ -25,6 +26,9 @@
<color name="actionbar_start_color">#1D2D44</color>
<color name="actionbar_end_color">#1D2D44</color>
<!-- Button -->
<color name="button_text_color">#000000</color>
<!-- Multiaccount support -->
<bool name="multiaccount_support">true</bool>
@ -41,3 +45,4 @@
</resources>

12
res/values/styles.xml
View file

@ -24,17 +24,25 @@
<style name="Theme.ownCloud" parent="style/Theme.Sherlock.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
<item name="actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
<item name="android:actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
</style>
<style name="Theme.ownCloud.noActionBar" parent="style/Theme.Sherlock.Light.NoActionBar">
<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
<item name="actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
<item name="android:actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
</style>
<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.Sherlock.NoActionBar">
<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
<item name="android:windowFullscreen">true</item>
<item name="actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
<item name="android:actionDropDownStyle">@style/Theme.ownCloud.DropDownStyle</item>
</style>
@ -46,14 +54,14 @@
<item name="android:shadowRadius">1</item>
<item name="android:shadowDy">1</item>
<item name="android:backgroundSplit">@drawable/split_action_bg</item>
<item name="android:indeterminateProgressStyle">@style/Theme.ownCloud.IndeterminateStyle</item>
<item name="indeterminateProgressStyle">@style/Theme.ownCloud.IndeterminateStyle</item>
</style>
<!-- Dialogs -->
<style name="Theme.ownCloud.Dialog" parent="style/Theme.Sherlock.Light.Dialog">
</style>
<!-- PopDownMenu -->
<style name="Animations.PopDownMenu" />

19
res/values/versioned_styles.xml Normal file
View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Buttons -->
<style name="Theme.ownCloud.ButtonStyle" parent="@android:style/Widget.Button">
<item name="android:background">@android:drawable/btn_default</item>
<item name="android:textColor">@color/button_text_color</item>
</style>
<!-- DropDown -->
<style name="Theme.ownCloud.DropDownStyle" parent="style/Widget.Sherlock.Spinner.DropDown.ActionBar">
<item name="android:background">@drawable/abs__spinner_ab_holo_dark</item>
</style>
<style name="Theme.ownCloud.IndeterminateStyle" parent="style/Widget.Sherlock.ProgressBar">
<item name="android:indeterminateDrawable">@drawable/abs__progress_medium_holo</item>
</style>
</resources>

12
src/com/owncloud/android/Uploader.java
View file

@ -26,6 +26,12 @@ import java.util.List;
import java.util.Stack;
import java.util.Vector;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileUploader;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.app.AlertDialog;
@ -54,12 +60,6 @@ import android.widget.EditText;
import android.widget.SimpleAdapter;
import android.widget.Toast;
import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.R;
/**
* This can be used to upload things to an ownCloud instance.

7
src/com/owncloud/android/authentication/AccountAuthenticator.java
View file

@ -18,6 +18,10 @@
package com.owncloud.android.authentication;
import com.owncloud.android.Log_OC;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import android.accounts.*;
import android.content.Context;
import android.content.Intent;
@ -25,10 +29,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.widget.Toast;
import com.owncloud.android.Log_OC;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
/**

19
src/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -49,7 +49,6 @@ import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
import android.widget.Toast;
import com.actionbarsherlock.app.SherlockDialogFragment;
import com.owncloud.android.Log_OC;
@ -69,6 +68,7 @@ import com.owncloud.android.ui.dialog.SslValidatorDialog;
import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
import com.owncloud.android.utils.OwnCloudVersion;
import eu.alefzero.webdav.WebdavClient;
/**
@ -193,11 +193,16 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
/// set Host Url Input Enabled
mHostUrlInputEnabled = getResources().getBoolean(R.bool.show_server_url_input);
/// complete label for 'register account' button
Button b = (Button) findViewById(R.id.account_register);
if (b != null) {
b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));
/// set visibility of link for new users
boolean accountRegisterVisibility = getResources().getBoolean(R.bool.show_welcome_link);
Button welcomeLink = (Button) findViewById(R.id.welcome_link);
if (welcomeLink != null) {
if (accountRegisterVisibility) {
welcomeLink.setVisibility(View.VISIBLE);
welcomeLink.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));
} else {
findViewById(R.id.welcome_link).setVisibility(View.GONE);
}
}
/// initialization
@ -1397,7 +1402,7 @@ implements OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
* @param view 'Account register' button
*/
public void onRegisterClick(View view) {
Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_account_register)));
Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.welcome_link_url)));
setResult(RESULT_CANCELED);
startActivity(register);
}

1
src/com/owncloud/android/authentication/SsoWebViewClient.java
View file

@ -21,6 +21,7 @@ import java.lang.ref.WeakReference;
import com.owncloud.android.Log_OC;
import android.graphics.Bitmap;
import android.os.Handler;
import android.os.Message;

1
src/com/owncloud/android/datamodel/FileDataStorageManager.java
View file

@ -30,6 +30,7 @@ import com.owncloud.android.MainApp;
import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
import com.owncloud.android.utils.FileStorageUtils;
import android.accounts.Account;
import android.content.ContentProviderClient;
import android.content.ContentProviderOperation;

1
src/com/owncloud/android/datamodel/OCFile.java
View file

@ -22,6 +22,7 @@ import java.io.File;
import com.owncloud.android.Log_OC;
import android.os.Parcel;
import android.os.Parcelable;
import android.webkit.MimeTypeMap;

7
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
View file

@ -20,9 +20,13 @@ package com.owncloud.android.files;
import java.io.File;
import com.owncloud.android.Log_OC;
import com.owncloud.android.MainApp;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.db.DbHandler;
import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.utils.FileStorageUtils;
import android.accounts.Account;
import android.content.BroadcastReceiver;
@ -36,9 +40,6 @@ import android.preference.PreferenceManager;
import android.provider.MediaStore.Images.Media;
import android.webkit.MimeTypeMap;
import com.owncloud.android.Log_OC;
import com.owncloud.android.MainApp;
import com.owncloud.android.utils.FileStorageUtils;
public class InstantUploadBroadcastReceiver extends BroadcastReceiver {

1
src/com/owncloud/android/files/OwnCloudFileObserver.java
View file

@ -29,6 +29,7 @@ import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.ui.activity.ConflictsResolveActivity;
import android.accounts.Account;
import android.content.Context;
import android.content.Intent;

3
src/com/owncloud/android/files/managers/OCNotificationManager.java
View file

@ -21,12 +21,13 @@ package com.owncloud.android.files.managers;
import java.util.HashMap;
import java.util.Map;
import com.owncloud.android.R;
import android.app.Notification;
import android.app.NotificationManager;
import android.content.Context;
import android.widget.RemoteViews;
import com.owncloud.android.R;
public class OCNotificationManager {

11
src/com/owncloud/android/files/services/FileDownloader.java
View file

@ -28,11 +28,12 @@ import java.util.Vector;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import com.owncloud.android.Log_OC;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AuthenticatorActivity;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import eu.alefzero.webdav.OnDatatransferProgressListener;
import com.owncloud.android.network.OwnCloudClientUtils;
import com.owncloud.android.operations.DownloadFileOperation;
import com.owncloud.android.operations.RemoteOperationResult;
@ -42,6 +43,9 @@ import com.owncloud.android.ui.activity.FileDisplayActivity;
import com.owncloud.android.ui.preview.PreviewImageActivity;
import com.owncloud.android.ui.preview.PreviewImageFragment;
import eu.alefzero.webdav.OnDatatransferProgressListener;
import android.accounts.Account;
import android.accounts.AccountsException;
import android.app.Notification;
@ -58,9 +62,6 @@ import android.os.Message;
import android.os.Process;
import android.widget.RemoteViews;
import com.owncloud.android.Log_OC;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import eu.alefzero.webdav.WebdavClient;
public class FileDownloader extends Service implements OnDatatransferProgressListener {

1
src/com/owncloud/android/files/services/FileObserverService.java
View file

@ -30,6 +30,7 @@ import com.owncloud.android.files.OwnCloudFileObserver;
import com.owncloud.android.operations.SynchronizeFileOperation;
import com.owncloud.android.utils.FileStorageUtils;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.app.Service;

23
src/com/owncloud/android/files/services/FileUploader.java
View file

@ -33,10 +33,15 @@ import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.MultiStatus;
import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
import com.owncloud.android.Log_OC;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.authentication.AuthenticatorActivity;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.db.DbHandler;
import com.owncloud.android.network.OwnCloudClientUtils;
import com.owncloud.android.operations.ChunkedUploadFileOperation;
import com.owncloud.android.operations.CreateFolderOperation;
import com.owncloud.android.operations.ExistenceCheckOperation;
@ -44,13 +49,19 @@ import com.owncloud.android.operations.RemoteOperation;
import com.owncloud.android.operations.RemoteOperationResult;
import com.owncloud.android.operations.UploadFileOperation;
import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.ui.activity.FailedUploadActivity;
import com.owncloud.android.ui.activity.FileActivity;
import com.owncloud.android.ui.activity.FileDisplayActivity;
import com.owncloud.android.ui.activity.InstantUploadActivity;
import com.owncloud.android.ui.preview.PreviewImageActivity;
import com.owncloud.android.ui.preview.PreviewImageFragment;
import com.owncloud.android.utils.OwnCloudVersion;
import eu.alefzero.webdav.OnDatatransferProgressListener;
import eu.alefzero.webdav.WebdavEntry;
import eu.alefzero.webdav.WebdavUtils;
import com.owncloud.android.network.OwnCloudClientUtils;
import android.accounts.Account;
import android.accounts.AccountManager;
@ -70,16 +81,6 @@ import android.os.Process;
import android.webkit.MimeTypeMap;
import android.widget.RemoteViews;
import com.owncloud.android.Log_OC;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.db.DbHandler;
import com.owncloud.android.ui.activity.FailedUploadActivity;
import com.owncloud.android.ui.activity.FileActivity;
import com.owncloud.android.ui.activity.FileDisplayActivity;
import com.owncloud.android.ui.activity.InstantUploadActivity;
import com.owncloud.android.ui.preview.PreviewImageActivity;
import com.owncloud.android.ui.preview.PreviewImageFragment;
import eu.alefzero.webdav.WebdavClient;

1
src/com/owncloud/android/media/MediaControlView.java
View file

@ -42,6 +42,7 @@ import java.util.Locale;
import com.owncloud.android.R;
/**
* View containing controls for a {@link MediaPlayer}.
*

1
src/com/owncloud/android/media/MediaService.java
View file

@ -43,6 +43,7 @@ import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.ui.activity.FileActivity;
import com.owncloud.android.ui.activity.FileDisplayActivity;
/**
* Service that handles media playback, both audio and video.
*

1
src/com/owncloud/android/network/AdvancedSslSocketFactory.java
View file

@ -41,6 +41,7 @@ import org.apache.http.conn.ssl.X509HostnameVerifier;
import com.owncloud.android.Log_OC;
/**
* AdvancedSSLProtocolSocketFactory allows to create SSL {@link Socket}s with
* a custom SSLContext and an optional Hostname Verifier.

1
src/com/owncloud/android/network/AdvancedX509TrustManager.java
View file

@ -33,6 +33,7 @@ import javax.net.ssl.X509TrustManager;
import com.owncloud.android.Log_OC;
/**
* @author David A. Velasco
*/

1
src/com/owncloud/android/network/BearerAuthScheme.java
View file

@ -29,6 +29,7 @@ import org.apache.commons.httpclient.auth.MalformedChallengeException;
import com.owncloud.android.Log_OC;
/**
* Bearer authentication scheme as defined in RFC 6750.
*

5
src/com/owncloud/android/network/OwnCloudClientUtils.java
View file

@ -36,11 +36,12 @@ import org.apache.commons.httpclient.protocol.Protocol;
import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
import org.apache.http.conn.ssl.X509HostnameVerifier;
import com.owncloud.android.Log_OC;
import com.owncloud.android.MainApp;
import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
import com.owncloud.android.Log_OC;
import com.owncloud.android.MainApp;
import eu.alefzero.webdav.WebdavClient;

1
src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
View file

@ -31,6 +31,7 @@ import com.owncloud.android.Log_OC;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.network.ProgressiveDataTransferer;
import android.accounts.Account;
import eu.alefzero.webdav.ChunkFromFileChannelRequestEntity;

1
src/com/owncloud/android/operations/CreateFolderOperation.java
View file

@ -26,6 +26,7 @@ import com.owncloud.android.Log_OC;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import eu.alefzero.webdav.WebdavClient;
import eu.alefzero.webdav.WebdavUtils;

1
src/com/owncloud/android/operations/DownloadFileOperation.java
View file

@ -38,6 +38,7 @@ import com.owncloud.android.operations.RemoteOperation;
import com.owncloud.android.operations.RemoteOperationResult;
import com.owncloud.android.utils.FileStorageUtils;
import eu.alefzero.webdav.OnDatatransferProgressListener;
import eu.alefzero.webdav.WebdavClient;
import eu.alefzero.webdav.WebdavUtils;

1
src/com/owncloud/android/operations/ExistenceCheckOperation.java
View file

@ -22,6 +22,7 @@ import org.apache.commons.httpclient.methods.HeadMethod;
import com.owncloud.android.Log_OC;
import eu.alefzero.webdav.WebdavClient;
import eu.alefzero.webdav.WebdavUtils;
import android.content.Context;

1
src/com/owncloud/android/operations/OAuth2GetAccessToken.java
View file

@ -12,6 +12,7 @@ import com.owncloud.android.Log_OC;
import com.owncloud.android.authentication.OAuth2Constants;
import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
import eu.alefzero.webdav.WebdavClient;
public class OAuth2GetAccessToken extends RemoteOperation {

1
src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java
View file

@ -26,6 +26,7 @@ import com.owncloud.android.Log_OC;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.utils.OwnCloudVersion;
import eu.alefzero.webdav.WebdavClient;
import android.content.Context;
import android.net.ConnectivityManager;

1
src/com/owncloud/android/operations/RemoteOperation.java
View file

@ -26,6 +26,7 @@ import com.owncloud.android.network.BearerCredentials;
import com.owncloud.android.network.OwnCloudClientUtils;
import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AccountsException;

7
src/com/owncloud/android/operations/RemoteOperationResult.java
View file

@ -33,13 +33,14 @@ import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.jackrabbit.webdav.DavException;
import android.accounts.Account;
import android.accounts.AccountsException;
import com.owncloud.android.Log_OC;
import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
import com.owncloud.android.network.CertificateCombinedException;
import android.accounts.Account;
import android.accounts.AccountsException;
/**
* The result of a remote operation required to an ownCloud server.
*

1
src/com/owncloud/android/operations/RemoveFileOperation.java
View file

@ -24,6 +24,7 @@ import com.owncloud.android.Log_OC;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import eu.alefzero.webdav.WebdavClient;
import eu.alefzero.webdav.WebdavUtils;

7
src/com/owncloud/android/operations/RenameFileOperation.java
View file

@ -21,15 +21,16 @@ import java.io.File;
import java.io.IOException;
import org.apache.jackrabbit.webdav.client.methods.DavMethodBase;
//import org.apache.jackrabbit.webdav.client.methods.MoveMethod;
import android.accounts.Account;
import com.owncloud.android.Log_OC;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.utils.FileStorageUtils;
//import org.apache.jackrabbit.webdav.client.methods.MoveMethod;
import android.accounts.Account;
import eu.alefzero.webdav.WebdavClient;
import eu.alefzero.webdav.WebdavUtils;

9
src/com/owncloud/android/operations/SynchronizeFileOperation.java
View file

@ -23,10 +23,6 @@ import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.MultiStatus;
import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
import android.accounts.Account;
import android.content.Context;
import android.content.Intent;
import com.owncloud.android.Log_OC;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
@ -34,6 +30,11 @@ import com.owncloud.android.files.services.FileDownloader;
import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
import android.accounts.Account;
import android.content.Context;
import android.content.Intent;
import eu.alefzero.webdav.WebdavClient;
import eu.alefzero.webdav.WebdavEntry;
import eu.alefzero.webdav.WebdavUtils;

11
src/com/owncloud/android/operations/UpdateOCVersionOperation.java
View file

@ -22,15 +22,16 @@ import org.apache.commons.httpclient.methods.GetMethod;
import org.json.JSONException;
import org.json.JSONObject;
import com.owncloud.android.Log_OC;
import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.utils.OwnCloudVersion;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.content.Context;
import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.Log_OC;
import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.utils.OwnCloudVersion;
import eu.alefzero.webdav.WebdavClient;

5
src/com/owncloud/android/operations/UploadFileOperation.java
View file

@ -33,8 +33,6 @@ import org.apache.commons.httpclient.methods.RequestEntity;
import org.apache.http.HttpStatus;
import com.owncloud.android.Log_OC;
import android.accounts.Account;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.network.ProgressiveDataTransferer;
@ -43,6 +41,9 @@ import com.owncloud.android.operations.RemoteOperationResult;
import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.utils.FileStorageUtils;
import android.accounts.Account;
import eu.alefzero.webdav.FileRequestEntity;
import eu.alefzero.webdav.OnDatatransferProgressListener;
import eu.alefzero.webdav.WebdavClient;

1
src/com/owncloud/android/providers/FileContentProvider.java
View file

@ -28,6 +28,7 @@ import com.owncloud.android.db.ProviderMeta;
import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
import android.content.ContentProvider;
import android.content.ContentProviderOperation;
import android.content.ContentProviderResult;

1
src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
View file

@ -29,6 +29,7 @@ import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.network.OwnCloudClientUtils;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AuthenticatorException;

1
src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
View file

@ -27,6 +27,7 @@ import org.apache.http.entity.ByteArrayEntity;
import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.authentication.AccountUtils;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AuthenticatorException;

1
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
View file

@ -38,6 +38,7 @@ import com.owncloud.android.operations.UpdateOCVersionOperation;
import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;
import android.accounts.Account;
import android.accounts.AccountsException;
import android.app.Notification;

1
src/com/owncloud/android/ui/QuickAction.java
View file

@ -38,6 +38,7 @@ import java.util.ArrayList;
import com.owncloud.android.R;
/**
* Popup window, shows action list as icon and text like the one in Gallery3D
* app.

8
src/com/owncloud/android/ui/activity/AccountSelectActivity.java
View file

@ -47,13 +47,13 @@ import com.actionbarsherlock.app.SherlockListActivity;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.authentication.AuthenticatorActivity;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.Log_OC;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.authentication.AuthenticatorActivity;
public class AccountSelectActivity extends SherlockListActivity implements
AccountManagerCallback<Boolean> {

3
src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
View file

@ -43,10 +43,12 @@ import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
import com.owncloud.android.utils.FileStorageUtils;
/**
* Activity reporting errors occurred when local files uploaded to an ownCloud account with an app in
* version under 1.3.16 where being copied to the ownCloud local folder.
@ -118,6 +120,7 @@ public class ErrorsWhileCopyingHandlerActivity extends SherlockFragmentActivity
/// customize buttons
Button cancelBtn = (Button) findViewById(R.id.cancel);
Button okBtn = (Button) findViewById(R.id.ok);
okBtn.setText(R.string.foreign_files_move);
cancelBtn.setOnClickListener(this);
okBtn.setOnClickListener(this);

8
src/com/owncloud/android/ui/activity/FailedUploadActivity.java
View file

@ -17,6 +17,8 @@
package com.owncloud.android.ui.activity;
import com.owncloud.android.R;
import android.app.Activity;
import android.os.Bundle;
import android.view.View;
@ -24,7 +26,6 @@ import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
import com.owncloud.android.R;
/**
* This Activity is used to display a detail message for failed uploads
@ -44,8 +45,9 @@ public class FailedUploadActivity extends Activity {
String message = getIntent().getStringExtra(MESSAGE);
TextView textView = (TextView) findViewById(R.id.faild_upload_message);
textView.setText(message);
Button close_button = (Button) findViewById(R.id.failed_uploadactivity_close_button);
close_button.setOnClickListener(new OnClickListener() {
Button closeBtn = (Button) findViewById(R.id.failed_uploadactivity_close_button);
closeBtn.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
finish();

1
src/com/owncloud/android/ui/activity/FileActivity.java
View file

@ -35,6 +35,7 @@ import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.datamodel.OCFile;
import eu.alefzero.webdav.WebdavUtils;
/**

3
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file

@ -63,9 +63,9 @@ import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileDownloader;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
import com.owncloud.android.files.services.FileObserverService;
import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
import com.owncloud.android.operations.CreateFolderOperation;
import com.owncloud.android.operations.OnRemoteOperationListener;
@ -89,6 +89,7 @@ import com.owncloud.android.ui.preview.PreviewImageActivity;
import com.owncloud.android.ui.preview.PreviewMediaFragment;
import com.owncloud.android.ui.preview.PreviewVideoActivity;
/**
* Displays, what files the user has available in his ownCloud.
*

1
src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
View file

@ -33,6 +33,7 @@ import android.widget.TextView;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.owncloud.android.R;
/**
* Activity showing a text message and, optionally, a couple list of single or paired text strings.
*

25
src/com/owncloud/android/ui/activity/InstantUploadActivity.java
View file

@ -19,6 +19,14 @@ package com.owncloud.android.ui.activity;
import java.util.ArrayList;
import java.util.List;
import com.owncloud.android.Log_OC;
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 android.accounts.Account;
import android.app.Activity;
import android.content.Intent;
@ -41,13 +49,6 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.owncloud.android.Log_OC;
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;
/**
* This Activity is used to display a list with images they could not be
@ -76,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);
}

2
src/com/owncloud/android/ui/activity/LogHistoryActivity.java
View file

@ -38,6 +38,7 @@ import com.owncloud.android.utils.FileStorageUtils;
public class LogHistoryActivity extends SherlockPreferenceActivity implements OnPreferenceChangeListener {
String logpath = FileStorageUtils.getLogPath();
File logDIR = null;
@ -52,6 +53,7 @@ public class LogHistoryActivity extends SherlockPreferenceActivity implements On
actionBar.setDisplayHomeAsUpEnabled(true);
ListView listView = (ListView) findViewById(android.R.id.list);
Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton);
deleteHistoryButton.setOnClickListener(new OnClickListener() {
@Override

3
src/com/owncloud/android/ui/activity/PinCodeActivity.java
View file

@ -19,7 +19,6 @@ package com.owncloud.android.ui.activity;
import java.util.Arrays;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.owncloud.android.R;
import android.app.AlertDialog;
@ -81,8 +80,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
mText3 = (EditText) findViewById(R.id.txt3);
mText4 = (EditText) findViewById(R.id.txt4);
SharedPreferences appPrefs = PreferenceManager
.getDefaultSharedPreferences(getApplicationContext());

1
src/com/owncloud/android/ui/activity/Preferences.java
View file

@ -41,6 +41,7 @@ import com.owncloud.android.OwnCloudSession;
import com.owncloud.android.R;
import com.owncloud.android.db.DbHandler;
/**
* An Activity that allows the user to change the application's settings.
*

5
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
View file

@ -35,14 +35,14 @@ import android.widget.TextView;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
import com.actionbarsherlock.view.MenuItem;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
import com.owncloud.android.ui.fragment.LocalFileListFragment;
import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
import com.owncloud.android.utils.FileStorageUtils;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
/**
* Displays local files and let the user choose what of them wants to upload
@ -107,6 +107,7 @@ public class UploadFilesActivity extends FileActivity implements
mCancelBtn.setOnClickListener(this);
mUploadBtn = (Button) findViewById(R.id.upload_files_btn_upload);
mUploadBtn.setOnClickListener(this);
// Action bar setup
ActionBar actionBar = getSupportActionBar();

8
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
View file

@ -28,6 +28,9 @@ import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.TextView;
import java.util.Vector;
import com.owncloud.android.DisplayUtils;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
@ -37,8 +40,6 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
import com.owncloud.android.ui.activity.TransferServiceGetter;
import java.util.Vector;
/**
* This Adapter populates a ListView with all files and folders in an ownCloud
@ -54,9 +55,6 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
private FileDataStorageManager mStorageManager;
private Account mAccount;
private TransferServiceGetter mTransferServiceGetter;
//total size of a directory (recursive)
private Long totalSizeOfDirectoriesRecursive = null;
private Long lastModifiedOfAllSubdirectories = null;
public FileListListAdapter(Context context, TransferServiceGetter transferServiceGetter) {
mContext = context;

1
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
View file

@ -24,6 +24,7 @@ import java.util.Comparator;
import com.owncloud.android.DisplayUtils;
import com.owncloud.android.R;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;

3
src/com/owncloud/android/ui/adapter/LogListAdapter.java
View file

@ -2,6 +2,8 @@ package com.owncloud.android.ui.adapter;
import java.io.File;
import com.owncloud.android.R;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
@ -13,7 +15,6 @@ import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.TextView;
import com.owncloud.android.R;
public class LogListAdapter extends ArrayAdapter<String> {

1
src/com/owncloud/android/ui/dialog/ChangelogDialog.java
View file

@ -26,6 +26,7 @@ import android.webkit.WebView;
import com.actionbarsherlock.app.SherlockDialogFragment;
import com.owncloud.android.R;
/**
* Dialog to show the contents of res/raw/CHANGELOG.txt
*/

1
src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
View file

@ -29,6 +29,7 @@ import com.actionbarsherlock.app.SherlockDialogFragment;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.owncloud.android.R;
/**
* Dialog which will be displayed to user upon keep-in-sync file conflict.
*

1
src/com/owncloud/android/ui/dialog/EditNameDialog.java
View file

@ -32,6 +32,7 @@ import com.actionbarsherlock.app.SherlockDialogFragment;
import com.owncloud.android.R;
/**
* Dialog to request the user to input a name, optionally initialized with a former name.
*

1
src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
View file

@ -27,6 +27,7 @@ import android.view.KeyEvent;
import com.actionbarsherlock.app.SherlockDialogFragment;
import com.owncloud.android.R;
public class IndeterminateProgressDialog extends SherlockDialogFragment {
private static final String ARG_MESSAGE_ID = IndeterminateProgressDialog.class.getCanonicalName() + ".ARG_MESSAGE_ID";

1
src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
View file

@ -40,6 +40,7 @@ import com.owncloud.android.R;
import com.owncloud.android.authentication.SsoWebViewClient;
import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;
import eu.alefzero.webdav.WebdavClient;
/**

15
src/com/owncloud/android/ui/dialog/SslValidatorDialog.java
View file

@ -29,6 +29,12 @@ import java.util.Map;
import javax.security.auth.x500.X500Principal;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import com.owncloud.android.network.CertificateCombinedException;
import com.owncloud.android.network.OwnCloudClientUtils;
import com.owncloud.android.operations.RemoteOperationResult;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
@ -37,11 +43,6 @@ import android.view.Window;
import android.widget.Button;
import android.widget.TextView;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import com.owncloud.android.network.CertificateCombinedException;
import com.owncloud.android.network.OwnCloudClientUtils;
import com.owncloud.android.operations.RemoteOperationResult;
/**
* Dialog to request the user about a certificate that could not be validated with the certificates store in the system.
@ -142,11 +143,11 @@ public class SslValidatorDialog extends Dialog {
View detailsScroll = findViewById(R.id.details_scroll);
if (detailsScroll.getVisibility() == View.VISIBLE) {
detailsScroll.setVisibility(View.GONE);
((Button)v).setText(R.string.ssl_validator_btn_details_see);
((Button) v).setText(R.string.ssl_validator_btn_details_see);
} else {
detailsScroll.setVisibility(View.VISIBLE);
((Button)v).setText(R.string.ssl_validator_btn_details_hide);
((Button) v).setText(R.string.ssl_validator_btn_details_hide);
}
}
});

1
src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java
View file

@ -26,6 +26,7 @@ import android.os.Bundle;
import com.actionbarsherlock.app.SherlockDialogFragment;
import com.owncloud.android.Log_OC;
public class ConfirmationDialogFragment extends SherlockDialogFragment {
public final static String ARG_CONF_RESOURCE_ID = "resource_id";

1
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
View file

@ -23,6 +23,7 @@ import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import com.owncloud.android.ui.ExtendedListView;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;

5
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
View file

@ -48,17 +48,17 @@ import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
import com.owncloud.android.files.services.FileObserverService;
import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
import com.owncloud.android.operations.OnRemoteOperationListener;
import com.owncloud.android.operations.RemoteOperation;
import com.owncloud.android.operations.RemoteOperationResult;
import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.operations.RemoveFileOperation;
import com.owncloud.android.operations.RenameFileOperation;
import com.owncloud.android.operations.SynchronizeFileOperation;
import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.ui.activity.ConflictsResolveActivity;
import com.owncloud.android.ui.activity.FileActivity;
import com.owncloud.android.ui.activity.FileDisplayActivity;
@ -66,6 +66,7 @@ import com.owncloud.android.ui.dialog.EditNameDialog;
import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
import com.owncloud.android.ui.preview.PreviewImageFragment;
import eu.alefzero.webdav.OnDatatransferProgressListener;
/**

1
src/com/owncloud/android/ui/fragment/FileFragment.java
View file

@ -24,6 +24,7 @@ import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.FileHandler;
import com.owncloud.android.ui.activity.TransferServiceGetter;
/**
* Common methods for {@link Fragment}s containing {@link OCFile}s
*

5
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
View file

@ -19,8 +19,11 @@ package com.owncloud.android.ui.fragment;
import java.io.File;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import com.owncloud.android.ui.adapter.LocalFileListAdapter;
import android.app.Activity;
import android.os.Bundle;
import android.os.Environment;
@ -32,8 +35,6 @@ import android.widget.AdapterView;
import android.widget.ImageView;
import android.widget.ListView;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
/**
* A Fragment that lists all files and folders in a given LOCAL path.

1
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -43,6 +43,7 @@ import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationD
import com.owncloud.android.ui.preview.PreviewImageFragment;
import com.owncloud.android.ui.preview.PreviewMediaFragment;
import android.accounts.Account;
import android.app.Activity;
import android.os.Bundle;

11
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
View file

@ -19,6 +19,12 @@ package com.owncloud.android.ui.preview;
import java.lang.ref.WeakReference;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
import com.owncloud.android.ui.fragment.FileFragment;
import android.accounts.Account;
import android.app.Activity;
import android.os.Bundle;
@ -31,12 +37,7 @@ import android.widget.ImageButton;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
import com.owncloud.android.ui.fragment.FileFragment;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import eu.alefzero.webdav.OnDatatransferProgressListener;

6
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
View file

@ -35,20 +35,20 @@ import android.view.View.OnTouchListener;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.view.MenuItem;
import com.actionbarsherlock.view.Window;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileDownloader;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
import com.owncloud.android.ui.activity.FileActivity;
import com.owncloud.android.ui.activity.FileDisplayActivity;
import com.owncloud.android.ui.dialog.LoadingDialog;
import com.owncloud.android.ui.fragment.FileFragment;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
/**
* Holds a swiping galley where image files contained in an ownCloud directory are shown

4
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
View file

@ -50,6 +50,8 @@ import android.widget.Toast;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.operations.OnRemoteOperationListener;
@ -59,8 +61,6 @@ import com.owncloud.android.operations.RemoveFileOperation;
import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
import com.owncloud.android.ui.fragment.FileFragment;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import eu.alefzero.webdav.WebdavUtils;

5
src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
View file

@ -22,6 +22,9 @@ import java.util.Map;
import java.util.Set;
import java.util.Vector;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.ui.fragment.FileFragment;
import android.accounts.Account;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
@ -29,8 +32,6 @@ import android.support.v4.app.FragmentStatePagerAdapter;
import android.view.ViewGroup;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.ui.fragment.FileFragment;
/**
* Adapter class that provides Fragment instances

4
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
View file

@ -52,6 +52,8 @@ import android.widget.VideoView;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.media.MediaControlView;
@ -66,8 +68,6 @@ import com.owncloud.android.ui.activity.FileDisplayActivity;
import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
import com.owncloud.android.ui.fragment.FileFragment;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import eu.alefzero.webdav.WebdavUtils;
/**

18
src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
View file

@ -17,6 +17,15 @@
package com.owncloud.android.ui.preview;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.media.MediaService;
import com.owncloud.android.ui.activity.FileActivity;
import android.accounts.Account;
import android.app.AlertDialog;
import android.content.DialogInterface;
@ -30,15 +39,6 @@ import android.os.Bundle;
import android.widget.MediaController;
import android.widget.VideoView;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.media.MediaService;
import com.owncloud.android.ui.activity.FileActivity;
/**
* Activity implementing a basic video player.
*

7
src/com/owncloud/android/utils/FileStorageUtils.java
View file

@ -19,15 +19,16 @@ package com.owncloud.android.utils;
import java.io.File;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import android.annotation.SuppressLint;
import android.content.Context;
import android.net.Uri;
import android.os.Environment;
import android.os.StatFs;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
/**
* Static methods to help in access to local file system.

1
src/com/owncloud/android/widgets/ActionEditText.java
View file

@ -22,6 +22,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import com.owncloud.android.R;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Canvas;

1
src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
View file

@ -32,6 +32,7 @@ import org.apache.commons.httpclient.methods.RequestEntity;
import com.owncloud.android.Log_OC;
import com.owncloud.android.network.ProgressiveDataTransferer;
import eu.alefzero.webdav.OnDatatransferProgressListener;

1
src/eu/alefzero/webdav/FileRequestEntity.java
View file

@ -34,6 +34,7 @@ import org.apache.commons.httpclient.methods.RequestEntity;
import com.owncloud.android.Log_OC;
import com.owncloud.android.network.ProgressiveDataTransferer;
import eu.alefzero.webdav.OnDatatransferProgressListener;

3
src/eu/alefzero/webdav/WebdavClient.java
View file

@ -43,10 +43,11 @@ import org.apache.http.params.CoreProtocolPNames;
import com.owncloud.android.Log_OC;
import com.owncloud.android.MainApp;
import com.owncloud.android.network.BearerAuthScheme;
import com.owncloud.android.network.BearerCredentials;
import android.net.Uri;
public class WebdavClient extends HttpClient {

1
src/eu/alefzero/webdav/WebdavEntry.java
View file

@ -25,6 +25,7 @@ import org.apache.jackrabbit.webdav.property.DavPropertySet;
import com.owncloud.android.Log_OC;
import android.net.Uri;
public class WebdavEntry {

7
tests/.classpath
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry combineaccessrules="false" kind="src" path="/owncloud-android"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

10
tests/AndroidManifest.xml
View file

@ -11,11 +11,11 @@
<uses-library android:name="android.test.runner" />
</application>
<!--
This declares that this application uses the instrumentation test runner targeting
the package of com.owncloud.android.test. To run the tests use the command:
"adb shell am instrument -w com.owncloud.android.tests/android.test.InstrumentationTestRunner"
This declares that this application uses the instrumentation test runner targeting
the package of com.owncloud.android.test. To run the tests use the command:
"adb shell am instrument -w com.owncloud.android.tests/android.test.InstrumentationTestRunner"
-->
<instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="com.owncloud.android"
android:label="Tests for com.owncloud.android"/>
android:targetPackage="com.owncloud.android"
android:label="Tests for com.owncloud.android"/>
</manifest>

30
tests/src/com/owncloud/android/test/AccountUtilsTest.java
View file

@ -34,21 +34,21 @@ public class AccountUtilsTest extends AndroidTestCase {
OwnCloudVersion ocv45 = new OwnCloudVersion(0x040500);
OwnCloudVersion ocv70 = new OwnCloudVersion(0x070000);
assertTrue(AccountUtils.getWebdavPath(ocv12, false).equals("/webdav/owncloud.php"));
assertTrue(AccountUtils.getWebdavPath(ocv12s, false).equals("/webdav/owncloud.php"));
assertTrue(AccountUtils.getWebdavPath(ocv22, false).equals("/files/webdav.php"));
assertTrue(AccountUtils.getWebdavPath(ocv30,false).equals("/files/webdav.php"));
assertTrue(AccountUtils.getWebdavPath(ocv33s, false).equals("/files/webdav.php"));
assertTrue(AccountUtils.getWebdavPath(ocv45, false).equals("/remote.php/webdav"));
assertTrue(AccountUtils.getWebdavPath(ocv70, false).equals("/remote.php/webdav"));
assertNull(AccountUtils.getWebdavPath(null, false));
assertTrue(AccountUtils.getWebdavPath(ocv12, true).equals("/remote.php/odav"));
assertTrue(AccountUtils.getWebdavPath(ocv12s, true).equals("/remote.php/odav"));
assertTrue(AccountUtils.getWebdavPath(ocv22, true).equals("/remote.php/odav"));
assertTrue(AccountUtils.getWebdavPath(ocv30, true).equals("/remote.php/odav"));
assertTrue(AccountUtils.getWebdavPath(ocv33s, true).equals("/remote.php/odav"));
assertTrue(AccountUtils.getWebdavPath(ocv45, true).equals("/remote.php/odav"));
assertTrue(AccountUtils.getWebdavPath(ocv70, true).equals("/remote.php/odav"));
assertTrue(AccountUtils.getWebdavPath(ocv12, false, false).equals("/webdav/owncloud.php"));
assertTrue(AccountUtils.getWebdavPath(ocv12s, false, false).equals("/webdav/owncloud.php"));
assertTrue(AccountUtils.getWebdavPath(ocv22, false, false).equals("/files/webdav.php"));
assertTrue(AccountUtils.getWebdavPath(ocv30,false, false).equals("/files/webdav.php"));
assertTrue(AccountUtils.getWebdavPath(ocv33s, false, false).equals("/files/webdav.php"));
assertTrue(AccountUtils.getWebdavPath(ocv45, false, false).equals("/remote.php/webdav"));
assertTrue(AccountUtils.getWebdavPath(ocv70, false, false).equals("/remote.php/webdav"));
assertNull(AccountUtils.getWebdavPath(null, false, false));
assertTrue(AccountUtils.getWebdavPath(ocv12, true, false).equals("/remote.php/odav"));
assertTrue(AccountUtils.getWebdavPath(ocv12s, true, false).equals("/remote.php/odav"));
assertTrue(AccountUtils.getWebdavPath(ocv22, true, false).equals("/remote.php/odav"));
assertTrue(AccountUtils.getWebdavPath(ocv30, true, false).equals("/remote.php/odav"));
assertTrue(AccountUtils.getWebdavPath(ocv33s, true, false).equals("/remote.php/odav"));
assertTrue(AccountUtils.getWebdavPath(ocv45, true, false).equals("/remote.php/odav"));
assertTrue(AccountUtils.getWebdavPath(ocv70, true, false).equals("/remote.php/odav"));
OwnCloudVersion invalidVer = new OwnCloudVersion("a.b.c");
assertFalse(invalidVer.isVersionValid());

3
tests/src/com/owncloud/android/test/FileContentProviderTest.java
View file

@ -2,7 +2,6 @@ package com.owncloud.android.test;
import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
import com.owncloud.android.providers.FileContentProvider;
import android.annotation.TargetApi;
import android.net.Uri;
import android.os.Build;
@ -24,7 +23,7 @@ public class FileContentProviderTest extends ProviderTestCase2<FileContentProvid
}
public FileContentProviderTest() {
super(FileContentProvider.class, "com.owncloud.android.providers.FileContentProvider");
super(FileContentProvider.class, "com.owncloud.android.providers.FileContentProvider");
}
@Override