ndk 21

Author: oers

build.gradle

@@ -19,7 +19,6 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
     }
 
     /**
@@ -30,11 +29,7 @@ buildscript {
 
     dependencies {
         classpath 'com.github.triplet.gradle:play-publisher:3.7.0'
-        classpath 'com.android.tools.build:gradle:7.1.2'
-        classpath 'com.google.gms:google-services:4.3.10'
-        // Add the Crashlytics Gradle plugin (use v2.0.0+ if you built
-        // your app with Android Studio 4.1).
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
+        classpath 'com.android.tools.build:gradle:7.1.3'
     }
 }
 
@@ -54,6 +49,5 @@ plugins {
 allprojects {
    repositories {
        google()
-       jcenter()
    }
 }

project/build.gradle

@@ -1,7 +1,5 @@
 apply plugin: 'com.android.application'
-
 apply from: "deploy.gradle"
-apply from: "google-api.gradle" // for closed source software
 
 
 project.ext.set("archivesBaseName", "reversatile")
@@ -44,7 +42,7 @@ android {
         }
     }
 
-    ndkVersion "24.0.8215888"
+    ndkVersion "21.4.7075529"
 
     externalNativeBuild {
         ndkBuild {
@@ -82,12 +80,13 @@ dependencies {
     implementation 'androidx.core:core:1.7.0'
     implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.github.matomo-org:matomo-sdk-android:4.1.4'
 
     implementation 'com.github.Innovattic:range-seek-bar:v1.0.6'
 
     // Required -- JUnit 4 framework
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     // Optional -- Mockito framework
     testImplementation 'org.mockito:mockito-core:2.28.2'

project/google-api.gradle

@@ -59,6 +59,59 @@ public void testIssue22() throws InterruptedException {
         assertSame(32, countSquares(ZebraEngine.PLAYER_BLACK));
     }
 
+    @Test
+    public void testCrash1() throws InterruptedException {
+        Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_SEND);
+        intent.setType("message/rfc822");
+        intent.putExtra(Intent.EXTRA_TEXT, "d3c5f6f5e6e3c4c3f4d6c6d7b5b4c7f7a3g5f8g6g3a6b6a5e8e7f2g4f3e2h3f1d8h5h7a7g2");
+
+        zebra.runOnUiThread(() -> zebra.onNewIntent(intent));
+
+        Thread.sleep(2000);
+        zebra.runOnUiThread(() -> zebra.undoAll());
+        Thread.sleep(10000);
+        for(int i = 1; i < 20; i++) {
+            zebra.runOnUiThread(() -> zebra.redo());
+            Thread.sleep(200);
+        }
+    }
+
+    @Test
+    public void testCrash2() throws InterruptedException {
+        Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_SEND);
+        intent.setType("message/rfc822");
+        intent.putExtra(Intent.EXTRA_TEXT, "d3c5e6f5f6e3d6f7g6e7f4c4b4d2c3b5c2e2f3a4f1e1c1g1f2h6f8g5c6b3a6g4a5a3b6a7b2a1a2b1a8d1g3h4h3c7h5h2g7e8c8h7h8");
+
+        zebra.runOnUiThread(() -> zebra.onNewIntent(intent));
+
+        Thread.sleep(2000);
+        zebra.runOnUiThread(() -> zebra.undoAll());
+        Thread.sleep(10000);
+        for(int i = 1; i < 50; i++) {
+            zebra.runOnUiThread(() -> zebra.redo());
+            Thread.sleep(200);
+        }
+
+
+    }
+
+    @Test
+    public void testCrash3() throws InterruptedException {
+        Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_SEND);
+        intent.setType("message/rfc822");
+        intent.putExtra(Intent.EXTRA_TEXT, "d3c5e6f5f6e3d6f7g6e7f4c4b4d2c3b5c2e2f3a4f1e1c1g1f2h6f8g5c6b3a6g4a5a3b6a7b2a1a2");
+
+        zebra.runOnUiThread(() -> zebra.onNewIntent(intent));
+
+        Thread.sleep(2000);
+        zebra.runOnUiThread(() -> zebra.undoAll());
+        Thread.sleep(10000);
+
+    }
+
 
 
 }

project/google-services.json

@@ -5,21 +5,26 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
-import com.google.firebase.analytics.FirebaseAnalytics;
 import com.shurik.droidzebra.GameState;
-import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import javax.annotation.Nullable;
+
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static android.content.Context.MODE_PRIVATE;
 import static de.earthlingz.oerszebra.GlobalSettingsLoader.SHARED_PREFS_NAME;
 
+import org.matomo.sdk.Matomo;
+import org.matomo.sdk.Tracker;
+import org.matomo.sdk.TrackerBuilder;
+import org.matomo.sdk.extra.TrackHelper;
+
 public class Analytics {
 
     static final String ANALYTICS_SETTING = "analytics_setting";
     private static final AtomicReference<DroidZebra> app = new AtomicReference<>();
-    private static FirebaseAnalytics firebase = null;
+    private static Tracker tracker = null;
 
     public static void setApp(DroidZebra zebra) {
         app.set(zebra);
@@ -62,7 +67,7 @@ public static void log(String id, String message) {
             return;
         }
 
-        FirebaseCrashlytics.getInstance().log("E/LOG : " + id + " / " +message);
+        TrackHelper.track().event(id, "E/Message: " + message).with(tracker);
     }
 
     public static void build() {
@@ -73,10 +78,6 @@ public static void build() {
 
         boolean consent = isConsent();
 
-        if (consent) { //one time only, needs reboot of the app to work
-            FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true);
-        }
-
         handleConsent(app.get(), consent);
     }
 
@@ -91,31 +92,41 @@ private static boolean isConsent() {
     }
 
     private static void handleConsent(Context app, boolean consent) {
+        if(tracker != null) { //already initialised
+            return;
+        }
 
-        FirebaseAnalytics instance = getFirebaseAnalytics(app);
-        instance.setAnalyticsCollectionEnabled(consent);
+        getTracker(app);
+
+        tracker.setOptOut(!consent);
 
         if (!consent) {
-            instance.resetAnalyticsData();
+            return;
         }
+
+        tracker.startNewSession();
+        tracker.setUserId(UUID.randomUUID().toString());
+
+        TrackHelper.track().uncaughtExceptions().with(tracker);
+        TrackHelper.track().download().with(tracker);
     }
 
-    private synchronized static FirebaseAnalytics getFirebaseAnalytics(Context app) {
-        if(firebase == null) {
-            firebase = FirebaseAnalytics.getInstance(app);
+    private synchronized static Tracker getTracker(Context app) {
+        if(tracker == null) {
+            tracker = TrackerBuilder.createDefault("https://matomo.reversatile.online/matomo.php", 2).build(Matomo.getInstance(app));
         }
-        return firebase;
+        return tracker;
     }
 
     public static void converse(String converse, @Nullable Bundle bundle) {
         if(!isConsent()) {
             Log.i("converse", converse);
             return;
         }
-        FirebaseCrashlytics.getInstance().log("E/Converse: " + converse);
         if(app.get() != null) {
-            FirebaseAnalytics fb = getFirebaseAnalytics(app.get());
-            fb.logEvent(converse, bundle);
+            Tracker fb = getTracker(app.get());
+            TrackHelper.track().screen( converse).with(fb);
+
         }
 
     }
@@ -130,6 +141,6 @@ public static void error(String msg, GameState state) {
         if(app.get() == null) {
             return;
         }
-        FirebaseCrashlytics.getInstance().log("E/Message: " + message);
+        TrackHelper.track().event("error", "E/Message: " + message);
     }
 }

project/signing.gradle

@@ -887,7 +887,7 @@ public void onResume() {
         }
     }
 
-    private void undoAll() {
+    void undoAll() {
         engine.undoAll(gameState);
     }
 

project/src/androidTest/java/de/earthlingz/oerszebra/DroidZebraTest.java

@@ -1 +1,2 @@
-Bugfix beim Einlesen von Spieldaten
+Bugfix beim Einlesen von Spieldaten
+Keine Google Service Dependencies mehr

project/src/main/java/de/earthlingz/oerszebra/Analytics.java

@@ -1 +1,2 @@
-Bugfix when showing game data
+Bugfix when showing game data
+No more dependencies on google services