Merge branch 'master' into lintWarnings

scripts/lint/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 3 errors and 616 warnings</span>
+<span class="mdl-layout-title">Lint Report: 1 error and 632 warnings</span>

scripts/lint/lint-up.rb

@@ -1,6 +1,9 @@
 ## Script from https://github.com/tir38/android-lint-entropy-reducer at 07.05.2017
 # adapts to drone, use git username / token as parameter
 
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
 puts "=================== starting Android Lint Entropy Reducer ===================="
 
 # get args
@@ -73,17 +76,23 @@ lint_report = String.new(lint_reports[0])
 # find error/warning count string in HTML report
 error_warning_string = ""
 File.open lint_report do |file|
-  error_warning_string = file.find { |line| line =~ /[0-9]* errors and [0-9]* warnings/ }
+  error_warning_string = file.find { |line| line =~ /([0-9]* error[s]? and )?[0-9]* warning[s]?/ }
 end
 
 # find number of errors
-error_string = error_warning_string.match(/[0-9]* errors/)[0]
-current_error_count = error_string.match(/[0-9]*/)[0].to_i
+error_string = error_warning_string.match(/[0-9]* error[s]?/)
+
+if (error_string.nil?)
+    current_error_count = 0
+else
+    current_error_count = error_string[0].match(/[0-9]*/)[0].to_i
+end
+
 puts "found errors: " + current_error_count.to_s
 
 # find number of warnings
 if CHECK_WARNINGS == true
-    warning_string = error_warning_string.match(/[0-9]* warnings/)[0]
+    warning_string = error_warning_string.match(/[0-9]* warning[s]?/)[0]
     current_warning_count = warning_string.match(/[0-9]*/)[0].to_i
     puts "found warnings: " + current_warning_count.to_s
 end
@@ -102,18 +111,18 @@ else
 
     previous_error_warning_string = ""
     File.open previous_lint_report do |file|
-      previous_error_warning_string = file.find { |line| line =~ /[0-9]* errors and [0-9]* warnings/ }
+      previous_error_warning_string = file.find { |line| line =~ /([0-9]* error[s]? and )?[0-9]* warning[s]?/ }
     end
 
     unless previous_error_warning_string.nil?
         previous_results = true
 
-        previous_error_string = previous_error_warning_string.match(/[0-9]* errors/)[0]
+        previous_error_string = previous_error_warning_string.match(/[0-9]* error[s]?/)[0]
         previous_error_count = previous_error_string.match(/[0-9]*/)[0].to_i
         puts "previous errors: " + previous_error_count.to_s
 
         if CHECK_WARNINGS == true
-            previous_warning_string = previous_error_warning_string.match(/[0-9]* warnings/)[0]
+            previous_warning_string = previous_error_warning_string.match(/[0-9]* warning[s]?/)[0]
             previous_warning_count = previous_warning_string.match(/[0-9]*/)[0].to_i
             puts "previous warnings: " + previous_warning_count.to_s
         end

src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -486,7 +486,7 @@ public class FileDisplayActivity extends HookActivity
             if (file.isDown() && PreviewMediaFragment.canBePreviewed(file)) {
                 int startPlaybackPosition = getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0);
                 boolean autoplay = getIntent().getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true);
-                secondFragment = new PreviewMediaFragment(file, getAccount(), startPlaybackPosition, autoplay);
+                secondFragment = PreviewMediaFragment.newInstance(file, getAccount(), startPlaybackPosition, autoplay);
             } else if (file.isDown() && PreviewTextFragment.canBePreviewed(file)) {
                 secondFragment = null;
             } else {
@@ -1996,8 +1996,7 @@ public class FileDisplayActivity extends HookActivity
      *                              interactions.
      */
     public void startMediaPreview(OCFile file, int startPlaybackPosition, boolean autoplay) {
-        Fragment mediaFragment = new PreviewMediaFragment(file, getAccount(), startPlaybackPosition,
-                autoplay);
+        Fragment mediaFragment = PreviewMediaFragment.newInstance(file, getAccount(), startPlaybackPosition, autoplay);
         setSecondFragment(mediaFragment);
         updateFragmentsVisibility(true);
         updateActionBarTitleAndHomeButton(file);

src/main/java/com/owncloud/android/ui/fragment/FileFragment.java

@@ -22,6 +22,8 @@ package com.owncloud.android.ui.fragment;
 
 import android.accounts.Account;
 import android.app.Activity;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 
 import com.owncloud.android.datamodel.OCFile;
@@ -29,6 +31,8 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 
+import static com.owncloud.android.ui.activity.FileActivity.EXTRA_FILE;
+
 
 /**
  * Common methods for {@link Fragment}s containing {@link OCFile}s
@@ -49,14 +53,28 @@ public class FileFragment extends Fragment {
     public FileFragment() {
         mFile = null;
     }
-    
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Bundle bundle = getArguments();
+        setFile((OCFile) bundle.getParcelable(EXTRA_FILE));
+    }
+
     /**
      * Creates an instance for a given {@OCFile}.
      * 
      * @param file
      */
-    public FileFragment(OCFile file) {
-        mFile = file;
+    public static FileFragment newInstance(OCFile file) {
+        FileFragment fileFragment = new FileFragment();
+        Bundle bundle = new Bundle();
+
+        bundle.putParcelable(EXTRA_FILE, file);
+        fileFragment.setArguments(bundle);
+
+        return fileFragment;
     }
 
     /**
@@ -111,7 +129,7 @@ public class FileFragment extends Fragment {
          * 
          * @param file      File to show details
          */
-        public void showDetails(OCFile file);
+        void showDetails(OCFile file);
 
         
         ///// TO UNIFY IN A SINGLE CALLBACK METHOD - EVENT NOTIFICATIONs  -> something happened
@@ -122,7 +140,7 @@ public class FileFragment extends Fragment {
          *  
          * @param folder
          */
-        public void onBrowsedDownTo(OCFile folder);                 
+        void onBrowsedDownTo(OCFile folder);
 
         /**
          * Callback method invoked when a the 'transfer state' of a file changes.
@@ -141,7 +159,7 @@ public class FileFragment extends Fragment {
          * @param downloading   Flag signaling if the file is now downloading.
          * @param uploading     Flag signaling if the file is now uploading.
          */
-        public void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading);
+        void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading);
 
     }
 

src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java

@@ -1,4 +1,4 @@
-/**
+/*
  *   ownCloud Android client application
  *
  *   @author David A. Velasco
@@ -113,6 +113,11 @@ public class PreviewMediaFragment extends FileFragment implements
 
     private static final String SCREEN_NAME = "Audio/Video Preview";
 
+    private static final String FILE = "FILE";
+    private static final String ACCOUNT = "ACCOUNT";
+    private static final String PLAYBACK_POSITION = "PLAYBACK_POSITION";
+    private static final String AUTOPLAY = "AUTOPLAY";
+
     /**
      * Creates a fragment to preview a file.
      * <p/>
@@ -121,16 +126,19 @@ public class PreviewMediaFragment extends FileFragment implements
      * @param fileToDetail An {@link OCFile} to preview in the fragment
      * @param ocAccount    An ownCloud account; needed to start downloads
      */
-    public PreviewMediaFragment(
-            OCFile fileToDetail,
-            Account ocAccount,
-            int startPlaybackPosition,
-            boolean autoplay) {
+    public static PreviewMediaFragment newInstance(OCFile fileToDetail, Account ocAccount, int startPlaybackPosition,
+                                                   boolean autoplay) {
+        PreviewMediaFragment previewMediaFragment = new PreviewMediaFragment();
+
+        Bundle bundle = new Bundle();
+        bundle.putParcelable(FILE, fileToDetail);
+        bundle.putParcelable(ACCOUNT, ocAccount);
+        bundle.putInt(PLAYBACK_POSITION, startPlaybackPosition);
+        bundle.putBoolean(AUTOPLAY, autoplay);
 
-        super(fileToDetail);
-        mAccount = ocAccount;
-        mSavedPlaybackPosition = startPlaybackPosition;
-        mAutoplay = autoplay;
+        previewMediaFragment.setArguments(bundle);
+
+        return previewMediaFragment;
     }
 
     /**
@@ -157,6 +165,13 @@ public class PreviewMediaFragment extends FileFragment implements
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+
+        Bundle bundle = getArguments();
+
+        setFile((OCFile) bundle.getParcelable(FILE));
+        mAccount = bundle.getParcelable(ACCOUNT);
+        mSavedPlaybackPosition = bundle.getInt(PLAYBACK_POSITION);
+        mAutoplay = bundle.getBoolean(AUTOPLAY);
     }
 
 

src/main/res/layout/participate_layout.xml

@@ -101,7 +101,8 @@
                         android:background="@color/white"
                         android:onClick="onGetRCPlayStoreClick"
                         android:padding="@dimen/zero"
-                        android:src="@drawable/playstore"/>
+                        android:src="@drawable/playstore"
+                        android:contentDescription="@string/participate_rc_play_store"/>
 
                     <ImageButton
                         android:id="@+id/participate_release_candidate_fdroid"
@@ -110,7 +111,8 @@
                         android:background="@color/white"
                         android:onClick="onGetRCFDroidClick"
                         android:padding="@dimen/zero"
-                        android:src="@drawable/fdroid"/>
+                        android:src="@drawable/fdroid"
+                        android:contentDescription="@string/participate_rc_fdroid"/>
 
                 </LinearLayout>
 
@@ -139,7 +141,8 @@
                     android:background="@color/white"
                     android:onClick="onGetBetaFDroidClick"
                     android:padding="@dimen/zero"
-                    android:src="@drawable/fdroid"/>
+                    android:src="@drawable/fdroid"
+                    android:contentDescription="@string/participate_dev_fdroid"/>
 
                 <ImageButton
                     android:id="@+id/participate_beta_apk"
@@ -148,7 +151,8 @@
                     android:background="@color/white"
                     android:onClick="onGetBetaApkClick"
                     android:padding="@dimen/zero"
-                    android:src="@drawable/apk"/>
+                    android:src="@drawable/apk"
+                    android:contentDescription="@string/participate_dev_direct_download"/>
 
                 </LinearLayout>
 

src/main/res/values/strings.xml

@@ -577,6 +577,10 @@
     <string name="participate_contribute_translate_link" translatable="false">&lt;font color=\"%1$s\">&lt;a href=\"%2$s\">%3$s&lt;/a>&lt;/font></string>
     <string name="participate_contribute_github_text">Review, amend and write code, see %1$s for details</string>
     <string name="participate_contribute_github_text_link" translatable="false">&lt;font color=\"%1$s\">&lt;a href=\"%2$s\">CONTRIBUTING.md&lt;/a>&lt;/font></string>
+    <string name="participate_rc_play_store">Get release candidate via Google Play store</string>
+    <string name="participate_rc_fdroid">Get release candidate via f-droid app store</string>
+    <string name="participate_dev_fdroid">Get development release via f-droid app store</string>
+    <string name="participate_dev_direct_download">Get development release via direct download</string>
     <string name="move_to">Move to&#8230;</string>
     <string name="copy_to">Copy to&#8230;</string>
     <string name="choose_remote_folder">Choose remote folder&#8230;</string>