mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1052 from owncloud/change_subject_when_sharing_in_saml

Browse source 
change the subject when sharing in saml
This commit is contained in:
masensio 2015-08-06 11:00:59 +02:00
commit 419dbeabec
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
owncloud-android-library

@ -1 +1 @@
Subproject commit 3b9777c5b67b63792ffb86e9da6c12d3264b4f59
Subproject commit c8f6e5ad57ee27fdac39c7b14eb6ab1942a92d49

1
res/values/strings.xml
View file

@ -341,6 +341,7 @@
<string name="with_you_subject_header">with you</string>
<string name="subject_token">%1$s shared \"%2$s\" with you</string>
<string name="saml_subject_token">\"%1$s\" has been shared with you</string>
<string name="auth_refresh_button">Refresh connection</string>
<string name="auth_host_address">Server address</string>

13
src/com/owncloud/android/operations/CreateShareOperation.java
View file

@ -161,9 +161,16 @@ public class CreateShareOperation extends SyncOperation {
OCFile file = getStorageManager().getFileByPath(mPath);
if (file!=null) {
mSendIntent.putExtra(Intent.EXTRA_TEXT, share.getShareLink());
mSendIntent.putExtra(Intent.EXTRA_SUBJECT,
String.format(mContext.getString(R.string.subject_token),
getClient().getCredentials().getUsername(), file.getFileName()));
if (getClient().getCredentials().getUsername() == null) {
//in saml is null
mSendIntent.putExtra(Intent.EXTRA_SUBJECT,
String.format(mContext.getString(R.string.saml_subject_token),
file.getFileName()));
} else {
mSendIntent.putExtra(Intent.EXTRA_SUBJECT,
String.format(mContext.getString(R.string.subject_token),
getClient().getCredentials().getUsername(), file.getFileName()));
}
file.setPublicLink(share.getShareLink());
file.setShareByLink(true);
getStorageManager().saveFile(file);

3
src/com/owncloud/android/services/OperationsService.java
View file

@ -457,7 +457,8 @@ public class OperationsService extends Service {
// TODO refactor to run GetUserName as AsyncTask in the context of
// AuthenticatorActivity
credentials = OwnCloudCredentialsFactory.newSamlSsoCredentials(
mLastTarget.mCookie); // SAML SSO
null, // unknown
mLastTarget.mCookie); // SAML SSO
}
OwnCloudAccount ocAccount = new OwnCloudAccount(
mLastTarget.mServerUrl, credentials);