Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def gitVersionName() {
}

android {
namespace = 'dk.au.aptg.dEdx'
namespace = 'io.github.aptg.dedx'

signingConfigs {
release {
Expand All @@ -36,7 +36,7 @@ android {
ndkVersion = "28.2.13676358"

defaultConfig {
applicationId = "dk.au.aptg.dEdx"
applicationId = "io.github.aptg.dedx"
minSdk = 21
targetSdk = 34
versionCode = gitVersionCode()
Expand Down
24 changes: 12 additions & 12 deletions app/src/main/cpp/dEdx.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jclass linkedListClass;
jobject
create_dedxIdxName(JNIEnv* env, jint idx, jstring name)
{
jclass dedxIdxNameClass = (*env)->FindClass(env, "dk/au/aptg/dEdx/DedxIdxName");
jclass dedxIdxNameClass = (*env)->FindClass(env, "io/github/aptg/dedx/DedxIdxName");
if (dedxIdxNameClass == NULL)
{
__android_log_print(ANDROID_LOG_INFO, "libdedx", "Not found DedxIdxName class");
Expand Down Expand Up @@ -95,7 +95,7 @@ JNI_OnLoad(JavaVM* vm, void* reserved) {
}

jint
Java_dk_au_aptg_dEdx_DedxAPI_dedxExit(JNIEnv* env, jobject thiz) {
Java_io_github_aptg_dedx_DedxAPI_dedxExit(JNIEnv* env, jobject thiz) {
int err = 0;
Comment on lines 97 to 99

Copilot AI Apr 26, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Native code still looks up DedxIdxName using the old class path (FindClass("dk/au/aptg/dEdx/DedxIdxName")). After changing the Java package/namespace to io.github.aptg.dedx, this FindClass will fail and JNI calls that build lists (programs/ions/materials) will return NULL / crash. Update the FindClass string to the new package path (io/github/aptg/dedx/DedxIdxName) to match the rebrand.

Copilot uses AI. Check for mistakes.

if(ws != 0) {
Expand All @@ -116,7 +116,7 @@ Java_dk_au_aptg_dEdx_DedxAPI_dedxExit(JNIEnv* env, jobject thiz) {
}

jint
Java_dk_au_aptg_dEdx_DedxAPI_dedxLoadConfig(JNIEnv* env, jobject thiz, jint program, jint target, jint ion) {
Java_io_github_aptg_dedx_DedxAPI_dedxLoadConfig(JNIEnv* env, jobject thiz, jint program, jint target, jint ion) {
int err = 0;

if(cfg != 0) {
Expand Down Expand Up @@ -154,7 +154,7 @@ Java_dk_au_aptg_dEdx_DedxAPI_dedxLoadConfig(JNIEnv* env, jobject thiz, jint prog
}

jfloat
Java_dk_au_aptg_dEdx_DedxAPI_dedxGetStp(JNIEnv* env, jobject thiz, jfloat energy) {
Java_io_github_aptg_dedx_DedxAPI_dedxGetStp(JNIEnv* env, jobject thiz, jfloat energy) {
int err = 0;

jfloat stp = dedx_get_stp(ws, cfg, energy, &err);
Expand All @@ -167,12 +167,12 @@ Java_dk_au_aptg_dEdx_DedxAPI_dedxGetStp(JNIEnv* env, jobject thiz, jfloat energy
}

jfloat
Java_dk_au_aptg_dEdx_DedxAPI_dedxGetDensity(JNIEnv* env, jobject thiz) {
Java_io_github_aptg_dedx_DedxAPI_dedxGetDensity(JNIEnv* env, jobject thiz) {
return cfg->rho;
}

jdouble
Java_dk_au_aptg_dEdx_DedxAPI_dedxGetInverseCSDA(JNIEnv* env, jobject thiz, jfloat range, jint ion_a) {
Java_io_github_aptg_dedx_DedxAPI_dedxGetInverseCSDA(JNIEnv* env, jobject thiz, jfloat range, jint ion_a) {
int err = 0;

cfg->ion_a = ion_a;
Expand All @@ -186,19 +186,19 @@ Java_dk_au_aptg_dEdx_DedxAPI_dedxGetInverseCSDA(JNIEnv* env, jobject thiz, jfloa
}

jstring
Java_dk_au_aptg_dEdx_DedxAPI_dedxGetVersion(JNIEnv* env, jobject thiz) {
Java_io_github_aptg_dedx_DedxAPI_dedxGetVersion(JNIEnv* env, jobject thiz) {
return (*env)->NewStringUTF(env, dedx_get_version_string());
}

jstring
Java_dk_au_aptg_dEdx_DedxAPI_dedxGetErrorMsg(JNIEnv* env, jobject thiz, jint err) {
Java_io_github_aptg_dedx_DedxAPI_dedxGetErrorMsg(JNIEnv* env, jobject thiz, jint err) {
char errorMsg[100];
dedx_get_error_code(&errorMsg[0], err);
return (*env)->NewStringUTF(env, errorMsg);
}

jdouble
Java_dk_au_aptg_dEdx_DedxAPI_dedxGetCSDARange(JNIEnv* env, jobject thiz, jfloat energy, jint ion_a) {
Java_io_github_aptg_dedx_DedxAPI_dedxGetCSDARange(JNIEnv* env, jobject thiz, jfloat energy, jint ion_a) {
int err = 0;

cfg->ion_a = ion_a;
Expand All @@ -212,7 +212,7 @@ Java_dk_au_aptg_dEdx_DedxAPI_dedxGetCSDARange(JNIEnv* env, jobject thiz, jfloat
}

jobject
Java_dk_au_aptg_dEdx_DedxAPI_dedxGetProgramList(JNIEnv* env, jobject thiz) {
Java_io_github_aptg_dedx_DedxAPI_dedxGetProgramList(JNIEnv* env, jobject thiz) {
jobject linkedListObj = create_linkedlist(env);

const int* p;
Expand All @@ -229,7 +229,7 @@ Java_dk_au_aptg_dEdx_DedxAPI_dedxGetProgramList(JNIEnv* env, jobject thiz) {
}

jobject
Java_dk_au_aptg_dEdx_DedxAPI_dedxGetIons(JNIEnv* env, jobject thiz, jint program) {
Java_io_github_aptg_dedx_DedxAPI_dedxGetIons(JNIEnv* env, jobject thiz, jint program) {
jobject linkedListObj = create_linkedlist(env);

const int* p;
Expand All @@ -244,7 +244,7 @@ Java_dk_au_aptg_dEdx_DedxAPI_dedxGetIons(JNIEnv* env, jobject thiz, jint program
}

jobject
Java_dk_au_aptg_dEdx_DedxAPI_dedxGetMaterials(JNIEnv* env, jobject thiz, jint program) {
Java_io_github_aptg_dedx_DedxAPI_dedxGetMaterials(JNIEnv* env, jobject thiz, jint program) {
jobject linkedListObj = create_linkedlist(env);

const int* p;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dk.au.aptg.dEdx;
package io.github.aptg.dedx;

import android.os.Bundle;
import android.text.method.LinkMovementMethod;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dk.au.aptg.dEdx;
package io.github.aptg.dedx;

import java.util.List;
import java.util.Locale;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dk.au.aptg.dEdx;
package io.github.aptg.dedx;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dk.au.aptg.dEdx;
package io.github.aptg.dedx;

import java.util.LinkedList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dk.au.aptg.dEdx;
package io.github.aptg.dedx;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dk.au.aptg.dEdx;
package io.github.aptg.dedx;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dk.au.aptg.dEdx;
package io.github.aptg.dedx;

import android.content.Intent;
import android.os.Bundle;
Expand Down
Loading