Commit 82fa4d8d authored by Bartek Fabiszewski's avatar Bartek Fabiszewski
Browse files

Update target SDK to 35

parent 44368937

app/build.gradle

+15 −4
Original line number Diff line number Diff line
@@ -10,12 +10,12 @@ 
apply plugin: 'com.android.application'



android {

    compileSdk 34

    compileSdk 35



    defaultConfig {

        applicationId 'net.fabiszewski.ulogger'

        minSdkVersion 21

        targetSdkVersion 34

        targetSdkVersion 35

        versionCode 311

        versionName '3.11'

    }
@@ -44,10 +44,21 @@ android { 
    }

}



configurations.configureEach {

    resolutionStrategy {

        eachDependency {

            // fix duplicate class in kotlin-stdlib dependencies

            if ((requested.group == "org.jetbrains.kotlin") && (requested.name.startsWith("kotlin-stdlib"))) {

                useVersion("1.8.0")

            }

        }

    }

}



dependencies {

    implementation fileTree(include: ['*.jar'], dir: 'libs')

    implementation 'androidx.appcompat:appcompat:1.6.1'

    implementation 'androidx.appcompat:appcompat:1.7.0'

    implementation 'androidx.preference:preference:1.2.1'

    implementation 'androidx.exifinterface:exifinterface:1.3.7'

    implementation 'androidx.exifinterface:exifinterface:1.4.0'

    testImplementation 'junit:junit:4.13.2'

}

app/src/main/java/net/fabiszewski/ulogger/ui/AutoNamePreferenceDialogFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ public class AutoNamePreferenceDialogFragment extends EditTextPreferenceDialogFr 
    @Override

    public void afterTextChanged(Editable editable) {

        updatePreview(editable.toString());

        //noinspection SizeReplaceableByIsEmpty

        if (editable.length() == 0) {

            setError(getString(R.string.empty_trackname_warning));

        }

app/src/main/java/net/fabiszewski/ulogger/ui/ListWithEditTextPreference.java

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ class ListWithEditTextPreference extends ListPreference implements Preference.On 
        editText.setHint(prefs.getString(key, ""));

        submit.setOnClickListener(v -> {

            String newval = editText.getText().toString();

            if (newval.length() > 0 && Integer.parseInt(newval) >= 0) {

            if (!newval.isEmpty() && Integer.parseInt(newval) >= 0) {

                SharedPreferences.Editor editor = prefs.edit();

                editor.putString(key, newval);

                editor.apply();

app/src/main/java/net/fabiszewski/ulogger/ui/MainFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ public class MainFragment extends Fragment implements PermissionHelper.Permissio 
        int trackId = DbAccess.getTrackId(context);

        MainActivity activity = (MainActivity) requireActivity();

        String host = activity.preferenceHost;

        if (trackId > 0 && host.length() > 0) {

        if (trackId > 0 && !host.isEmpty()) {

            String trackUrl = host + "/#" + trackId;

            Intent sendIntent = new Intent();

            sendIntent.setAction(Intent.ACTION_SEND);

app/src/main/java/net/fabiszewski/ulogger/ui/SettingsFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Permis 
            // update web helper settings, remove session cookies

            WebHelper.updatePreferences(preference.getContext());

            // disable live synchronization if any server preference is removed

            if (newValue.toString().trim().length() == 0) {

            if (newValue.toString().trim().isEmpty()) {

                disableLiveSync(preference.getContext());

            }

            return true;