diff --git a/app/src/main/java/com/besome/sketch/design/DesignActivity.java b/app/src/main/java/com/besome/sketch/design/DesignActivity.java index eaf71b8..1b09166 100644 --- a/app/src/main/java/com/besome/sketch/design/DesignActivity.java +++ b/app/src/main/java/com/besome/sketch/design/DesignActivity.java @@ -63,7 +63,7 @@ import com.google.android.material.progressindicator.LinearProgressIndicator; import com.google.android.material.snackbar.Snackbar; import com.google.android.material.tabs.TabLayout; -import com.google.firebase.crashlytics.FirebaseCrashlytics; +import pro.sketchware.utility.telemetry.SafeCrashlytics; import com.topjohnwu.superuser.Shell; import java.io.File; @@ -129,7 +129,7 @@ public class DesignActivity extends BaseAppCompatActivity implements View.OnClickListener { public static String sc_id; private final Handler handler = new Handler(Looper.getMainLooper()); - private final FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); + private final SafeCrashlytics crashlytics = SafeCrashlytics.get(); private ImageView xmlLayoutOrientation; private boolean B; private int currentTabNumber; diff --git a/app/src/main/java/com/besome/sketch/editor/LogicEditorActivity.java b/app/src/main/java/com/besome/sketch/editor/LogicEditorActivity.java index d104bbe..437a330 100644 --- a/app/src/main/java/com/besome/sketch/editor/LogicEditorActivity.java +++ b/app/src/main/java/com/besome/sketch/editor/LogicEditorActivity.java @@ -71,7 +71,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; -import com.google.firebase.crashlytics.FirebaseCrashlytics; +import pro.sketchware.utility.telemetry.SafeCrashlytics; import java.io.File; import java.lang.ref.WeakReference; @@ -136,7 +136,7 @@ public class LogicEditorActivity extends BaseAppCompatActivity implements View.O private final Handler handler = new Handler(); private final int[] v = new int[2]; - private final FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); + private final SafeCrashlytics crashlytics = SafeCrashlytics.get(); public ProjectFileBean M; public PaletteBlock m; public BlockPane o; diff --git a/app/src/main/java/com/besome/sketch/editor/view/ViewPane.java b/app/src/main/java/com/besome/sketch/editor/view/ViewPane.java index a3b9816..b02f9d9 100644 --- a/app/src/main/java/com/besome/sketch/editor/view/ViewPane.java +++ b/app/src/main/java/com/besome/sketch/editor/view/ViewPane.java @@ -64,7 +64,7 @@ import com.besome.sketch.editor.view.item.ItemWebView; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.tabs.TabLayout; -import com.google.firebase.crashlytics.FirebaseCrashlytics; +import pro.sketchware.utility.telemetry.SafeCrashlytics; import java.io.File; import java.util.ArrayList; @@ -117,7 +117,7 @@ public class ViewPane extends RelativeLayout { private final String stringsStart = "@string/"; - private final FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); + private final SafeCrashlytics crashlytics = SafeCrashlytics.get(); private Context context; private ViewGroup rootLayout; private int b = 99; diff --git a/app/src/main/java/pro/sketchware/utility/telemetry/SafeCrashlytics.java b/app/src/main/java/pro/sketchware/utility/telemetry/SafeCrashlytics.java new file mode 100644 index 0000000..65bd3cf --- /dev/null +++ b/app/src/main/java/pro/sketchware/utility/telemetry/SafeCrashlytics.java @@ -0,0 +1,85 @@ +package pro.sketchware.utility.telemetry; + +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.google.firebase.FirebaseApp; +import com.google.firebase.crashlytics.FirebaseCrashlytics; + +/** + * Null-safe wrapper around {@link FirebaseCrashlytics}. + * + *
Sketchware Pro is built without a {@code google-services.json}, so the + * Firebase content provider that auto-initializes the default {@code FirebaseApp} + * never runs. Calls to {@code FirebaseCrashlytics.getInstance()} therefore throw + * {@link IllegalStateException} the first time they are evaluated. Several + * activities held that instance in a {@code private final} field which is + * initialized in the constructor — before {@code onCreate} — meaning + * the activity could not even be instantiated, which produced + * "Unable to instantiate activity" crashes (see Phase 1 r1 bug report). + * + *
This wrapper resolves the {@code FirebaseCrashlytics} instance lazily and
+ * silently no-ops every call when Firebase is unavailable, so the host app stays
+ * functional. When telemetry is wanted in the future, callers do not need to
+ * change — the wrapper will start delegating as soon as a
+ * {@code FirebaseApp} exists.
+ */
+public final class SafeCrashlytics {
+
+ private static final String TAG = "SafeCrashlytics";
+ private static final SafeCrashlytics INSTANCE = new SafeCrashlytics();
+
+ @Nullable
+ private final FirebaseCrashlytics delegate;
+
+ private SafeCrashlytics() {
+ this.delegate = resolveDelegate();
+ }
+
+ @Nullable
+ private static FirebaseCrashlytics resolveDelegate() {
+ try {
+ // Touch the default FirebaseApp first to surface
+ // IllegalStateException locally rather than from getInstance().
+ FirebaseApp.getInstance();
+ return FirebaseCrashlytics.getInstance();
+ } catch (IllegalStateException notInitialized) {
+ Log.i(TAG, "FirebaseApp not initialized; crashlytics disabled.");
+ return null;
+ } catch (Throwable other) {
+ Log.w(TAG, "Failed to obtain FirebaseCrashlytics; crashlytics disabled.", other);
+ return null;
+ }
+ }
+
+ @NonNull
+ public static SafeCrashlytics get() {
+ return INSTANCE;
+ }
+
+ public boolean isEnabled() {
+ return delegate != null;
+ }
+
+ public void log(@NonNull String message) {
+ if (delegate != null) {
+ try {
+ delegate.log(message);
+ } catch (Throwable ignored) {
+ // Never let telemetry plumbing escalate into a user-facing crash.
+ }
+ }
+ }
+
+ public void recordException(@NonNull Throwable throwable) {
+ if (delegate != null) {
+ try {
+ delegate.recordException(throwable);
+ } catch (Throwable ignored) {
+ // Same rationale as log(): keep telemetry best-effort.
+ }
+ }
+ }
+}
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 198bb97..51870d8 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -118,4 +118,75 @@