Some fixes

This commit is contained in:
Thomas 2021-03-03 18:48:22 +01:00
parent 4fc43b66d8
commit 90cfba6bd9
4 changed files with 17 additions and 9 deletions

View File

@ -9,8 +9,8 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 381 versionCode 382
versionName "2.38.0-beta-1" versionName "2.38.0-rc-1"
multiDexEnabled true multiDexEnabled true
renderscriptTargetApi 28 as int renderscriptTargetApi 28 as int
renderscriptSupportModeEnabled true renderscriptSupportModeEnabled true
@ -109,8 +109,6 @@ task copyAllReleaseNotes(type: Copy) {
from "$buildDir/../src/main/assets/changelogs/" from "$buildDir/../src/main/assets/changelogs/"
include "*.txt" include "*.txt"
into "$buildDir/../../src/fdroid/fastlane/metadata/android/en-US/changelogs/" 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/" into "$buildDir/../../src/lite/fastlane/metadata/android/en-US/changelogs/"
} }

View File

@ -1,3 +1,5 @@
/!\ If you run a Pixelfed account you must logout it first. - Push notifications with UnifiedPush (More at https://fedilab.app/wiki/features/push-notifications)
- Delayed and live notifications removed
Fix an issue with Pleroma accounts when visiting a profile - Remove lost space for Pleroma accounts
- Fix a crash with console mode
- Fix an issue with Pleroma accounts when visiting a profile

View File

@ -2063,7 +2063,11 @@ public abstract class BaseMainActivity extends BaseActivity
} else { } else {
if (accounts != null && accounts.size() > 0) { if (accounts != null && accounts.size() > 0) {
developers = new ArrayList<>(); 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); new RetrieveRelationshipAsyncTask(BaseMainActivity.this, accounts.get(0).getId(), BaseMainActivity.this);
} }
} }

View File

@ -975,7 +975,11 @@ public class API {
} }
try { try {
if (recursive) { 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) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();