Merge branch 'dev' into rotate

TeamNewPipe · Jul 21, 2019 · 7a44061 · 7a44061
2 parents 8059ac8 + 3a6c22d
commit 7a44061
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git 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'

diff --git 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.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;
@@ -47,6 +48,8 @@
  */
 public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
 
+    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";
@@ -90,9 +93,8 @@ protected String doInBackground(Void... voids) {
             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
+            if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex));
         }
 
         return null;
@@ -117,9 +119,8 @@ protected void onPostExecute(String response) {
                 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) Log.w(TAG, Log.getStackTraceString(ex));
             }
         }
     }