Commit e7f8d996 authored by Thomas's avatar Thomas
Browse files

Some fixes

parent 96567648

app/src/fdroid/res/xml/file_paths.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<paths>

    <external-path

        name="my_images"

        path="Android/data/fr.gouv.etalab.mastodon.test/files/Pictures" />

        path="Android/data/fr.gouv.etalab.mastodon/files/Pictures" />



    <cache-path

        name="*"

app/src/main/java/app/fedilab/android/activities/ContextActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class ContextActivity extends BaseActivity { 
        focusedStatus = null; // or other values

        if (b != null)

            focusedStatus = (Status) b.getSerializable(Helper.ARG_STATUS);

        if (focusedStatus == null) {

        if (focusedStatus == null && currentAccount == null || currentAccount.mastodon_account == null) {

            finish();

            return;

        }

app/src/main/java/app/fedilab/android/client/entities/app/QuickLoad.java

+3 −3
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ public class QuickLoad { 
        QuickLoad localQuickLoad = getSavedValue(account, Timeline.TimeLineEnum.LOCAL, null);

        QuickLoad publicQuickLoad = getSavedValue(account, Timeline.TimeLineEnum.PUBLIC, null);



        if (homeQuickLoad != null && homeQuickLoad.statuses != null) {

        if (homeQuickLoad != null && homeQuickLoad.statuses != null && newStatus != null) {

            for (int i = 0; i < homeQuickLoad.statuses.size(); i++) {

                if (homeQuickLoad.statuses.get(i).id.equals(newStatus.id)) {

                    homeQuickLoad.statuses.set(i, newStatus);
@@ -327,7 +327,7 @@ public class QuickLoad { 
                e.printStackTrace();

            }

        }

        if (localQuickLoad != null && localQuickLoad.statuses != null) {

        if (localQuickLoad != null && localQuickLoad.statuses != null && newStatus != null) {

            for (int i = 0; i < localQuickLoad.statuses.size(); i++) {

                if (localQuickLoad.statuses.get(i).id.equals(newStatus.id)) {

                    localQuickLoad.statuses.set(i, newStatus);
@@ -345,7 +345,7 @@ public class QuickLoad { 
                e.printStackTrace();

            }

        }

        if (publicQuickLoad != null && publicQuickLoad.statuses != null) {

        if (publicQuickLoad != null && publicQuickLoad.statuses != null && newStatus != null) {

            for (int i = 0; i < publicQuickLoad.statuses.size(); i++) {

                if (publicQuickLoad.statuses.get(i).id.equals(newStatus.id)) {

                    publicQuickLoad.statuses.set(i, newStatus);

app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentNotificationsSettings.java

+7 −1
Original line number Diff line number Diff line
@@ -179,7 +179,13 @@ public class FragmentNotificationsSettings extends PreferenceFragmentCompat impl 
                PushHelper.startStreaming(requireActivity());

            }

            if (key.compareToIgnoreCase(getString(R.string.SET_LED_COLOUR_VAL)) == 0) {

                sharedPreferences.edit().putInt(getString(R.string.SET_LED_COLOUR_VAL), Integer.parseInt(key)).apply();

                try {

                    int value = Integer.parseInt(key);

                    sharedPreferences.edit().putInt(getString(R.string.SET_LED_COLOUR_VAL), value).apply();

                } catch (NumberFormatException e) {

                    e.printStackTrace();

                }



            }

        }

    }

app/src/playstore/res/xml/file_paths.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<paths>

    <external-path

        name="my_images"

        path="Android/data/app.fedilab.android.test/files/Pictures" />

        path="Android/data/app.fedilab.android/files/Pictures" />



    <cache-path

        name="*"