From f21a1cee643ff9881138eda939f9c69fb68d5f3d Mon Sep 17 00:00:00 2001 From: NudeDude Date: Wed, 12 Jun 2019 20:52:18 +0200 Subject: [PATCH] bug fix --- .../twidda/backend/ProfileEditor.java | 38 +++++++------- .../twidda/backend/ProfileLoader.java | 5 +- .../twidda/backend/StatusLoader.java | 5 +- .../twidda/backend/StatusUploader.java | 52 +++++++++---------- .../fragment/backend/MessageLoader.java | 5 +- .../twidda/fragment/backend/TrendLoader.java | 25 ++++----- .../twidda/fragment/backend/TweetLoader.java | 5 +- .../twidda/fragment/backend/UserLoader.java | 5 +- .../nuclearfog/twidda/window/MediaViewer.java | 21 ++++---- app/src/main/res/layout/page_media.xml | 3 +- 10 files changed, 84 insertions(+), 80 deletions(-) diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileEditor.java b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileEditor.java index 498ddbdc..ffb7390b 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileEditor.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileEditor.java @@ -14,6 +14,7 @@ import android.widget.ProgressBar; import android.widget.Toast; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.squareup.picasso.Picasso; @@ -70,25 +71,24 @@ public class ProfileEditor extends AsyncTask { @Override protected void onPreExecute() { - if (popup.get() == null || ui.get() == null) return; - - Dialog window = popup.get(); - window.requestWindowFeature(Window.FEATURE_NO_TITLE); - window.setCanceledOnTouchOutside(false); - window.setContentView(new ProgressBar(ui.get())); - if (window.getWindow() != null) - window.getWindow().setBackgroundDrawableResource(android.R.color.transparent); - - window.setOnDismissListener(new DialogInterface.OnDismissListener() { - @Override - public void onDismiss(DialogInterface dialog) { - if (getStatus() == Status.RUNNING) { - cancel(true); - ui.get().finish(); + if (popup.get() != null && ui.get() != null) { + Dialog window = popup.get(); + window.requestWindowFeature(Window.FEATURE_NO_TITLE); + window.setCanceledOnTouchOutside(false); + window.setContentView(new ProgressBar(ui.get())); + if (window.getWindow() != null) + window.getWindow().setBackgroundDrawableResource(android.R.color.transparent); + window.setOnDismissListener(new DialogInterface.OnDismissListener() { + @Override + public void onDismiss(DialogInterface dialog) { + if (getStatus() == Status.RUNNING) { + cancel(true); + ui.get().finish(); + } } - } - }); - window.show(); + }); + window.show(); + } } @@ -124,7 +124,7 @@ public class ProfileEditor extends AsyncTask { @Override - protected void onPostExecute(TwitterUser user) { + protected void onPostExecute(@Nullable TwitterUser user) { if (ui.get() != null && popup.get() != null) { if (user != null) { switch (mode) { diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java index 1918cf6d..c1a90b69 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java @@ -10,6 +10,7 @@ import android.widget.TextView; import android.widget.Toast; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.squareup.picasso.Picasso; @@ -137,7 +138,7 @@ public class ProfileLoader extends AsyncTask { @Override - protected void onProgressUpdate(TwitterUser[] users) { + protected void onProgressUpdate(@NonNull TwitterUser[] users) { if (ui.get() != null) { final TwitterUser user = users[0]; @@ -217,7 +218,7 @@ public class ProfileLoader extends AsyncTask { @Override - protected void onPostExecute(TwitterUser user) { + protected void onPostExecute(@Nullable TwitterUser user) { if (ui.get() != null) { if (user != null) { switch (mode) { diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java index ee508292..f6806607 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java @@ -12,6 +12,7 @@ import android.widget.TextView; import android.widget.Toast; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.squareup.picasso.Picasso; @@ -124,7 +125,7 @@ public class StatusLoader extends AsyncTask { @Override - protected void onProgressUpdate(Tweet[] tweets) { + protected void onProgressUpdate(@NonNull Tweet[] tweets) { if (ui.get() != null) { TextView username = ui.get().findViewById(R.id.usernamedetail); TextView scrName = ui.get().findViewById(R.id.scrnamedetail); @@ -273,7 +274,7 @@ public class StatusLoader extends AsyncTask { @Override - protected void onPostExecute(Tweet tweet) { + protected void onPostExecute(@Nullable Tweet tweet) { if (ui.get() != null) { if (tweet != null) { switch (mode) { diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/StatusUploader.java b/app/src/main/java/org/nuclearfog/twidda/backend/StatusUploader.java index 1d5b12b8..781f817a 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusUploader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusUploader.java @@ -39,34 +39,34 @@ public class StatusUploader extends AsyncTask { @Override protected void onPreExecute() { - if (popup.get() == null || ui.get() == null) return; + if (popup.get() != null && ui.get() != null) { + final Dialog window = popup.get(); + window.requestWindowFeature(Window.FEATURE_NO_TITLE); + window.setCanceledOnTouchOutside(false); + if (window.getWindow() != null) + window.getWindow().setBackgroundDrawableResource(android.R.color.transparent); + LayoutInflater inflater = LayoutInflater.from(ui.get()); + View load = inflater.inflate(R.layout.item_load, null, false); + View cancelButton = load.findViewById(R.id.kill_button); + window.setContentView(load); - final Dialog window = popup.get(); - window.requestWindowFeature(Window.FEATURE_NO_TITLE); - window.setCanceledOnTouchOutside(false); - if (window.getWindow() != null) - window.getWindow().setBackgroundDrawableResource(android.R.color.transparent); - LayoutInflater inflater = LayoutInflater.from(ui.get()); - View load = inflater.inflate(R.layout.item_load, null, false); - View cancelButton = load.findViewById(R.id.kill_button); - window.setContentView(load); - - cancelButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - window.dismiss(); - } - }); - window.setOnDismissListener(new DialogInterface.OnDismissListener() { - @Override - public void onDismiss(DialogInterface dialog) { - if (getStatus() == Status.RUNNING) { - Toast.makeText(ui.get(), R.string.abort, Toast.LENGTH_SHORT).show(); - cancel(true); + cancelButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + window.dismiss(); } - } - }); - window.show(); + }); + window.setOnDismissListener(new DialogInterface.OnDismissListener() { + @Override + public void onDismiss(DialogInterface dialog) { + if (getStatus() == Status.RUNNING) { + Toast.makeText(ui.get(), R.string.abort, Toast.LENGTH_SHORT).show(); + cancel(true); + } + } + }); + window.show(); + } } diff --git a/app/src/main/java/org/nuclearfog/twidda/fragment/backend/MessageLoader.java b/app/src/main/java/org/nuclearfog/twidda/fragment/backend/MessageLoader.java index a43086b2..7d8afa31 100644 --- a/app/src/main/java/org/nuclearfog/twidda/fragment/backend/MessageLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/fragment/backend/MessageLoader.java @@ -4,6 +4,7 @@ import android.os.AsyncTask; import android.view.View; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -98,7 +99,7 @@ public class MessageLoader extends AsyncTask> { @Override - protected void onPostExecute(List messages) { + protected void onPostExecute(@Nullable List messages) { if (ui.get() != null) { if (messages != null) { adapter.setData(messages); @@ -122,7 +123,7 @@ public class MessageLoader extends AsyncTask> { @Override - protected void onCancelled(List messages) { + protected void onCancelled(@Nullable List messages) { if (ui.get() != null) { if (messages != null) { adapter.setData(messages); diff --git a/app/src/main/java/org/nuclearfog/twidda/fragment/backend/TrendLoader.java b/app/src/main/java/org/nuclearfog/twidda/fragment/backend/TrendLoader.java index 0c381cc6..ab860626 100644 --- a/app/src/main/java/org/nuclearfog/twidda/fragment/backend/TrendLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/fragment/backend/TrendLoader.java @@ -4,6 +4,7 @@ import android.os.AsyncTask; import android.view.View; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -81,18 +82,18 @@ public class TrendLoader extends AsyncTask> { @Override - protected void onPostExecute(List trends) { - if (ui.get() == null) - return; - if (trends != null) { - adapter.setData(trends); - adapter.notifyDataSetChanged(); - } else { - if (err != null) - ErrorHandler.printError(ui.get().getContext(), err); + protected void onPostExecute(@Nullable List trends) { + if (ui.get() != null) { + if (trends != null) { + adapter.setData(trends); + adapter.notifyDataSetChanged(); + } else { + if (err != null) + ErrorHandler.printError(ui.get().getContext(), err); + } + SwipeRefreshLayout reload = ui.get().findViewById(R.id.fragment_reload); + reload.setRefreshing(false); } - SwipeRefreshLayout reload = ui.get().findViewById(R.id.fragment_reload); - reload.setRefreshing(false); } @@ -106,7 +107,7 @@ public class TrendLoader extends AsyncTask> { @Override - protected void onCancelled(List trends) { + protected void onCancelled(@Nullable List trends) { if (ui.get() != null) { if (trends != null) { adapter.setData(trends); diff --git a/app/src/main/java/org/nuclearfog/twidda/fragment/backend/TweetLoader.java b/app/src/main/java/org/nuclearfog/twidda/fragment/backend/TweetLoader.java index dbb5c9a5..8ff073c4 100644 --- a/app/src/main/java/org/nuclearfog/twidda/fragment/backend/TweetLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/fragment/backend/TweetLoader.java @@ -4,6 +4,7 @@ import android.os.AsyncTask; import android.view.View; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -176,7 +177,7 @@ public class TweetLoader extends AsyncTask> { @Override - protected void onPostExecute(List tweets) { + protected void onPostExecute(@Nullable List tweets) { if (ui.get() != null) { if (tweets != null) { adapter.setData(tweets); @@ -201,7 +202,7 @@ public class TweetLoader extends AsyncTask> { @Override - protected void onCancelled(List tweets) { + protected void onCancelled(@Nullable List tweets) { if (ui.get() != null) { if (tweets != null) { adapter.setData(tweets); diff --git a/app/src/main/java/org/nuclearfog/twidda/fragment/backend/UserLoader.java b/app/src/main/java/org/nuclearfog/twidda/fragment/backend/UserLoader.java index c55b7909..93d72cb9 100644 --- a/app/src/main/java/org/nuclearfog/twidda/fragment/backend/UserLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/fragment/backend/UserLoader.java @@ -4,6 +4,7 @@ import android.os.AsyncTask; import android.view.View; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -94,7 +95,7 @@ public class UserLoader extends AsyncTask> { @Override - protected void onPostExecute(List users) { + protected void onPostExecute(@Nullable List users) { if (ui.get() != null) { if (users != null) { adapter.setData(users); @@ -119,7 +120,7 @@ public class UserLoader extends AsyncTask> { @Override - protected void onCancelled(List users) { + protected void onCancelled(@Nullable List users) { if (ui.get() != null) { if (users != null) { adapter.setData(users); diff --git a/app/src/main/java/org/nuclearfog/twidda/window/MediaViewer.java b/app/src/main/java/org/nuclearfog/twidda/window/MediaViewer.java index 95d0ab47..bb846239 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/MediaViewer.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/MediaViewer.java @@ -155,7 +155,6 @@ public class MediaViewer extends AppCompatActivity implements OnImageClickListen case VIDEO: case ANGIF: case VIDEO_STORAGE: - video_progress.setVisibility(VISIBLE); videoView.start(); break; } @@ -215,21 +214,21 @@ public class MediaViewer extends AppCompatActivity implements OnImageClickListen case VIDEO: case VIDEO_STORAGE: - mp.setOnInfoListener(new OnInfoListener() { - @Override - public boolean onInfo(MediaPlayer mp, int what, int extra) { - if (what == MEDIA_INFO_VIDEO_RENDERING_START) { - video_progress.setVisibility(INVISIBLE); - return true; - } - return false; - } - }); videoController.show(0); mp.seekTo(lastPos); mp.start(); break; } + mp.setOnInfoListener(new OnInfoListener() { + @Override + public boolean onInfo(MediaPlayer mp, int what, int extra) { + if (what == MEDIA_INFO_VIDEO_RENDERING_START) { + video_progress.setVisibility(INVISIBLE); + return true; + } + return false; + } + }); } diff --git a/app/src/main/res/layout/page_media.xml b/app/src/main/res/layout/page_media.xml index 9a1dae81..5948fd9e 100644 --- a/app/src/main/res/layout/page_media.xml +++ b/app/src/main/res/layout/page_media.xml @@ -50,8 +50,7 @@ android:id="@+id/video_load" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" - android:visibility="invisible" /> + android:layout_gravity="center" />