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

Merge pull request #1024 from owncloud/fix_shared_by_link_for_server_without_public_uploads

Browse source 
Fix shared by link for server without public uploads
This commit is contained in:
David A. Velasco 2015-06-22 14:53:47 +02:00
commit bdf2b58865
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
owncloud-android-library

@ -1 +1 @@
Subproject commit ff85ff2eef6d418de75ab587ad9b7489d868a22a
Subproject commit 8f87ad78f752fd44c419d1595482247cae5d056b

2
res/values/strings.xml
View file

@ -343,7 +343,7 @@
<string name="shared_subject_header">shared</string>
<string name="with_you_subject_header">with you</string>
<string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
<string name="subject_token">%1$s shared \"%2$s\" with you</string>
<string name="auth_refresh_button">Refresh connection</string>
<string name="auth_host_address">Server address</string>

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

@ -27,7 +27,6 @@ package com.owncloud.android.operations;
import android.content.Context;
import android.content.Intent;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
@ -162,7 +161,8 @@ 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),
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);