F-Droid can't build

[licaon-kter]

│ ├── --- ArcaneChat-foss-armeabi-v7a-2.59.1/smali/yc.smali
│ ├── +++ chat.delta.lite_300007531/smali/yc.smali
│ │ @@ -2044,15 +2044,15 @@
│ │      return p0
│ │  .end method
│ │  
│ │  .method public static declared-synchronized d(Landroid/content/Context;)V
│ │      .locals 6
│ │  
│ │      .line 1
│ │ +    const-string v0, " running=300007531"
│ │ -    const-string v0, " running=300007534"
│ │  
│ │      .line 2
│ │      .line 3
│ │      const-string v1, "cleanupUpdated: stored="
│ │  
│ │      .line 4
│ │      .line 5
│ │ @@ -2151,15 +2151,15 @@
│ │  
│ │      .line 48
│ │      .line 49
│ │      iget v0, v3, Lxc;->c:I
│ │  
│ │      .line 50
│ │      .line 51
│ │ +    const v1, 0x11e1c06b
│ │ -    const v1, 0x11e1c06e
│ │  
│ │      .line 52
│ │      .line 53
│ │      .line 54
│ │      if-le v0, v1, :cond_1
│ │  
│ │      .line 55

https://gitlab.com/fdroid/checkupdates-bot-fdroiddata/-/jobs/16084680843#L2182

[adbenitez]

@licaon-kter hi, recently the build.gradle file changed, can you please elaborate what exactly is failing? I struggle to decode that log, it seems there is a version number mismatch? is the fdroid build having 300007534 as version number for ArcaneChat-foss-armeabi-v7a-2.59.1 ???

I have run ./gradlew -PABI_FILTER=armeabi-v7a assembleFossRelease locally and the generated apk has the correct expected 300007531 version number

[licaon-kter]

That's not the version number, the different string is in classes.dex, the snippet above is the diff between the disassembled .dex's

[adbenitez]

@licaon-kter there are two differences in what you shared and one is version number so no surprise other parts are different

│ │ +    const-string v0, " running=300007531"
│ │ -    const-string v0, " running=300007534"

[licaon-kter]

small nit... those number are related to versionCode yes...

but... the actual APKs versionCodes are correct

$ aapt2 dump badging ArcaneChat-foss-armeabi-v7a-2.59.1.apk | head
package: name='chat.delta.lite' versionCode='300007531' versionName='2.59.1' platformBuildVersionName='16' platformBuildVersionCode='36' compileSdkVersion='36' compileSdkVersionCodename='16'
sdkVersion:'21'
targetSdkVersion:'36'
...
$ aapt2 dump badging chat.delta.lite_300007531.apk | head
package: name='chat.delta.lite' versionCode='300007531' versionName='2.59.1' platformBuildVersionName='16' platformBuildVersionCode='36' compileSdkVersion='36' compileSdkVersionCodename='16'
sdkVersion:'21'
targetSdkVersion:'36'
...

/LE:
https://github.com/ArcaneChat/android/blob/v2.59.1/src/main/java/org/thoughtcrime/securesms/updater/AppUpdate.java#L112 seems to have got a stale VERSION_CODE or something during your build? hard to believe as the GHA CI should run a clean VM every time

[adbenitez]

that VERSION_CODE mismatch is a problem, question is which one has 300007534??? the fdroid build? it is not clear to me from the diff

[licaon-kter]

follow the + and - signs, not sure why the diff sometimes reverses their order

│ ├── --- ArcaneChat-foss-armeabi-v7a-2.59.1/smali/yc.smali
│ ├── +++ chat.delta.lite_300007531/smali/yc.smali\
│ │ -    const-string v0, " running=300007534"
│ │ +    const-string v0, " running=300007531"

or you can easily check:

$ grep -rin running= ArcaneChat-foss-armeabi-v7a-2.59.1
ArcaneChat-foss-armeabi-v7a-2.59.1/smali/wj3.smali:476:    const-string v0, "running=[DONE]"
ArcaneChat-foss-armeabi-v7a-2.59.1/smali/wj3.smali:492:    const-string v0, "running=[INTERRUPTED]"
ArcaneChat-foss-armeabi-v7a-2.59.1/smali/wj3.smali:512:    const-string v2, "running=[RUNNING ON "
ArcaneChat-foss-armeabi-v7a-2.59.1/smali/wj3.smali:559:    const-string v0, "running=[NOT STARTED YET]"
ArcaneChat-foss-armeabi-v7a-2.59.1/smali/yc.smali:2051:    const-string v0, " running=300007534"
$ grep -rin running= chat.delta.lite_300007531
chat.delta.lite_300007531/smali/wj3.smali:476:    const-string v0, "running=[DONE]"
chat.delta.lite_300007531/smali/wj3.smali:492:    const-string v0, "running=[INTERRUPTED]"
chat.delta.lite_300007531/smali/wj3.smali:512:    const-string v2, "running=[RUNNING ON "
chat.delta.lite_300007531/smali/wj3.smali:559:    const-string v0, "running=[NOT STARTED YET]"
chat.delta.lite_300007531/smali/yc.smali:2051:    const-string v0, " running=300007531"

[adbenitez]

ok so it is our release that has the wrong Build.VERSION_CODE I think I know why, because in our CI we build all the split apks in a single command while f-droid CI runs gradlew several times passing -PABI_FILTER= will change the CI to build more similarly to f-droid's and hopefully this will solve the problem then in the next tagged version

[adbenitez]

@licaon-kter it seems something is still wrong? the new version also is not appearing in f-droid

[licaon-kter]

Was this fixed and you forgot to ping us?

[adbenitez]

@licaon-kter ah some manual "enabling/trying again" was needed??? I was thinking it would just automatically try again on new tag, as explained in my messages above I changed something and think the latest release 2.59.2 should be ok, if it fails again please share logs etc thanks in advance!