be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev' into rotate

This commit is contained in:
Christian Schabesberger 2019-07-21 15:12:41 +02:00 committed by GitHub
parent 8059ac89d3 3a6c22da5c
commit 7a44061fa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -57,7 +57,7 @@ dependencies {
exclude module: 'support-annotations' exclude module: 'support-annotations'
}) })
implementation 'com.github.TeamNewPipe:NewPipeExtractor:c64c90a' implementation 'com.github.TeamNewPipe:NewPipeExtractor:4488c217659d2'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.23.0' testImplementation 'org.mockito:mockito-core:2.23.0'

13
app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java
View File

@ -14,6 +14,7 @@ import android.os.AsyncTask;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationManagerCompat; import android.support.v4.app.NotificationManagerCompat;
import android.util.Log;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
@ -47,6 +48,8 @@ import okhttp3.Response;
*/ */
public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> { 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 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 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"; private static final String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json";
@ -90,9 +93,8 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
Response response = client.newCall(request).execute(); Response response = client.newCall(request).execute();
return response.body().string(); return response.body().string();
} catch (IOException ex) { } catch (IOException ex) {
ErrorActivity.reportError(app, ex, null, null, // connectivity problems, do not alarm user and fail silently
ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none", if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex));
"app update API fail", R.string.app_ui_crash));
} }
return null; return null;
@ -117,9 +119,8 @@ public class CheckForNewAppVersionTask extends AsyncTask<Void, Void, String> {
compareAppVersionAndShowNotification(versionName, apkLocationUrl, versionCode); compareAppVersionAndShowNotification(versionName, apkLocationUrl, versionCode);
} catch (JSONException ex) { } catch (JSONException ex) {
ErrorActivity.reportError(app, ex, null, null, // connectivity problems, do not alarm user and fail silently
ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none", if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex));
"could not parse app update JSON data", R.string.app_ui_crash));
} }
} }
} }