Merge remote-tracking branch 'origin/master' into dev

2024-12-19 15:33:00 +03:00 · 2023-01-10 02:33:41 +01:00 · 2023-01-10 02:33:41 +01:00 · 48219a5b7b
commit 48219a5b7b
parent 19ec061fe3 1049ff3367
14 changed files with 78 additions and 125 deletions
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@ -42,7 +42,7 @@ jobs:

      # Upload the results as artifacts (optional).
      - name: "Upload artifact"
-        uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v2.3.1
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v2.3.1
        with:
          name: SARIF file
          path: results.sarif
--- a/.github/workflows/screenShotTest.yml
+++ b/.github/workflows/screenShotTest.yml
@ -21,14 +21,14 @@ jobs:
            -   uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3

            -   name: Gradle cache
-                uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3
+                uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
                with:
                    path: |
                        ~/.gradle/caches
                        ~/.gradle/wrapper
                    key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
            -   name: AVD cache
-                uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3
+                uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
                id: avd-cache
                with:
                    path: |
@ -84,7 +84,7 @@ jobs:
                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                run: scripts/uploadReport.sh "${{ secrets.LOG_USERNAME }}" "${{ secrets.LOG_PASSWORD }}" ${{github.event.number}} "${{ matrix.color }}-${{ matrix.scheme }}" "Screenshot" ${{github.event.number}}
            -   name: Archive Espresso results
-                uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb
+                uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
                if: ${{ always() }}
                with:
                    name: Report-${{ matrix.color }}-${{ matrix.scheme }}
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@ -42,7 +42,7 @@ jobs:
                    fail_ci_if_error: true
            -   name: Upload jacoco artifacts
                if: ${{ failure() }}
-                uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb
+                uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
                with:
                    name: test-results
                    path: app/build/reports/tests/testGplayDebugUnitTest/
--- a/app/build.gradle
+++ b/app/build.gradle
@ -254,7 +254,7 @@ dependencies {
    implementation 'com.googlecode.ez-vcard:ez-vcard:0.11.3'
    implementation 'org.lukhnos:nnio:0.2'
    implementation 'org.bouncycastle:bcpkix-jdk15to18:1.72'
-    implementation 'com.google.code.gson:gson:2.10'
+    implementation 'com.google.code.gson:gson:2.10.1'
    implementation 'com.github.nextcloud-deps:sectioned-recyclerview:0.6.1'
    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.25'
@ -327,7 +327,7 @@ dependencies {

    // dependencies for instrumented tests
    // JUnit4 Rules
-    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
    androidTestImplementation "androidx.test:rules:$androidxTestVersion"
    // Android JUnit Runner
    androidTestImplementation "androidx.test:runner:$androidxTestVersion"
--- a/app/src/main/java/com/owncloud/android/media/MediaControlView.java
+++ b/app/src/main/java/com/owncloud/android/media/MediaControlView.java
@ -30,16 +30,14 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
+import android.widget.LinearLayout;
 import android.widget.MediaController.MediaPlayerControl;
-import android.widget.ProgressBar;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
-import android.widget.TextView;

 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
+import com.owncloud.android.databinding.MediaControlBinding;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.utils.theme.ViewThemeUtils;

@ -56,19 +54,13 @@ import javax.inject.Inject;
 * <p>
 * It synchronizes itself with the state of the {@link MediaPlayer}.
 */
-public class MediaControlView extends FrameLayout implements OnClickListener, OnSeekBarChangeListener {
+public class MediaControlView extends LinearLayout implements OnClickListener, OnSeekBarChangeListener {
    private static final String TAG = MediaControlView.class.getSimpleName();
    private static final int SHOW_PROGRESS = 1;

    private MediaPlayerControl playerControl;
-    private final View root;
-    private ProgressBar progressBar;
-    private TextView endTime;
-    private TextView currentTime;
+    private final MediaControlBinding binding;
    private boolean isDragging;
-    private ImageButton pauseButton;
-    private ImageButton forwardButton;
-    private ImageButton rewindButton;

    @Inject
    ViewThemeUtils viewThemeUtils;
@ -80,14 +72,9 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On

        MainApp.getAppComponent().inject(this);

-        FrameLayout.LayoutParams frameParams = new FrameLayout.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.MATCH_PARENT
-        );
        LayoutInflater inflate = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        root = inflate.inflate(R.layout.media_control, null);
-        initControllerView(root);
-        addView(root, frameParams);
+        binding = MediaControlBinding.inflate(inflate, this, true);
+        initControllerView();

        setFocusable(true);
        setFocusableInTouchMode(true);
@ -103,7 +90,7 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
    public void setMediaPlayer(MediaPlayerControl player) {
        playerControl = player;
        handler.sendEmptyMessage(SHOW_PROGRESS);
-        handler.postDelayed(()-> {
+        handler.postDelayed(() -> {
            updatePausePlay();
            setProgress();
        }, 100);
@ -113,37 +100,17 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
        handler.removeMessages(SHOW_PROGRESS);
    }

-    private void initControllerView(View v) {
-        pauseButton = v.findViewById(R.id.playBtn);
-        if (pauseButton != null) {
-            pauseButton.requestFocus();
-            pauseButton.setOnClickListener(this);
-        }
+    private void initControllerView() {
+        binding.playBtn.requestFocus();
+        binding.playBtn.setOnClickListener(this);

-        forwardButton = v.findViewById(R.id.forwardBtn);
-        if (forwardButton != null) {
-            forwardButton.setOnClickListener(this);
-        }
+        binding.forwardBtn.setOnClickListener(this);

-        rewindButton = v.findViewById(R.id.rewindBtn);
-        if (rewindButton != null) {
-            rewindButton.setOnClickListener(this);
-        }
+        binding.rewindBtn.setOnClickListener(this);

-        progressBar = v.findViewById(R.id.progressBar);
-        if (progressBar != null) {
-            if (progressBar instanceof SeekBar) {
-                SeekBar seeker = (SeekBar) progressBar;
-                viewThemeUtils.platform.themeHorizontalSeekBar(seeker);
-                seeker.setOnSeekBarChangeListener(this);
-            } else {
-                viewThemeUtils.platform.themeHorizontalProgressBar(progressBar);
-            }
-            progressBar.setMax(1000);
-        }
-
-        endTime = v.findViewById(R.id.totalTimeText);
-        currentTime = v.findViewById(R.id.currentTimeText);
+        viewThemeUtils.platform.themeHorizontalSeekBar(binding.progressBar);
+        binding.progressBar.setOnSeekBarChangeListener(this);
+        binding.progressBar.setMax(1000);
    }

    /**
@ -152,15 +119,18 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
     */
    private void disableUnsupportedButtons() {
        try {
-            if (pauseButton != null && !playerControl.canPause()) {
-                pauseButton.setEnabled(false);
-            }
-            if (rewindButton != null && !playerControl.canSeekBackward()) {
-                rewindButton.setEnabled(false);
-            }
-            if (forwardButton != null && !playerControl.canSeekForward()) {
-                forwardButton.setEnabled(false);
+            if (binding != null) {
+                if (!playerControl.canPause()) {
+                    binding.playBtn.setEnabled(false);
+                }
+                if (!playerControl.canSeekBackward()) {
+                    binding.rewindBtn.setEnabled(false);
+                }
+                if (!playerControl.canSeekForward()) {
+                    binding.forwardBtn.setEnabled(false);
+                }
            }
+
        } catch (IncompatibleClassChangeError ex) {
            // We were given an old version of the interface, that doesn't have
            // the canPause/canSeekXYZ methods. This is OK, it just means we
@ -205,23 +175,20 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
        }
        int position = playerControl.getCurrentPosition();
        int duration = playerControl.getDuration();
-        if (progressBar != null) {
+        if (binding != null) {
            if (duration > 0) {
                // use long to avoid overflow
                long pos = 1000L * position / duration;
-                progressBar.setProgress((int) pos);
+                binding.progressBar.setProgress((int) pos);
            }
            int percent = playerControl.getBufferPercentage();
-            progressBar.setSecondaryProgress(percent * 10);
+            binding.progressBar.setSecondaryProgress(percent * 10);
+
+            String endTime = duration > 0 ? formatTime(duration) : "--:--";
+            binding.totalTimeText.setText(endTime);
+            binding.currentTimeText.setText(formatTime(position));
        }

-        if (endTime != null) {
-            String endTime = duration > 0 ? formatTime(duration) : "--:--";
-            this.endTime.setText(endTime);
-        }
-        if (currentTime != null) {
-            currentTime.setText(formatTime(position));
-        }
        return position;
    }

@ -236,8 +203,8 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
            if (uniqueDown) {
                doPauseResume();
                //show(sDefaultTimeout);
-                if (pauseButton != null) {
-                    pauseButton.requestFocus();
+                if (binding != null) {
+                    binding.playBtn.requestFocus();
                }
            }
            return true;
@ -260,28 +227,28 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
    }

    public void updatePausePlay() {
-        if (root == null || pauseButton == null) {
+        if (binding == null) {
            return;
        }

        if (playerControl.isPlaying()) {
-            pauseButton.setImageResource(android.R.drawable.ic_media_pause);
+            binding.playBtn.setImageResource(android.R.drawable.ic_media_pause);
        } else {
-            pauseButton.setImageResource(android.R.drawable.ic_media_play);
+            binding.playBtn.setImageResource(android.R.drawable.ic_media_play);
        }

        final boolean canSeekFfd = playerControl.canSeekForward();
        if (canSeekFfd) {
-            forwardButton.setVisibility(View.VISIBLE);
+            binding.forwardBtn.setVisibility(View.VISIBLE);
        } else {
-            forwardButton.setVisibility(View.INVISIBLE);
+            binding.forwardBtn.setVisibility(View.INVISIBLE);
        }

        final boolean canSeekBwd = playerControl.canSeekBackward();
        if (canSeekBwd) {
-            rewindButton.setVisibility(View.VISIBLE);
+            binding.rewindBtn.setVisibility(View.VISIBLE);
        } else {
-            rewindButton.setVisibility(View.INVISIBLE);
+            binding.rewindBtn.setVisibility(View.INVISIBLE);
        }
    }

@ -296,18 +263,13 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On

    @Override
    public void setEnabled(boolean enabled) {
-        if (pauseButton != null) {
-            pauseButton.setEnabled(enabled);
-        }
-        if (forwardButton != null) {
-            forwardButton.setEnabled(enabled);
-        }
-        if (rewindButton != null) {
-            rewindButton.setEnabled(enabled);
-        }
-        if (progressBar != null) {
-            progressBar.setEnabled(enabled);
+        if(binding!=null){
+            binding.playBtn.setEnabled(enabled);
+            binding.forwardBtn.setEnabled(enabled);
+            binding.rewindBtn.setEnabled(enabled);
+            binding.progressBar.setEnabled(enabled);
        }
+
        disableUnsupportedButtons();
        super.setEnabled(enabled);
    }
@ -350,9 +312,7 @@ public class MediaControlView extends FrameLayout implements OnClickListener, On
        long duration = playerControl.getDuration();
        long newPosition = (duration * progress) / 1000L;
        playerControl.seekTo((int) newPosition);
-        if (currentTime != null) {
-            currentTime.setText(formatTime((int) newPosition));
-        }
+        binding.currentTimeText.setText(formatTime((int) newPosition));
    }

    /**
--- a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@ -58,14 +58,13 @@ import android.widget.TextView;
 import android.widget.Toast;

 import com.google.android.material.button.MaterialButton;
-import com.google.android.material.textfield.TextInputEditText;
-import com.google.android.material.textfield.TextInputLayout;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.preferences.AppPreferences;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.databinding.ReceiveExternalFilesBinding;
+import com.owncloud.android.databinding.UploadFileDialogBinding;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.files.services.NameCollisionPolicy;
@ -363,8 +362,8 @@ public class ReceiveExternalFilesActivity extends FileActivity
                }
            }

-            LayoutInflater layout = getLayoutInflater();
-            View view = layout.inflate(R.layout.upload_file_dialog, null);
+            LayoutInflater inflater = getLayoutInflater();
+            final UploadFileDialogBinding binding = UploadFileDialogBinding.inflate(inflater);

            ArrayAdapter<String> adapter
                = new ArrayAdapter<>(requireContext(), android.R.layout.simple_spinner_item);
@ -420,21 +419,18 @@ public class ReceiveExternalFilesActivity extends FileActivity
                mFileCategory = CATEGORY_MAPS_URL;
            }

-            final TextInputEditText userInput = view.findViewById(R.id.user_input);
-            final TextInputLayout userInputContainer = view.findViewById(R.id.user_input_container);
-            setFilename(userInput, selectPos);
-            userInput.requestFocus();
-            viewThemeUtils.material.colorTextInputLayout(userInputContainer);
+            setFilename(binding.userInput, selectPos);
+            binding.userInput.requestFocus();
+            viewThemeUtils.material.colorTextInputLayout(binding.userInputContainer);

-            final Spinner spinner = view.findViewById(R.id.file_type);
-            setupSpinner(adapter, selectPos, userInput, spinner);
+            setupSpinner(adapter, selectPos, binding.userInput, binding.fileType);
            if (adapter.getCount() == SINGLE_SPINNER_ENTRY) {
-                view.findViewById(R.id.label_file_type).setVisibility(View.GONE);
-                spinner.setVisibility(View.GONE);
+                binding.labelFileType.setVisibility(View.GONE);
+                binding.fileType.setVisibility(View.GONE);
            }
-            mSpinner = spinner;
+            mSpinner = binding.fileType;

-            Dialog filenameDialog = createFilenameDialog(view, userInput, spinner);
+            Dialog filenameDialog = createFilenameDialog(binding.getRoot(), binding.userInput, binding.fileType);
            if (filenameDialog.getWindow() != null) {
                filenameDialog.getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_VISIBLE);
            }
--- a/app/src/main/java/com/owncloud/android/ui/adapter/UploaderAdapter.java
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/UploaderAdapter.java
@ -72,7 +72,7 @@ public class UploaderAdapter extends SimpleAdapter {
    public View getView(int position, View convertView, ViewGroup parent) {
        View vi = convertView;
        if (convertView == null) {
-            vi = inflater.inflate(R.layout.uploader_list_item_layout, null);
+            vi = inflater.inflate(R.layout.uploader_list_item_layout, parent, false);
        }

        HashMap<String, OCFile> data = (HashMap<String, OCFile>) getItem(position);
--- a/app/src/main/res/layout/contacts_preference.xml
+++ b/app/src/main/res/layout/contacts_preference.xml
@ -22,7 +22,6 @@
    android:id="@+id/drawer_layout"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:clickable="true"
    android:fitsSystemWindows="true">

    <!-- The main content view -->
--- a/app/src/main/res/layout/files.xml
+++ b/app/src/main/res/layout/files.xml
@ -19,11 +19,9 @@
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-
    android:id="@+id/drawer_layout"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:clickable="true"
    android:fitsSystemWindows="true">

    <androidx.coordinatorlayout.widget.CoordinatorLayout
--- a/app/src/main/res/layout/preview_image_activity.xml
+++ b/app/src/main/res/layout/preview_image_activity.xml
@ -20,8 +20,7 @@
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/drawer_layout"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clickable="true" >
+    android:layout_height="match_parent">

    <com.owncloud.android.ui.components.CustomViewPager
        android:id="@+id/fragmentPager"
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@ -35,7 +35,7 @@
    <string name="add_to_cloud">Gehitu %1$s</string>
    <string name="advanced_settings">Ezarpen aurreratuak</string>
    <string name="allow_resharing">Baimendu birpartekatzea</string>
-    <string name="app_widget_description">Paneleko widget bat erakusten du</string>
+    <string name="app_widget_description">Paneleko trepeta bat erakusten du</string>
    <string name="appbar_search_in">Bilatu %s(e)n</string>
    <string name="associated_account_not_found">Ez da aurkitu lotutako konturik</string>
    <string name="auth_access_failed">Huts egin du atzitzean: %1$s</string>
@ -396,8 +396,8 @@
    <string name="host_not_available">Zerbitzaria ez dago eskuragarri</string>
    <string name="host_your_own_server">Ostatatu zure zerbitzaria</string>
    <string name="icon_for_empty_list">Zerrenda hutsaren ikonoa</string>
-    <string name="icon_of_dashboard_widget">Paneleko widgetaren ikonoa</string>
-    <string name="icon_of_widget_entry">Widget-sarreraren ikonoa</string>
+    <string name="icon_of_dashboard_widget">Paneleko trepetaren ikonoa</string>
+    <string name="icon_of_widget_entry">Trepeta-sarreraren ikonoa</string>
    <string name="in_folder">%1$skarpetan</string>
    <string name="instant_upload_existing">Existitzen diren fitxategiak ere kargatu</string>
    <string name="instant_upload_on_charging">Igo bakarrik gailua kargatzean</string>
@ -435,7 +435,7 @@
    <string name="logs_status_loading">Kargatzen…</string>
    <string name="logs_status_not_filtered">Egunkariak: %1$d kB, iragazkirik ez</string>
    <string name="logs_title">Egunkariak</string>
-    <string name="maintenance_mode">Zerbitzaria mantentze-lanetan moduan dago</string>
+    <string name="maintenance_mode">Zerbitzaria mantentze moduan dago</string>
    <string name="manage_space_clear_data">Garbitu datuak</string>
    <string name="manage_space_description">%1$s(r)en ezarpenak, datu-basea eta zerbitzariaren ziurtagiriak betirako ezabatuko dira.\n\n Deskargatutako fitxategiak ez dira ukituko.\n\n Prozesu honek denbora behar du.</string>
    <string name="manage_space_title">Kudeatu lekua</string>
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@ -257,6 +257,7 @@
    <string name="error_comment_file">Napaka dodajanja opombe k datoteki</string>
    <string name="error_crash_title">Program %1$s se je sesul.</string>
    <string name="error_report_issue_action">Poročilo</string>
+    <string name="error_report_issue_text">Ali želite poslati poročilo na sledilnik (zahteva račun Github)?</string>
    <string name="error_retrieving_file">Pridobivanje datoteke je spodletelo</string>
    <string name="error_retrieving_templates">Napaka pridobivanja predlog</string>
    <string name="error_starting_direct_camera_upload">Napaka začenjanja kamere</string>
--- a/build.gradle
+++ b/build.gradle
@ -6,11 +6,11 @@ buildscript {
        daggerVersion = "2.44.2"
        markwonVersion = "4.6.2"
        prismVersion = "2.0.0"
-        androidLibraryVersion ="ee266a847ede30c8d232a9006afc77d696c902d4"
-        mockitoVersion = "4.10.0"
+        androidLibraryVersion = "master-SNAPSHOT"
+        mockitoVersion = "4.11.0"
        mockitoKotlinVersion = "4.1.0"
        mockkVersion = "1.13.3"
-        espressoVersion = "3.5.0"
+        espressoVersion = "3.5.1"
        workRuntime = "2.7.1"
        fidoVersion = "4.1.0-patch1"
        checkerVersion = "3.21.2"
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 82 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 76 warnings</span>