From 0afcb6e8d14d6e5b1a9cfd4a0217ba9fd6ef25b7 Mon Sep 17 00:00:00 2001 From: Ahmed Abd_elhamed Date: Mon, 27 Apr 2026 14:44:38 +0000 Subject: [PATCH] fix(crash): wrap FirebaseCrashlytics in SafeCrashlytics to prevent crash without google-services.json DesignActivity, LogicEditorActivity, and ViewPane each held a FirebaseCrashlytics instance in a private final field initialized via FirebaseCrashlytics.getInstance(). Because Sketchware Pro is built without google-services.json, the default FirebaseApp is never auto-initialized, so getInstance() throws IllegalStateException. Field initializers run before onCreate, so the activity itself fails to instantiate -- on Ahmed's Samsung A05 (SDK 35) this surfaced as: Unable to instantiate activity ComponentInfo{pro.sketchware/ com.besome.sketch.design.DesignActivity}: java.lang.IllegalStateException: Default FirebaseApp is not initialized in this process pro.sketchware. Introduce pro.sketchware.utility.telemetry.SafeCrashlytics, a thin null-safe wrapper that resolves the FirebaseCrashlytics delegate lazily and silently no-ops every call when Firebase is unavailable. The wrapper will start delegating automatically as soon as a FirebaseApp exists, so re-enabling telemetry in the future is a single-line change with no call-site updates. Phase 2 follow-ups bundled in this commit: - expand Arabic strings to ~160 (settings, my-projects, theme presets, drawer extras, manage-export-url, common errors and search) - seed Indonesian translation (values-id/strings.xml, ~100 strings) - advertise 'id' in locales_config.xml so Android 13+ language picker exposes the new locale - update docs/CONTRIBUTING-i18n.md with the new shipping table Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- .../besome/sketch/design/DesignActivity.java | 4 +- .../sketch/editor/LogicEditorActivity.java | 4 +- .../besome/sketch/editor/view/ViewPane.java | 4 +- .../utility/telemetry/SafeCrashlytics.java | 85 ++++++++++++++ app/src/main/res/values-ar/strings.xml | 71 ++++++++++++ app/src/main/res/values-id/strings.xml | 109 ++++++++++++++++++ app/src/main/res/xml/locales_config.xml | 9 +- docs/CONTRIBUTING-i18n.md | 10 +- 8 files changed, 281 insertions(+), 15 deletions(-) create mode 100644 app/src/main/java/pro/sketchware/utility/telemetry/SafeCrashlytics.java create mode 100644 app/src/main/res/values-id/strings.xml 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 @@ متغيرات عناصر العرض نقل لسلة المحذوفات + + + المسابقات + مشاريعي + متجر المشاريع + الدروس + + + المظهر + تغيير مظهر التطبيق + سمة سكتشوير + إعدادات النظام + السمة الفاتحة + السمة الداكنة + مدير الأحداث + أحداث الشاشة + المستمعون + تفاصيل مدير الأحداث + مدير منتقي البلوكات + + + هل أنت متأكد من حذف هذا المشروع؟ + تخصيص الأيقونة + تصدير المشروع + تصدير الكود المصدري + إرسال الكود المصدري كملف Zip + توقيع الـ APK + كود مصدري لـ Android Studio + مسار محلي + توقيع الـ APK + مشروع جديد + حذف + إعدادات + + + إدارة الروابط المصدّرة + اسم التطبيق + منتهي الصلاحية + اسم الحزمة + تاريخ التسجيل + لا يوجد رابط مُصدَّر. + + + الشاشة غير موجودة + حدث خطأ! + فشل الاتصال بالخادم + فشل الحفظ + خطأ غير معروف! يرجى التواصل مع المسؤول + + + حذف الكل + هل تريد حذف كل الكلمات المفتاحية؟ + هل تريد حذف هذه الكلمة المفتاحية؟ + لا توجد كلمات مفتاحية حديثة لعرضها + الكلمات المفتاحية الحديثة + بحث المحتوى + حذف كلمة مفتاحية + لا توجد نتائج بحث للعرض. :( + نتائج البحث عن %s + + + قوالب السمة + اختر من السمات الجاهزة أو أنشئ سمة عشوائية + إنشاء عشوائي + تم إنشاء سمة عشوائية + + + احصل على دعوتي + افتح في Slack (يلزم دعوة) + تطبيقات أخرى لـ Sketchware + سكتشوير لـ Arduino diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml new file mode 100644 index 0000000..4842ff4 --- /dev/null +++ b/app/src/main/res/values-id/strings.xml @@ -0,0 +1,109 @@ + + + + + Sketchware Pro + + + Simpan + Aktivitas + Tambah + Setuju + Semua + Blok + Batal + Ubah + Pilih + Tutup + Koleksi + Komponen + Lanjutkan + Salin + Buat + Hapus + Terhapus! + Abaikan + Deskripsi + Detail + Unduh + Edit + Keluar + Ekspor + Selesai + Font + Kembali + Gambar + Impor + Informasi + Bahasa + Ubah + Berikutnya + Tidak + OK + Sebelumnya + Pratinjau + Pribadi + Sedang berjalan + Publik + Hapus + Atur ulang + Pulihkan + Jalankan + Simpan + Tersimpan + Pilih + Bagikan + Tampilkan + Perbarui + Unggah + Lihat + Ya + + + Kompetisi + Proyek Saya + Toko Proyek + Tutorial + + + Dokumentasi + URL Ekspor + Pengaturan Bahasa + Informasi Program + Daftar Pembelian + Hapus Iklan + Simpan Sketchware + Bagikan dengan Teman + Berlangganan + Pengaturan Sistem + + + Tampilan + Ubah tampilan Sketchware + Tema Sketchware + Bawaan sistem + Tema terang + Tema gelap + + + Komponen + Kontrol + Berkas + Daftar + Matematika + Blok tambahan + Operator + Variabel + Tampilan + + + Aktivitas tidak ditemukan + Terjadi kesalahan! + Gagal terhubung ke server + Gagal menyimpan + Kesalahan tidak diketahui! Silakan hubungi administrator + diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml index ef83d0d..b84babf 100644 --- a/app/src/main/res/xml/locales_config.xml +++ b/app/src/main/res/xml/locales_config.xml @@ -5,12 +5,13 @@ app/src/main/res/values-/strings.xml; otherwise users who pick the language from system Settings see a fully English UI, which is misleading. - Phase 1 ships English (default) and Arabic. The roadmap targets Indonesian, - Portuguese (BR), Spanish, Russian, Hindi, Persian, Turkish, and Vietnamese - next - those entries should be re-added together with their values- - resource folders. + Phase 1 shipped English (default) and Arabic. Phase 2 adds Indonesian as a + seed translation. The roadmap targets Portuguese (BR), Spanish, Russian, + Hindi, Persian, Turkish, and Vietnamese next - those entries should be + re-added together with their values- resource folders. --> + diff --git a/docs/CONTRIBUTING-i18n.md b/docs/CONTRIBUTING-i18n.md index cac25a1..c54ef71 100644 --- a/docs/CONTRIBUTING-i18n.md +++ b/docs/CONTRIBUTING-i18n.md @@ -20,13 +20,13 @@ Android 13+ system language picker would advertise a language that silently falls back to English. ### Currently shipping -| Tag | Language | Status | -|--------|-------------------|---------------| -| `en` | English (default) | 100% | -| `ar` | Arabic | Phase 1 seed | +| Tag | Language | Status | +|--------|-------------------|-------------------------------------| +| `en` | English (default) | 100% | +| `ar` | Arabic | Phase 2 (≈160 strings, expanding) | +| `id` | Indonesian | Phase 2 seed (≈100 strings) | ### Planned (will be added to `locales_config.xml` together with their `values-/`) -- `id` — Indonesian - `pt-BR` — Portuguese (Brazil) - `es` — Spanish - `ru` — Russian