From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 9 Nov 2015 09:53:14 +0000 (+0100)
Subject: Merge branch 'beta' of https://github.com/owncloud/android into beta
X-Git-Tag: beta-20151122~19^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/038eab1cf77d798df2dd53d544a0e13713beff47?hp=989c3379798a744100fadb82d9fbfa3ecf8ff6e4

Merge branch 'beta' of https://github.com/owncloud/android into beta
---

diff --git a/apks/latest b/apks/latest
index 57d5957c..563100ef 100644
--- a/apks/latest
+++ b/apks/latest
@@ -1 +1 @@
-20151105
+20151109
diff --git a/apks/owncloud-beta-20151109.apk b/apks/owncloud-beta-20151109.apk
new file mode 100644
index 00000000..e7704725
Binary files /dev/null and b/apks/owncloud-beta-20151109.apk differ
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index da8b7bac..b4f46f98 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -44,15 +44,6 @@
 							android:title="@string/prefs_instant_upload_path_title"
 							android:key="instant_upload_path" />
 	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-			android:key="instant_uploading"
-	        android:title="@string/prefs_instant_upload"
-	        android:summary="@string/prefs_instant_upload_summary"/>
-		<com.owncloud.android.ui.PreferenceWithLongSummary
-			android:dependency="instant_uploading"
-			android:disableDependentsState="true"
-			android:title="@string/prefs_instant_upload_path_title"
-			android:key="instant_upload_path" />
-	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
 			android:dependency="instant_uploading"
 			android:disableDependentsState="true"
 	        android:title="@string/instant_upload_on_wifi"
@@ -83,17 +74,6 @@
 			android:title="@string/instant_video_upload_on_charging"
 			android:key="instant_video_upload_on_charging"/>
 	</PreferenceCategory>
-	
-	<PreferenceCategory android:title="@string/prefs_category_more" android:key="more">
-		<!-- DISABLED FOR RELEASE UNTIL FIXED
-	    CheckBoxPreference android:key="log_to_file"
-	                        android:title="@string/prefs_log_title"
-	                        android:summary="@string/prefs_log_summary"/>
-		<Preference 		android:key="log_history"
-	                        android:title="@string/prefs_log_title_history"
-	                        android:summary="@string/prefs_log_summary_history"/ -->
-                        
-    </PreferenceCategory>
 
 	<PreferenceCategory android:title="@string/common_category" android:key="common_category">
 		<EditTextPreference android:title="@string/pref_cache_size"
@@ -102,6 +82,13 @@
 	</PreferenceCategory>
 
 	<PreferenceCategory android:title="@string/prefs_category_more" android:key="more">
+		<!-- DISABLED FOR RELEASE UNTIL FIXED
+	    CheckBoxPreference android:key="log_to_file"
+	                        android:title="@string/prefs_log_title"
+	                        android:summary="@string/prefs_log_summary"/>
+		<Preference 		android:key="log_history"
+	                        android:title="@string/prefs_log_title_history"
+	                        android:summary="@string/prefs_log_summary_history"/ -->
     <Preference android:title="@string/prefs_help" android:key="help" />
     <Preference android:title="@string/prefs_recommend" android:key="recommend" />
     <Preference android:title="@string/prefs_feedback" android:key="feedback" />
diff --git a/src/com/owncloud/android/files/FileMenuFilter.java b/src/com/owncloud/android/files/FileMenuFilter.java
index 917f9365..e6638ba0 100644
--- a/src/com/owncloud/android/files/FileMenuFilter.java
+++ b/src/com/owncloud/android/files/FileMenuFilter.java
@@ -244,6 +244,13 @@ public class FileMenuFilter {
             toHide.add(R.id.action_stream_file);
         }
 
+        // SET PICTURE AS
+        if (mFile == null || !mFile.isImage()){
+            toHide.add(R.id.action_set_as_wallpaper);
+        } else {
+            toShow.add(R.id.action_set_as_wallpaper);
+        }
+
     }
 
 }
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 0a224141..7b85fe6c 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -463,7 +463,7 @@ public class Preferences extends PreferenceActivity
        pAboutApp = (Preference) findPreference("about_app");
        if (pAboutApp != null) { 
                pAboutApp.setTitle(String.format(getString(R.string.about_android), getString(R.string.app_name)));
-               pAboutApp.setSummary(String.format(getString(R.string.about_version), appVersion));
+               pAboutApp.setSummary(String.format(getString(R.string.about_version), BuildConfig.VERSION_CODE));
        }
 
        loadInstantUploadPath();
@@ -889,7 +889,7 @@ public class Preferences extends PreferenceActivity
         SharedPreferences appPrefs =
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         mUploadVideoPath = appPrefs.getString("instant_video_upload_path", getString(R.string.instant_upload_path));
-//        mPrefInstantVideoUploadPath.setSummary(mUploadVideoPath);
+        mPrefInstantVideoUploadPath.setSummary(mUploadVideoPath);
     }
 
     /**
diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 2f59be46..8bda4634 100644
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -562,6 +562,10 @@ public class OCFileListFragment extends ExtendedListFragment {
                     mContainerActivity.getFileOperationsHelper().shareFileWithLink(mTargetFile);
                     return true;
                 }
+                case R.id.action_share_with_users: {
+                    mContainerActivity.getFileOperationsHelper().showShareFile(mTargetFile);
+                    return true;
+                }
                 case R.id.action_open_file_with: {
                     mContainerActivity.getFileOperationsHelper().openFile(mTargetFile);
                     return true;