From e599de038a6ae3dbcd0dae6e6b9433efc459559a Mon Sep 17 00:00:00 2001 From: Redirion Date: Tue, 25 Jun 2019 11:49:59 +0200 Subject: [PATCH 1/9] Silence CheckForNewAppVersionTask Closes #2421 --- .../java/org/schabi/newpipe/CheckForNewAppVersionTask.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java index 6a6d1b9c2..9285820e8 100644 --- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java +++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java @@ -90,9 +90,7 @@ public class CheckForNewAppVersionTask extends AsyncTask { Response response = client.newCall(request).execute(); return response.body().string(); } catch (IOException ex) { - ErrorActivity.reportError(app, ex, null, null, - ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none", - "app update API fail", R.string.app_ui_crash)); + // connectivity problems, do not alarm user and fail silently } return null; From 00074517350d13fff3108ba4d2683dc92fa9f3e4 Mon Sep 17 00:00:00 2001 From: Redirion Date: Tue, 25 Jun 2019 13:22:40 +0200 Subject: [PATCH 2/9] Update CheckForNewAppVersionTask.java --- .../java/org/schabi/newpipe/CheckForNewAppVersionTask.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java index 9285820e8..08c4ca90a 100644 --- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java +++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java @@ -47,6 +47,7 @@ import okhttp3.Response; */ public class CheckForNewAppVersionTask extends AsyncTask { + private static final boolean DEBUG = MainActivity.DEBUG; private static final Application app = App.getApp(); private static final String GITHUB_APK_SHA1 = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15"; private static final String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json"; @@ -91,6 +92,7 @@ public class CheckForNewAppVersionTask extends AsyncTask { return response.body().string(); } catch (IOException ex) { // connectivity problems, do not alarm user and fail silently + if (DEBUG) ex.printStackTrace(); } return null; @@ -115,9 +117,8 @@ public class CheckForNewAppVersionTask extends AsyncTask { compareAppVersionAndShowNotification(versionName, apkLocationUrl, versionCode); } catch (JSONException ex) { - ErrorActivity.reportError(app, ex, null, null, - ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none", - "could not parse app update JSON data", R.string.app_ui_crash)); + // connectivity problems, do not alarm user and fail silently + if (DEBUG) ex.printStackTrace(); } } } From 05ef926a7f6bf046c19e945fa2d6e72227a2c671 Mon Sep 17 00:00:00 2001 From: Redirion Date: Tue, 25 Jun 2019 13:31:26 +0200 Subject: [PATCH 3/9] Update CheckForNewAppVersionTask.java --- .../java/org/schabi/newpipe/CheckForNewAppVersionTask.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java index 08c4ca90a..642cf8910 100644 --- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java +++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java @@ -48,6 +48,7 @@ import okhttp3.Response; public class CheckForNewAppVersionTask extends AsyncTask { private static final boolean DEBUG = MainActivity.DEBUG; + private static final String TAG = CheckForNewAppVersionTask.class.getSimpleName(); private static final Application app = App.getApp(); private static final String GITHUB_APK_SHA1 = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15"; private static final String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json"; @@ -92,7 +93,7 @@ public class CheckForNewAppVersionTask extends AsyncTask { return response.body().string(); } catch (IOException ex) { // connectivity problems, do not alarm user and fail silently - if (DEBUG) ex.printStackTrace(); + if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex)); } return null; @@ -118,7 +119,7 @@ public class CheckForNewAppVersionTask extends AsyncTask { } catch (JSONException ex) { // connectivity problems, do not alarm user and fail silently - if (DEBUG) ex.printStackTrace(); + if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex)); } } } From 6a4bb6e3e106e3f7c6d336bfa402b39274d8411f Mon Sep 17 00:00:00 2001 From: Redirion Date: Tue, 25 Jun 2019 13:39:47 +0200 Subject: [PATCH 4/9] Update CheckForNewAppVersionTask.java --- .../main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java index 642cf8910..09c44cad4 100644 --- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java +++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java @@ -94,6 +94,7 @@ public class CheckForNewAppVersionTask extends AsyncTask { } catch (IOException ex) { // connectivity problems, do not alarm user and fail silently if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex)); + Toast.makeText(app, R.string.error_connect_host, Toast.LENGTH_SHORT).show(); } return null; @@ -120,6 +121,7 @@ public class CheckForNewAppVersionTask extends AsyncTask { } catch (JSONException ex) { // connectivity problems, do not alarm user and fail silently if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex)); + Toast.makeText(app, R.string.error_connect_host, Toast.LENGTH_SHORT).show(); } } } From c4ef40f4dc65ca26c5b3fb99283b4839ab52db3d Mon Sep 17 00:00:00 2001 From: Redirion Date: Tue, 25 Jun 2019 13:41:08 +0200 Subject: [PATCH 5/9] Removed tabs --- .../org/schabi/newpipe/CheckForNewAppVersionTask.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java index 09c44cad4..12bf0d778 100644 --- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java +++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java @@ -93,8 +93,8 @@ public class CheckForNewAppVersionTask extends AsyncTask { return response.body().string(); } catch (IOException ex) { // connectivity problems, do not alarm user and fail silently - if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex)); - Toast.makeText(app, R.string.error_connect_host, Toast.LENGTH_SHORT).show(); + if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex)); + Toast.makeText(app, R.string.error_connect_host, Toast.LENGTH_SHORT).show(); } return null; @@ -120,8 +120,8 @@ public class CheckForNewAppVersionTask extends AsyncTask { } catch (JSONException ex) { // connectivity problems, do not alarm user and fail silently - if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex)); - Toast.makeText(app, R.string.error_connect_host, Toast.LENGTH_SHORT).show(); + if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex)); + Toast.makeText(app, R.string.error_connect_host, Toast.LENGTH_SHORT).show(); } } } From 80b49751887d429b179d101df452950751ec7a9b Mon Sep 17 00:00:00 2001 From: Redirion Date: Tue, 25 Jun 2019 13:47:16 +0200 Subject: [PATCH 6/9] Update CheckForNewAppVersionTask.java --- .../main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java index 12bf0d778..bcc6525f9 100644 --- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java +++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java @@ -14,6 +14,7 @@ import android.os.AsyncTask; import android.preference.PreferenceManager; import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationManagerCompat; +import android.util.Log; import org.json.JSONException; import org.json.JSONObject; From 37a9e98ebc8bd433217d0d92b7bcef0ce1c57431 Mon Sep 17 00:00:00 2001 From: Redirion Date: Tue, 25 Jun 2019 13:53:23 +0200 Subject: [PATCH 7/9] Update CheckForNewAppVersionTask.java --- .../main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java index bcc6525f9..13d399a1c 100644 --- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java +++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java @@ -15,6 +15,7 @@ import android.preference.PreferenceManager; import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationManagerCompat; import android.util.Log; +import android.widget.Toast; import org.json.JSONException; import org.json.JSONObject; From fc8746e077ded1bd5ae08602fb5816ffbbc09edf Mon Sep 17 00:00:00 2001 From: Redirion Date: Wed, 26 Jun 2019 18:37:04 +0200 Subject: [PATCH 8/9] Update CheckForNewAppVersionTask.java --- .../java/org/schabi/newpipe/CheckForNewAppVersionTask.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java index 13d399a1c..87ffcb05d 100644 --- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java +++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java @@ -15,7 +15,6 @@ import android.preference.PreferenceManager; import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationManagerCompat; import android.util.Log; -import android.widget.Toast; import org.json.JSONException; import org.json.JSONObject; @@ -96,7 +95,6 @@ public class CheckForNewAppVersionTask extends AsyncTask { } catch (IOException ex) { // connectivity problems, do not alarm user and fail silently if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex)); - Toast.makeText(app, R.string.error_connect_host, Toast.LENGTH_SHORT).show(); } return null; @@ -123,7 +121,6 @@ public class CheckForNewAppVersionTask extends AsyncTask { } catch (JSONException ex) { // connectivity problems, do not alarm user and fail silently if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex)); - Toast.makeText(app, R.string.error_connect_host, Toast.LENGTH_SHORT).show(); } } } From 3a6c22da5c7c46b4b49fcafc5acfa0060ae8c9ca Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Sun, 21 Jul 2019 15:08:17 +0200 Subject: [PATCH 9/9] update to latest dev extractor --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 820e02570..a5153e1c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,7 @@ dependencies { exclude module: 'support-annotations' }) - implementation 'com.github.TeamNewPipe:NewPipeExtractor:c64c90a' + implementation 'com.github.TeamNewPipe:NewPipeExtractor:4488c217659d2' testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.23.0'