mirror of
https://github.com/nextcloud/android.git
synced 2024-11-23 21:55:48 +03:00
Merge branch 'master' into develop
This commit is contained in:
commit
c9a68d67e9
10 changed files with 77 additions and 67 deletions
|
@ -3,7 +3,7 @@
|
|||
ownCloud Android client application
|
||||
|
||||
Copyright (C) 2012 Bartek Przybylski
|
||||
Copyright (C) 2012-2013 ownCloud Inc.
|
||||
Copyright (C) 2012-2014 ownCloud Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License version 2,
|
||||
|
@ -18,8 +18,8 @@
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<manifest package="com.owncloud.android"
|
||||
android:versionCode="105004"
|
||||
android:versionName="1.5.4" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
android:versionCode="105005"
|
||||
android:versionName="1.5.5" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
||||
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.owncloud.android.workaround.accounts"
|
||||
android:versionCode="0100013"
|
||||
android:versionName="1.0.13" >
|
||||
android:versionCode="0100014"
|
||||
android:versionName="1.0.14" >
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="16"
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 865 B |
Binary file not shown.
Before Width: | Height: | Size: 805 B After Width: | Height: | Size: 694 B |
Binary file not shown.
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.2 KiB |
|
@ -26,13 +26,12 @@
|
|||
android:background="@color/background_color"
|
||||
android:gravity="center_horizontal"
|
||||
-->
|
||||
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/top"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:background="@color/background_color"
|
||||
android:background="#000000"
|
||||
tools:context=".ui.fragment.PreviewImageFragment" >
|
||||
|
||||
<ProgressBar
|
||||
|
|
|
@ -166,7 +166,7 @@
|
|||
<string name="auth_connecting_auth_server">Connecting to authentication server…</string>
|
||||
<string name="auth_unsupported_auth_method">The server does not support this authentication method</string>
|
||||
<string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>
|
||||
<string name="auth_fail_get_user_name">Your server is not returning a correct user id, contact with your admin please</string>
|
||||
<string name="auth_fail_get_user_name">Your server is not returning a correct user id, please contact an administrator</string>
|
||||
<string name="auth_can_not_auth_against_server">Can not authenticate against this server</string>
|
||||
|
||||
<string name="fd_keep_in_sync">Keep file up to date</string>
|
||||
|
|
|
@ -849,6 +849,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
|
|||
}
|
||||
}
|
||||
|
||||
errorBuilder.setContentText(content);
|
||||
mNotificationManager.notify(R.string.uploader_upload_failed_ticker, errorBuilder.build());
|
||||
}
|
||||
|
||||
|
|
|
@ -95,9 +95,11 @@ public class DetectAuthenticationMethodOperation extends RemoteOperation {
|
|||
|
||||
// try to access the root folder, following redirections but not SAML SSO redirections
|
||||
result = operation.execute(client);
|
||||
while (result.isTemporalRedirection() && !result.isIdPRedirection()) {
|
||||
String redirectedLocation = result.getRedirectedLocation();
|
||||
while (redirectedLocation != null && redirectedLocation.length() > 0 && !result.isIdPRedirection()) {
|
||||
client.setWebdavUri(Uri.parse(result.getRedirectedLocation()));
|
||||
result = operation.execute(client);
|
||||
redirectedLocation = result.getRedirectedLocation();
|
||||
}
|
||||
|
||||
// analyze response
|
||||
|
|
|
@ -19,6 +19,8 @@
|
|||
package com.owncloud.android.ui.activity;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.InvalidClassException;
|
||||
|
||||
import android.accounts.Account;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
|
@ -908,6 +910,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
*/
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
try {
|
||||
String event = intent.getAction();
|
||||
Log_OC.d(TAG, "Received broadcast " + event);
|
||||
String accountName = intent.getStringExtra(FileSyncAdapter.EXTRA_ACCOUNT_NAME);
|
||||
|
@ -974,6 +977,11 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
|
|||
mLastSslUntrustedServerResult = synchResult;
|
||||
}
|
||||
}
|
||||
} catch (RuntimeException e) {
|
||||
// avoid app crashes after changing the serial id of RemoteOperationResult
|
||||
// in owncloud library with broadcast notifications pending to process
|
||||
removeStickyBroadcast(intent);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue