fix standardnotes 3.9.4

This commit is contained in:
proletarius101 2021-12-11 02:19:55 +00:00 committed by linsui
parent 60f234a40c
commit cbd94ae65d
2 changed files with 96 additions and 6 deletions

View file

@ -1990,23 +1990,22 @@ Builds:
- versionName: 3.9.4
versionCode: 3000312
disbale: Failed to apply patch
commit: 3.9.4
subdir: android/app/
sudo:
- sysctl fs.inotify.max_user_watches=524288
- curl -Lo node.tar.gz https://nodejs.org/dist/v14.16.0/node-v14.16.0-linux-x64.tar.gz
- echo "7212031d7468718d7c8f5e1766380daaabe09d54611675338e7a88a97c3e31b6 node.tar.gz"
- curl -Lo node.tar.gz https://nodejs.org/download/release/v14.18.2/node-v14.18.2-linux-x64.tar.gz
- echo "83fa18a0e3642235446b66653eb27c169224ae9c1a15a32d6c3d9ddefb154ed4 node.tar.gz"
| sha256sum -c -
- tar xf node.tar.gz
- cp -a node-v14.16.0-linux-x64/. /usr/local/
- cp -a node-v*-linux-x64/. /usr/local/
- npm -g install yarn
init:
- cd ../..
- yarn cache clean snjs
- npm_config_build_from_source=true yarn --force
patch:
- bugsnag-3.6.24.patch
- bugsnag-3.9.4.patch
gradle:
- prod
srclibs:
@ -2019,7 +2018,6 @@ Builds:
- sed -i -e "s/versionName appVersionName/versionName \"$$VERSION$$\"/" -e "s/versionCode
appVersionCode/versionCode $$VERCODE$$/" build.gradle
- sed -i -e "/appVersionName/d" -e "/appVersionCode/d" build.gradle
- sed -i -e "/@bugsnag\/react-native/d" -e "/bugsnag-sourcemaps/d" ../../package.json
scanignore:
- android/build.gradle
- node_modules/hermes-engine

View file

@ -0,0 +1,92 @@
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 49f4765..12c93c6 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -254,4 +254,3 @@ task copyDownloadableDepsToLibs(type: Copy) {
}
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-apply from: "../../node_modules/@bugsnag/react-native/bugsnag-react-native.gradle"
diff --git a/android/app/src/main/java/com/standardnotes/MainActivity.java b/android/app/src/main/java/com/standardnotes/MainActivity.java
index a3577f8..1cf968d 100644
--- a/android/app/src/main/java/com/standardnotes/MainActivity.java
+++ b/android/app/src/main/java/com/standardnotes/MainActivity.java
@@ -27,7 +27,7 @@ public class MainActivity extends ReactActivity {
String packageName = this.getContext().getPackageName();
Bundle props = new Bundle();
SharedPreferences settings = this.getContext().getSharedPreferences("react-native", Context.MODE_PRIVATE);
- String bugsnagOptOut = settings.getString("bugsnagoptout", "true");
+ String bugsnagOptOut = "true";
props.putBoolean("bugsnagOptOut", bugsnagOptOut.equals("true"));
if (packageName.equals("com.standardnotes.dev")) {
props.putString("env", "dev");
diff --git a/android/app/src/main/java/com/standardnotes/MainApplication.java b/android/app/src/main/java/com/standardnotes/MainApplication.java
index 69c4085..bff7fc2 100644
--- a/android/app/src/main/java/com/standardnotes/MainApplication.java
+++ b/android/app/src/main/java/com/standardnotes/MainApplication.java
@@ -5,8 +5,6 @@ import android.app.Activity;
import android.content.Context;
import android.webkit.WebView;
-import com.bugsnag.android.BreadcrumbType;
-import com.bugsnag.android.Configuration;
import com.facebook.react.PackageList;
import com.facebook.react.ReactApplication;
import com.facebook.react.ReactInstanceManager;
@@ -19,7 +17,6 @@ import java.lang.reflect.InvocationTargetException;
import java.util.HashSet;
import java.util.List;
-import com.bugsnag.android.Bugsnag;
import com.facebook.react.modules.network.OkHttpClientProvider;
import android.annotation.SuppressLint;
@@ -74,23 +71,8 @@ public class MainApplication extends Application implements ReactApplication {
rebuildOkHtttp();
- Configuration config = Configuration.load(this);
- config.setEnabledBreadcrumbTypes(new HashSet<BreadcrumbType>() {{
- add(BreadcrumbType.NAVIGATION);
- add(BreadcrumbType.STATE);
- add(BreadcrumbType.PROCESS);
- add(BreadcrumbType.MANUAL);
- add(BreadcrumbType.USER);
- add(BreadcrumbType.LOG);
- add(BreadcrumbType.ERROR);
- }});
-
SharedPreferences settings = getApplicationContext().getSharedPreferences("react-native", Context.MODE_PRIVATE);
- String bugsnagOptOut = settings.getString("bugsnagoptout", "true");
-
- if (!bugsnagOptOut.equals("true")) {
- Bugsnag.start(this, config);
- }
+ String bugsnagOptOut = "true";
SoLoader.init(this, /* native exopackage */ false);
diff --git a/src/lib/interface.ts b/src/lib/interface.ts
index 7d20717..44f5950 100644
--- a/src/lib/interface.ts
+++ b/src/lib/interface.ts
@@ -288,18 +288,7 @@ export class MobileDeviceInterface extends DeviceInterface {
}
async getBugsnagOptedOut() {
- try {
- /**
- * Checking the absense of the 'bugsnagoptout' preference.
- * If the value is absent, then error reporting is opt-in by default.
- */
- const bugsnagOptedOut =
- (await DefaultPreference.get(BUGSNAG_OPT_OUT_KEY)) ?? 'true';
-
- return bugsnagOptedOut === 'true';
- } catch {
- return true;
- }
+ return true;
}
setBusgnagOptedOut(optedOut: true | false) {