- Fix reports crashes after submitting

- Use full reports for profiles

app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java

@@ -216,7 +216,7 @@ public class ProfileActivity extends BaseActivity {
             });
         } else if (mention_str != null) {
             accountsVM.searchAccounts(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, mention_str, 1, true, false).observe(ProfileActivity.this, accounts -> {
-                if (accounts != null && accounts.size() > 0) {
+                if (accounts != null && !accounts.isEmpty()) {
                     account = accounts.get(0);
                     initializeView(account);
                 } else {
@@ -342,13 +342,13 @@ public class ProfileActivity extends BaseActivity {
         accountListToCheck.add(account.id);
         //Retrieve relation ship
         accountsVM.getRelationships(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, accountListToCheck).observe(ProfileActivity.this, relationShips -> {
-            if (relationShips != null && relationShips.size() > 0) {
+            if (relationShips != null && !relationShips.isEmpty()) {
                 this.relationship = relationShips.get(0);
                 updateAccount();
             }
         });
         accountsVM.getFamiliarFollowers(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, accountListToCheck).observe(ProfileActivity.this, familiarFollowersList -> {
-            if (familiarFollowersList != null && familiarFollowersList.size() > 0) {
+            if (familiarFollowersList != null && !familiarFollowersList.isEmpty()) {
                 this.familiarFollowers = familiarFollowersList.get(0);
                 updateAccount();
             }
@@ -360,7 +360,7 @@ public class ProfileActivity extends BaseActivity {
             updateAccount();
         });
         //Animate emojis
-        if (account.emojis != null && account.emojis.size() > 0) {
+        if (account.emojis != null && !account.emojis.isEmpty()) {
             boolean disableAnimatedEmoji = sharedpreferences.getBoolean(getString(R.string.SET_DISABLE_ANIMATED_EMOJI), false);
             if (!disableAnimatedEmoji) {
                 scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
@@ -527,7 +527,7 @@ public class ProfileActivity extends BaseActivity {
         });
         //Fields for profile
         List<Field> fields = account.fields;
-        if (fields != null && fields.size() > 0) {
+        if (fields != null && !fields.isEmpty()) {
             FieldAdapter fieldAdapter = new FieldAdapter(fields, account);
             binding.fieldsContainer.setAdapter(fieldAdapter);
             binding.fieldsContainer.setLayoutManager(new LinearLayoutManager(ProfileActivity.this));
@@ -701,7 +701,7 @@ public class ProfileActivity extends BaseActivity {
 
         //Manage indentity proofs if not yet displayed
 
-        if (identityProofList != null && identityProofList.size() > 0) {
+        if (identityProofList != null && !identityProofList.isEmpty()) {
             ImageView identity_proofs_indicator = findViewById(R.id.identity_proofs_indicator);
             identity_proofs_indicator.setVisibility(View.VISIBLE);
             //Recyclerview for identity proof has not been inflated yet
@@ -722,7 +722,7 @@ public class ProfileActivity extends BaseActivity {
             }
         }
 
-        if (familiarFollowers != null && familiarFollowers.accounts != null && familiarFollowers.accounts.size() > 0) {
+        if (familiarFollowers != null && familiarFollowers.accounts != null && !familiarFollowers.accounts.isEmpty()) {
             binding.relatedAccounts.removeAllViews();
             for (Account account : familiarFollowers.accounts) {
                 NotificationsRelatedAccountsBinding notificationsRelatedAccountsBinding = NotificationsRelatedAccountsBinding.inflate(LayoutInflater.from(ProfileActivity.this));
@@ -1075,7 +1075,7 @@ public class ProfileActivity extends BaseActivity {
                 String[] codesArr;
                 String[] languagesArr;
                 boolean[] presentArr;
-                if (storedLanguages != null && storedLanguages.size() > 0) {
+                if (storedLanguages != null && !storedLanguages.isEmpty()) {
                     int i = 0;
                     codesArr = new String[storedLanguages.size()];
                     languagesArr = new String[storedLanguages.size()];
@@ -1300,24 +1300,15 @@ public class ProfileActivity extends BaseActivity {
             });
             return true;
         } else if (itemId == R.id.action_report) {
-            AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this);
+            Intent intent = new Intent(ProfileActivity.this, ReportActivity.class);
-            builderInner.setTitle(R.string.report_account);
+            Bundle args = new Bundle();
-            //Text for report
+            args.putSerializable(Helper.ARG_ACCOUNT, account);
-            EditText input = new EditText(ProfileActivity.this);
+            new CachedBundle(ProfileActivity.this).insertBundle(args, Helper.getCurrentAccount(ProfileActivity.this), bundleId -> {
-            LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
+                Bundle bundle = new Bundle();
-                    LinearLayout.LayoutParams.MATCH_PARENT,
+                bundle.putLong(Helper.ARG_INTENT_ID, bundleId);
-                    LinearLayout.LayoutParams.WRAP_CONTENT);
+                intent.putExtras(bundle);
-            input.setLayoutParams(lp);
+                startActivity(intent);
-            builderInner.setView(input);
-            builderInner.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
-            builderInner.setPositiveButton(R.string.yes, (dialog, which) -> {
-                String comment = null;
-                if (input.getText() != null)
-                    comment = input.getText().toString();
-                accountsVM.report(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id, null, null, null, comment, false);
-                dialog.dismiss();
             });
-            builderInner.show();
             return true;
         } else if (itemId == R.id.action_block) {
             AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this);

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java

@@ -342,9 +342,11 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
      */
     public List<String> getCheckedStatusesId() {
         List<String> stringList = new ArrayList<>();
-        for (Status status : timelineStatuses) {
+        if(timelineStatuses != null) {
-            if (status.isChecked) {
+            for (Status status : timelineStatuses) {
-                stringList.add(status.id);
+                if (status.isChecked) {
+                    stringList.add(status.id);
+                }
             }
         }
         return stringList;

app/src/main/res/layouts/mastodon/layout/activity_report.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="@dimen/fab_margin"
+    android:padding="@dimen/fab_margin"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.LinearLayoutCompat