From e7710e7383b344994b03d0c47916d771cdc282d9 Mon Sep 17 00:00:00 2001 From: masensio Date: Fri, 19 Jun 2015 15:11:49 +0200 Subject: [PATCH] Update string subject_token and update library reference --- owncloud-android-library | 2 +- res/values/strings.xml | 2 +- src/com/owncloud/android/operations/CreateShareOperation.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/owncloud-android-library b/owncloud-android-library index 344d5b22..a22b1da1 160000 --- a/owncloud-android-library +++ b/owncloud-android-library @@ -1 +1 @@ -Subproject commit 344d5b22e43021ebc54f18ad7d17b1702dfa406c +Subproject commit a22b1da16b16a759d260d950fcd246d8527fbf00 diff --git a/res/values/strings.xml b/res/values/strings.xml index f5ea7bcb..af79535a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -343,7 +343,7 @@ shared with you - %1$s %2$s >>%3$s<< %4$s + %1$s shared \"%2$s\" with you Refresh connection Server address diff --git a/src/com/owncloud/android/operations/CreateShareOperation.java b/src/com/owncloud/android/operations/CreateShareOperation.java index 63f7493e..7cdcc083 100644 --- a/src/com/owncloud/android/operations/CreateShareOperation.java +++ b/src/com/owncloud/android/operations/CreateShareOperation.java @@ -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); -- 2.11.0