From 542ae0e7f5fee0263ec2196debc0a17982aa20fb Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 16 Oct 2023 12:07:44 +0200 Subject: [PATCH 1/5] remove dependabot workflows --- .github/dependabot-copy-my-content.yml | 22 ----------------- .github/dependabot.yml | 34 -------------------------- 2 files changed, 56 deletions(-) delete mode 100644 .github/dependabot-copy-my-content.yml delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot-copy-my-content.yml b/.github/dependabot-copy-my-content.yml deleted file mode 100644 index 21973179b..000000000 --- a/.github/dependabot-copy-my-content.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: 2 -updates: -- package-ecosystem: github-actions - directory: "/" - schedule: - interval: daily - time: '04:00' - open-pull-requests-limit: 10 -- package-ecosystem: gradle - directory: "/" - schedule: - interval: daily - time: '04:00' - ignore: - - dependency-name: "com.squareup.okhttp3:okhttp" - versions: ["3.13.+", "3.14.+", "4.+"] - - dependency-name: "com.mikepenz:iconics-core" - versions: ["5.+"] - - dependency-name: "com.mikepenz:iconics-views" - versions: ["5.+"] - open-pull-requests-limit: 10 - diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 388ae58ad..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,34 +0,0 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates - -version: 2 -updates: -- package-ecosystem: github-actions - directory: "/" - schedule: - interval: daily - time: '04:00' - open-pull-requests-limit: 10 -- package-ecosystem: gradle - directory: "/" - schedule: - interval: daily - time: '04:00' - ignore: # we neeed to ignore these updates while we still support API 16 - - dependency-name: "com.squareup.okhttp3:okhttp" - versions: ">= 3.13" - - dependency-name: "com.squareup.okhttp3:mockwebserver" - versions: ">= 3.13" - - dependency-name: "com.mikepenz:iconics-core" - versions: ">= 5" - - dependency-name: "com.mikepenz:iconics-views" - versions: ">= 5" - - dependency-name: 'com.github.zawadz88.materialpopupmenu:material-popup-menu' - versions: ">= 3.5" - - dependency-name: 'com.squareup.picasso:picasso' - versions: "2.71828" - - dependency-name: 'jp.wasabeef:picasso-transformations' - versions: ">= 2.4" - From 2c8a64732ded7d09c7d373cd09e10cb48d5384f5 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 16 Oct 2023 12:24:55 +0200 Subject: [PATCH 2/5] try fix tests --- app/src/main/AndroidManifest.xml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ce05f59cf..d68ab5a16 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -76,14 +76,16 @@ - Date: Mon, 16 Oct 2023 12:43:44 +0200 Subject: [PATCH 3/5] fix building 1 --- .../net/programmierecke/radiodroid2/StationSaveManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/net/programmierecke/radiodroid2/StationSaveManager.java b/app/src/main/java/net/programmierecke/radiodroid2/StationSaveManager.java index 28bede760..651c5eca7 100644 --- a/app/src/main/java/net/programmierecke/radiodroid2/StationSaveManager.java +++ b/app/src/main/java/net/programmierecke/radiodroid2/StationSaveManager.java @@ -514,7 +514,6 @@ public boolean SaveM3UWriter(Writer bw) { List LoadM3UInternal(String filePath, String fileName) { try { File f = new File(filePath, fileName); - ArraySet loadedItems = null; FileReader fr = new FileReader(f); return LoadM3UReader(fr); } catch (Exception e) { @@ -530,6 +529,7 @@ List LoadM3UReader(Reader reader) { final RadioDroidApp radioDroidApp = (RadioDroidApp) context.getApplicationContext(); final OkHttpClient httpClient = radioDroidApp.getHttpClient(); ArrayList listUuids = new ArrayList(); + ArraySet loadedItems = null; BufferedReader br = new BufferedReader(reader); while ((line = br.readLine()) != null) { From 17cb72b1f6c054467c64c4380b5372c1979486fc Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 16 Oct 2023 12:47:34 +0200 Subject: [PATCH 4/5] fix building 2 --- .../programmierecke/radiodroid2/recording/RecordingsAdapter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/net/programmierecke/radiodroid2/recording/RecordingsAdapter.java b/app/src/main/java/net/programmierecke/radiodroid2/recording/RecordingsAdapter.java index 90b323009..952c04222 100644 --- a/app/src/main/java/net/programmierecke/radiodroid2/recording/RecordingsAdapter.java +++ b/app/src/main/java/net/programmierecke/radiodroid2/recording/RecordingsAdapter.java @@ -1,5 +1,6 @@ package net.programmierecke.radiodroid2.recording; +import android.app.ProgressDialog; import android.content.ClipData; import android.content.Context; import android.content.Intent; From eacf0a0cf02ade548cd9ffd9ae4a4c5f37ea98a8 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 16 Oct 2023 13:03:55 +0200 Subject: [PATCH 5/5] fix tests 2 --- app/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d68ab5a16..f6bb7bbcb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -73,6 +73,7 @@ android:permission="android.permission.BIND_JOB_SERVICE"> +