From a498ec369f5eae6f8448d094d56a0fcd532f0d3e Mon Sep 17 00:00:00 2001 From: nuclearfog Date: Thu, 20 Oct 2022 20:19:07 +0200 Subject: [PATCH] bug fix, code cleanup, drawable fix, style fix --- .../backend/api/update/ProfileUpdate.java | 7 ++++-- .../twidda/ui/activities/UsersActivity.java | 24 +++++++++++-------- .../main/res/drawable/follower_request.xml | 4 ++-- .../main/res/drawable/following_request.xml | 4 ++-- app/src/main/res/drawable/no_banner.xml | 1 - app/src/main/res/drawable/no_image.xml | 1 - app/src/main/res/layout/page_image.xml | 1 - app/src/main/res/layout/page_metrics.xml | 1 - app/src/main/res/layout/page_video.xml | 1 - app/src/main/res/values/dimens.xml | 1 - .../res/values/ic_launcher_background.xml | 4 ---- app/src/main/res/values/styles.xml | 2 -- 12 files changed, 23 insertions(+), 28 deletions(-) delete mode 100644 app/src/main/res/values/ic_launcher_background.xml diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/update/ProfileUpdate.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/update/ProfileUpdate.java index 1f71d491..e3b68f87 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/api/update/ProfileUpdate.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/update/ProfileUpdate.java @@ -1,5 +1,6 @@ package org.nuclearfog.twidda.backend.api.update; +import android.annotation.SuppressLint; import android.content.ContentResolver; import android.content.Context; import android.net.Uri; @@ -125,15 +126,17 @@ public class ProfileUpdate { } /** - * initialize inputstreams of the image files + * initialize input streams of the image files + * streams must be closed calling {@link #close()} * * @return true if initialization finished without any error */ + @SuppressLint("Recycle") public boolean prepare(ContentResolver resolver) { try { for (int i = 0; i < imageUrls.length; i++) { if (imageUrls[i] != null) { - InputStream profileImgStream = resolver.openInputStream(imageUrls[i]); + InputStream profileImgStream = resolver.openInputStream(imageUrls[i]); if (profileImgStream != null && profileImgStream.available() > 0) { this.imageStreams[i] = profileImgStream; } else { diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/activities/UsersActivity.java b/app/src/main/java/org/nuclearfog/twidda/ui/activities/UsersActivity.java index 3739bf00..fadc29c5 100644 --- a/app/src/main/java/org/nuclearfog/twidda/ui/activities/UsersActivity.java +++ b/app/src/main/java/org/nuclearfog/twidda/ui/activities/UsersActivity.java @@ -100,6 +100,8 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis private Toolbar toolbar; private TabLayout tablayout; + private int mode; + @Override protected void attachBaseContext(Context newBase) { super.attachBaseContext(AppStyles.setFontScale(newBase)); @@ -120,7 +122,7 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis settings = GlobalSettings.getInstance(this); - int mode = getIntent().getIntExtra(KEY_USERDETAIL_MODE, 0); + mode = getIntent().getIntExtra(KEY_USERDETAIL_MODE, 0); long id = getIntent().getLongExtra(KEY_USERDETAIL_ID, -1); switch (mode) { @@ -178,7 +180,6 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis @Override public boolean onCreateOptionsMenu(@NonNull Menu m) { - int mode = getIntent().getIntExtra(KEY_USERDETAIL_MODE, 0); if (mode == USERLIST_EXCLUDED_USERS) { getMenuInflater().inflate(R.menu.excludelist, m); MenuItem search = m.findItem(R.id.menu_exclude_user); @@ -195,15 +196,18 @@ public class UsersActivity extends AppCompatActivity implements OnTabSelectedLis @Override public boolean onPrepareOptionsMenu(Menu m) { - SearchView searchView = (SearchView) m.findItem(R.id.menu_exclude_user).getActionView(); - if (tablayout.getSelectedTabPosition() == 0) { - String hint = getString(R.string.menu_hint_mute_user); - searchView.setQueryHint(hint); - } else if (tablayout.getSelectedTabPosition() == 1) { - String hint = getString(R.string.menu_hint_block_user); - searchView.setQueryHint(hint); + if (mode == USERLIST_EXCLUDED_USERS) { + SearchView searchView = (SearchView) m.findItem(R.id.menu_exclude_user).getActionView(); + if (tablayout.getSelectedTabPosition() == 0) { + String hint = getString(R.string.menu_hint_mute_user); + searchView.setQueryHint(hint); + } else if (tablayout.getSelectedTabPosition() == 1) { + String hint = getString(R.string.menu_hint_block_user); + searchView.setQueryHint(hint); + } + return super.onPrepareOptionsMenu(m); } - return super.onPrepareOptionsMenu(m); + return false; } diff --git a/app/src/main/res/drawable/follower_request.xml b/app/src/main/res/drawable/follower_request.xml index 5a155458..9a6d6ff1 100644 --- a/app/src/main/res/drawable/follower_request.xml +++ b/app/src/main/res/drawable/follower_request.xml @@ -1,6 +1,6 @@ - - diff --git a/app/src/main/res/layout/page_video.xml b/app/src/main/res/layout/page_video.xml index 1594d6c2..39bc260d 100644 --- a/app/src/main/res/layout/page_video.xml +++ b/app/src/main/res/layout/page_video.xml @@ -4,7 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/half_transparent" tools:context=".ui.activities.VideoViewer"> 36sp 5dp - 5dp 5dp 5dp 12sp diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml deleted file mode 100644 index 15290b9b..00000000 --- a/app/src/main/res/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #FFA500 - \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d55c4fb5..f9ea76a5 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -12,8 +12,6 @@