diff --git a/app/build.gradle b/app/build.gradle index eb423e9ca..cd3c85cfb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 29 - versionCode 381 - versionName "2.38.0-beta-1" + versionCode 382 + versionName "2.38.0-rc-1" multiDexEnabled true renderscriptTargetApi 28 as int renderscriptSupportModeEnabled true @@ -109,8 +109,6 @@ task copyAllReleaseNotes(type: Copy) { from "$buildDir/../src/main/assets/changelogs/" include "*.txt" into "$buildDir/../../src/fdroid/fastlane/metadata/android/en-US/changelogs/" - from "$buildDir/../src/main/assets/changelogs/" - include "*.txt" into "$buildDir/../../src/lite/fastlane/metadata/android/en-US/changelogs/" } diff --git a/app/src/main/assets/changelogs/382.txt b/app/src/main/assets/changelogs/382.txt index a8c44319a..280ad1ae7 100644 --- a/app/src/main/assets/changelogs/382.txt +++ b/app/src/main/assets/changelogs/382.txt @@ -1,3 +1,5 @@ -/!\ If you run a Pixelfed account you must logout it first. - -Fix an issue with Pleroma accounts when visiting a profile \ No newline at end of file +- Push notifications with UnifiedPush (More at https://fedilab.app/wiki/features/push-notifications) +- Delayed and live notifications removed +- Remove lost space for Pleroma accounts +- Fix a crash with console mode +- Fix an issue with Pleroma accounts when visiting a profile \ No newline at end of file diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java index 692df044c..dce8de6a7 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java @@ -2063,7 +2063,11 @@ public abstract class BaseMainActivity extends BaseActivity } else { if (accounts != null && accounts.size() > 0) { developers = new ArrayList<>(); - developers.addAll(accounts); + for (Account account : accounts) { + if (account.getUsername().compareTo("apps") == 0) { + developers.add(account); + } + } new RetrieveRelationshipAsyncTask(BaseMainActivity.this, accounts.get(0).getId(), BaseMainActivity.this); } } diff --git a/app/src/main/java/app/fedilab/android/client/API.java b/app/src/main/java/app/fedilab/android/client/API.java index eab813fd2..752e137b0 100644 --- a/app/src/main/java/app/fedilab/android/client/API.java +++ b/app/src/main/java/app/fedilab/android/client/API.java @@ -975,7 +975,11 @@ public class API { } try { if (recursive) { - status.setReblog(parseStatuses(context, resobj.getJSONObject("reblog"), false)); + if (!resobj.isNull("reblog")) { + status.setReblog(parseStatuses(context, resobj.getJSONObject("reblog"), false)); + } else { + status.setReblog(null); + } } } catch (Exception e) { e.printStackTrace();