Merge pull request #1969 from owncloud/release_2.4.0

Release 2.4.0

Author: davigonz

AndroidManifest.xml

@@ -18,8 +18,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android"
-    android:versionCode="20300000"
-    android:versionName="2.3.0">
+    android:versionCode="20400000"
+    android:versionName="2.4.0">
 
     <uses-sdk
         android:minSdkVersion="14"

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 2.4.0 (May 2017)
+- Video streaming
+- Multiple public links per file (OC X required)
+- Share with custom groups (OC X required)
+- Share plain text
+- UI improvements:
+	- Section file count in uploads view
+	- Edit dialog margin
+- Bugs fixed, including:
+	- Interrupted uploads and downloads due to Doze in Android 6 and 7
+	- App is minimized with drawer button in tablets
+
 ## 2.3.0 (March 2017)
 - Included privacy policy.
 - Error messages improvement.

oc_jb_workaround/AndroidManifest.xml

@@ -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="0100034"
-    android:versionName="1.0.34" >
+    android:versionCode="0100035"
+    android:versionName="1.0.35" >
 
     <uses-sdk
         android:minSdkVersion="16"

owncloud-android-library

@@ -59,6 +59,10 @@ protected void onCreate(Bundle savedInstanceState) {
         WebView webview = (WebView) findViewById(R.id.privacyPolicyWebview);
         webview.getSettings().setJavaScriptEnabled(true);
 
+        // next two settings grant that non-responsive webs are zoomed out when loaded
+        webview.getSettings().setUseWideViewPort(true);
+        webview.getSettings().setLoadWithOverviewMode(true);
+
         //Enable zoom but hide display zoom controls
         webview.getSettings().setBuiltInZoomControls(true);
         webview.getSettings().setDisplayZoomControls(false);

src/com/owncloud/android/ui/activity/PrivacyPolicyActivity.java

@@ -79,6 +79,8 @@ public class ShareFileFragment extends Fragment
     private static final String TAG = ShareFileFragment.class.getSimpleName();
     private static final String DEFAULT_NAME_SUFFIX = " (%1$d)";
 
+    private static final String QUOTE_START = "\\Q";
+    private static final String QUOTE_END = "\\E";
     private static final String DEFAULT_NAME_REGEX_SUFFIX = " \\((\\d+)\\)\\z";
     // matches suffix (end of the string with \z) in the form "(X)", where X is an integer of any length;
     // also captures the number to reference it later during the match;
@@ -260,7 +262,7 @@ private String getAvailableDefaultPublicName() {
 
         String defaultName = getString(R.string.share_via_link_default_name_template,
                 mFile.getFileName());
-        String defaultNameNumberedRegex = defaultName + DEFAULT_NAME_REGEX_SUFFIX;
+        String defaultNameNumberedRegex = QUOTE_START + defaultName + QUOTE_END + DEFAULT_NAME_REGEX_SUFFIX;
 
         // Array with numbers already set in public link names
         ArrayList<Integer> usedNumbers = new ArrayList<>();

src/com/owncloud/android/ui/fragment/ShareFileFragment.java

@@ -167,8 +167,8 @@ public void onActivityCreated(Bundle savedInstanceState) {
         Log_OC.v(TAG, "onActivityCreated");
 
         OCFile file;
+        Bundle args = getArguments();
         if (savedInstanceState == null) {
-            Bundle args = getArguments();
             file = args.getParcelable(PreviewAudioFragment.EXTRA_FILE);
             setFile(file);
             mAccount = args.getParcelable(PreviewAudioFragment.EXTRA_ACCOUNT);
@@ -179,8 +179,14 @@ public void onActivityCreated(Bundle savedInstanceState) {
             file = savedInstanceState.getParcelable(PreviewAudioFragment.EXTRA_FILE);
             setFile(file);
             mAccount = savedInstanceState.getParcelable(PreviewAudioFragment.EXTRA_ACCOUNT);
-            mSavedPlaybackPosition = savedInstanceState.getInt(PreviewAudioFragment.EXTRA_PLAY_POSITION);
-            mAutoplay = savedInstanceState.getBoolean(PreviewAudioFragment.EXTRA_PLAYING);
+            mSavedPlaybackPosition = savedInstanceState.getInt(
+                PreviewAudioFragment.EXTRA_PLAY_POSITION,
+                args.getInt(PreviewAudioFragment.EXTRA_PLAY_POSITION)
+            );
+            mAutoplay = savedInstanceState.getBoolean(
+                PreviewAudioFragment.EXTRA_PLAYING,
+                args.getBoolean(PreviewAudioFragment.EXTRA_PLAYING)
+            );
         }
 
         if (file == null) {
@@ -234,8 +240,10 @@ public void onSaveInstanceState(Bundle outState) {
 
         outState.putParcelable(PreviewAudioFragment.EXTRA_FILE, getFile());
         outState.putParcelable(PreviewAudioFragment.EXTRA_ACCOUNT, mAccount);
-        outState.putInt(PreviewAudioFragment.EXTRA_PLAY_POSITION, mMediaServiceBinder.getCurrentPosition());
-        outState.putBoolean(PreviewAudioFragment.EXTRA_PLAYING, mMediaServiceBinder.isPlaying());
+        if (mMediaServiceBinder != null) {
+            outState.putInt(PreviewAudioFragment.EXTRA_PLAY_POSITION, mMediaServiceBinder.getCurrentPosition());
+            outState.putBoolean(PreviewAudioFragment.EXTRA_PLAYING, mMediaServiceBinder.isPlaying());
+        }
     }