From 9083c66053e8a46dbe93ab15211e58f1047de0c0 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 10 Jul 2020 17:43:55 +0200 Subject: copy release notes --- app/src/main/assets/changelogs/376.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 app/src/main/assets/changelogs/376.txt diff --git a/app/src/main/assets/changelogs/376.txt b/app/src/main/assets/changelogs/376.txt new file mode 100644 index 000000000..9966180ef --- /dev/null +++ b/app/src/main/assets/changelogs/376.txt @@ -0,0 +1,20 @@ +Added: +- Select text for media description + +changed: +- Increase media description length to 1500 chars +- More details about accounts in notifications +- Media management in timelines +- Allow cross-account replies on followed instances + +Fixed: +- Crash when having custom emoji in display name +- Crash when adding media +- Remove extra spaces at the bottom of messages +- Some issue with custom emoji +- Fix issue with "Your toots/notifications" +- Fix issue with CW and Pixelfed +- Fix some media not loaded in profiles +- Scheduled toots from server side have an incorrect date +- Incorrect feeds when checking instance admin account +- Some crashes \ No newline at end of file -- cgit v1.2.3 From 467c8d0c87bf2b38662fa66e9bea255214eb5de7 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 10 Jul 2020 17:44:52 +0200 Subject: copy release notes --- fastlane/metadata/android/en-US/changelogs/376.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/376.txt diff --git a/fastlane/metadata/android/en-US/changelogs/376.txt b/fastlane/metadata/android/en-US/changelogs/376.txt new file mode 100644 index 000000000..05a416459 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/376.txt @@ -0,0 +1,2 @@ +Fixed: +- Crash when adding media (Pixelfed/Mastodon) \ No newline at end of file -- cgit v1.2.3 From b9617f7133a1f68f584029f7a091cf4968815f7a Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 10 Jul 2020 17:45:14 +0200 Subject: Release 3.36.2 --- app/build.gradle | 4 ++-- app/src/main/assets/changelogs/376.txt | 20 +------------------- .../fedilab/android/activities/LoginActivity.java | 3 +++ .../android/activities/PixelfedComposeActivity.java | 10 +++++++--- .../app/fedilab/android/activities/TootActivity.java | 8 ++++---- .../main/java/app/fedilab/android/client/API.java | 3 +++ .../res/layout-sw600dp/activity_show_account.xml | 1 + 7 files changed, 21 insertions(+), 28 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c0269d71c..da350357b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { minSdkVersion 19 targetSdkVersion 29 - versionCode 375 - versionName "2.36.1" + versionCode 376 + versionName "2.36.2" multiDexEnabled true renderscriptTargetApi 28 as int renderscriptSupportModeEnabled true diff --git a/app/src/main/assets/changelogs/376.txt b/app/src/main/assets/changelogs/376.txt index 9966180ef..05a416459 100644 --- a/app/src/main/assets/changelogs/376.txt +++ b/app/src/main/assets/changelogs/376.txt @@ -1,20 +1,2 @@ -Added: -- Select text for media description - -changed: -- Increase media description length to 1500 chars -- More details about accounts in notifications -- Media management in timelines -- Allow cross-account replies on followed instances - Fixed: -- Crash when having custom emoji in display name -- Crash when adding media -- Remove extra spaces at the bottom of messages -- Some issue with custom emoji -- Fix issue with "Your toots/notifications" -- Fix issue with CW and Pixelfed -- Fix some media not loaded in profiles -- Scheduled toots from server side have an incorrect date -- Incorrect feeds when checking instance admin account -- Some crashes \ No newline at end of file +- Crash when adding media (Pixelfed/Mastodon) \ No newline at end of file diff --git a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java index 5207547ff..4f62c8cff 100644 --- a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java @@ -248,6 +248,9 @@ public class LoginActivity extends BaseActivity { return; } instance = login_instance.getText().toString().trim().toLowerCase(); + if(instance.length() == 0) { + return; + } connect_button.setEnabled(false); new Thread(() -> { instanceNodeInfo = new API(LoginActivity.this).displayNodeInfo(instance); diff --git a/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java b/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java index e17c08a6f..8e66d2a9a 100644 --- a/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java @@ -113,6 +113,7 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Objects; +import java.util.Random; import java.util.TimeZone; import java.util.UUID; import java.util.regex.Matcher; @@ -1265,7 +1266,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu toot_space_left.setText("0"); if (attachments != null) { for (Attachment attachment : attachments) { - View namebar = findViewById(Integer.parseInt(attachment.getId())); + View namebar = findViewById(attachment.getViewId()); if (namebar != null && namebar.getParent() != null) ((ViewGroup) namebar.getParent()).removeView(namebar); } @@ -1463,7 +1464,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu toot_space_left.setText("0"); if (attachments != null) { for (Attachment attachment : attachments) { - View namebar = findViewById(Integer.parseInt(attachment.getId())); + View namebar = findViewById(attachment.getViewId()); if (namebar != null && namebar.getParent() != null) ((ViewGroup) namebar.getParent()).removeView(namebar); } @@ -1795,7 +1796,10 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu if (url == null || url.trim().equals("")) url = attachment.getUrl(); final ImageView imageView = new ImageView(PixelfedComposeActivity.this); - imageView.setId(Integer.parseInt(attachment.getId())); + Random rand = new Random(); + int n = rand.nextInt(10000000); + imageView.setId(n); + attachment.setViewId(n); LinearLayout.LayoutParams imParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT); imParams.setMargins(20, 5, 20, 5); diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java index 8dc8f2e1e..6b702a6e8 100644 --- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java @@ -2244,7 +2244,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, toot_space_left.setText("0"); if (attachments != null) { for (Attachment attachment : attachments) { - View namebar = findViewById(Integer.parseInt(attachment.getId())); + View namebar = findViewById(attachment.getViewId()); if (namebar != null && namebar.getParent() != null) ((ViewGroup) namebar.getParent()).removeView(namebar); } @@ -2582,7 +2582,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, toot_space_left.setText("0"); if (attachments != null) { for (Attachment attachment : attachments) { - View namebar = findViewById(Integer.parseInt(attachment.getId())); + View namebar = findViewById(attachment.getViewId()); if (namebar != null && namebar.getParent() != null) ((ViewGroup) namebar.getParent()).removeView(namebar); } @@ -3045,7 +3045,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, if (url == null || url.trim().equals("")) url = attachment.getUrl(); final ImageView imageView = new ImageView(TootActivity.this); - imageView.setId(Integer.parseInt(attachment.getId())); + imageView.setId(attachment.getViewId()); LinearLayout.LayoutParams imParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT); imParams.setMargins(20, 5, 20, 5); @@ -3193,7 +3193,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, if (url == null || url.trim().equals("")) url = attachment.getUrl(); final ImageView imageView = new ImageView(TootActivity.this); - imageView.setId(Integer.parseInt(attachment.getId())); + imageView.setId(attachment.getViewId()); LinearLayout.LayoutParams imParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT); imParams.setMargins(20, 5, 20, 5); 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 f8b31f374..dd4508264 100644 --- a/app/src/main/java/app/fedilab/android/client/API.java +++ b/app/src/main/java/app/fedilab/android/client/API.java @@ -2224,6 +2224,9 @@ public class API { public InstanceNodeInfo displayNodeInfo(String domain) { + if( domain == null) { + return null; + } String response; InstanceNodeInfo instanceNodeInfo = new InstanceNodeInfo(); if (domain.startsWith("http://")) { diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml index 49de64803..14c2d99db 100644 --- a/app/src/main/res/layout-sw600dp/activity_show_account.xml +++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml @@ -26,6 +26,7 @@ android:id="@+id/appBar" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="@color/cyanea_primary_dark" android:fitsSystemWindows="true">