From 8a9b503484deee86a92fef359d38dd3017f3d8a6 Mon Sep 17 00:00:00 2001 From: NudeDude Date: Sun, 14 Apr 2019 09:28:31 +0200 Subject: [PATCH] added exception for activity bundle --- .../org/nuclearfog/twidda/backend/ProfileEditor.java | 1 + .../org/nuclearfog/twidda/backend/ProfileLoader.java | 1 + .../java/org/nuclearfog/twidda/backend/StatusLoader.java | 1 - .../java/org/nuclearfog/twidda/window/ImageDetail.java | 9 ++++++--- .../java/org/nuclearfog/twidda/window/MessagePopup.java | 9 +++++++-- .../java/org/nuclearfog/twidda/window/ProfileEdit.java | 1 + .../java/org/nuclearfog/twidda/window/SearchPage.java | 6 +++++- .../java/org/nuclearfog/twidda/window/TweetDetail.java | 5 ++++- .../java/org/nuclearfog/twidda/window/TweetPopup.java | 3 +++ .../java/org/nuclearfog/twidda/window/UserDetail.java | 3 +++ .../java/org/nuclearfog/twidda/window/UserProfile.java | 3 +++ 11 files changed, 34 insertions(+), 8 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 a8587f59..e7af28a6 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileEditor.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileEditor.java @@ -150,6 +150,7 @@ public class ProfileEditor extends AsyncTask { public void onClick(View v) { Intent image = new Intent(ui.get(), ImageDetail.class); image.putExtra("link", mediaLink); + image.putExtra("storable", false); ui.get().startActivity(image); } }); 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 4dbb1c48..d448b83d 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java @@ -299,6 +299,7 @@ public class ProfileLoader extends AsyncTask { public void onClick(View v) { Intent image = new Intent(ui.get(), ImageDetail.class); image.putExtra("link", new String[]{user.getImageLink()}); + image.putExtra("storable", true); ui.get().startActivity(image); } 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 d6d15329..737d6517 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java @@ -253,7 +253,6 @@ public class StatusLoader extends AsyncTask { public void onClick(View v) { Intent intent = new Intent(ui.get(), TweetDetail.class); intent.putExtra("tweetID", tweet.getReplyId()); - intent.putExtra("userID", tweet.getReplyUserId()); intent.putExtra("username", tweet.getReplyName()); ui.get().startActivity(intent); } diff --git a/app/src/main/java/org/nuclearfog/twidda/window/ImageDetail.java b/app/src/main/java/org/nuclearfog/twidda/window/ImageDetail.java index 96c1e318..23da7be2 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/ImageDetail.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/ImageDetail.java @@ -11,6 +11,7 @@ import android.support.v7.widget.RecyclerView; import android.view.Display; import android.widget.Toast; +import org.nuclearfog.twidda.BuildConfig; import org.nuclearfog.twidda.R; import org.nuclearfog.twidda.adapter.ImageAdapter; import org.nuclearfog.twidda.adapter.ImageAdapter.OnImageClickListener; @@ -34,12 +35,13 @@ import static android.support.v7.widget.LinearLayoutManager.HORIZONTAL; */ public class ImageDetail extends AppCompatActivity implements OnImageClickListener { - boolean storable = true; + boolean storable; private ImageLoader imageAsync; private ZoomView zoomImage; private String link[]; private int width; + @Override protected void onCreate(Bundle b) { super.onCreate(b); @@ -47,9 +49,10 @@ public class ImageDetail extends AppCompatActivity implements OnImageClickListen Bundle param = getIntent().getExtras(); if (param != null) { + if (BuildConfig.DEBUG && param.size() != 2) + throw new AssertionError(); link = param.getStringArray("link"); - if (param.containsKey("storable")) - storable = param.getBoolean("storable"); + storable = param.getBoolean("storable"); } zoomImage = findViewById(R.id.image_full); diff --git a/app/src/main/java/org/nuclearfog/twidda/window/MessagePopup.java b/app/src/main/java/org/nuclearfog/twidda/window/MessagePopup.java index d71b2040..93128524 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/MessagePopup.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/MessagePopup.java @@ -15,6 +15,7 @@ import android.view.View; import android.widget.EditText; import android.widget.Toast; +import org.nuclearfog.twidda.BuildConfig; import org.nuclearfog.twidda.R; import org.nuclearfog.twidda.backend.MessageUpload; import org.nuclearfog.twidda.database.GlobalSettings; @@ -40,8 +41,12 @@ public class MessagePopup extends AppCompatActivity implements View.OnClickListe setContentView(R.layout.popup_dm); String username = ""; Bundle param = getIntent().getExtras(); - if (param != null && param.containsKey("username")) - username = param.getString("username"); + if (param != null) { + if (BuildConfig.DEBUG && param.size() > 1) + throw new AssertionError(); + if (param.containsKey("username")) + username = param.getString("username"); + } View root = findViewById(R.id.dm_popup); View send = findViewById(R.id.dm_send); diff --git a/app/src/main/java/org/nuclearfog/twidda/window/ProfileEdit.java b/app/src/main/java/org/nuclearfog/twidda/window/ProfileEdit.java index 90578cf6..912f9fa1 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/ProfileEdit.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/ProfileEdit.java @@ -37,6 +37,7 @@ public class ProfileEdit extends AppCompatActivity implements View.OnClickListen private ProfileEditor editorAsync; private TextView txtImg; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java b/app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java index bd784514..a94041b6 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java @@ -18,6 +18,7 @@ import android.view.animation.TranslateAnimation; import android.widget.TabHost; import android.widget.TabHost.OnTabChangeListener; +import org.nuclearfog.twidda.BuildConfig; import org.nuclearfog.twidda.R; import org.nuclearfog.twidda.adapter.OnItemClickListener; import org.nuclearfog.twidda.adapter.TimelineAdapter; @@ -59,8 +60,11 @@ public class SearchPage extends AppCompatActivity implements OnRefreshListener, getSupportActionBar().setDisplayShowTitleEnabled(false); Bundle param = getIntent().getExtras(); - if (param != null) + if (param != null) { + if (BuildConfig.DEBUG && param.size() != 1) + throw new AssertionError(); search = param.getString("search"); + } View root = findViewById(R.id.search_layout); tweetSearch = findViewById(R.id.tweet_result); diff --git a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java index 8e980005..4ef0d645 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java @@ -24,6 +24,7 @@ import android.widget.TextView; import android.widget.Toast; import org.nuclearfog.tag.Tagger.OnTagClickListener; +import org.nuclearfog.twidda.BuildConfig; import org.nuclearfog.twidda.MainActivity; import org.nuclearfog.twidda.R; import org.nuclearfog.twidda.adapter.OnItemClickListener; @@ -76,6 +77,8 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, getTweet(link.getPath()); } else if (param != null) { + if (BuildConfig.DEBUG && param.size() != 2) + throw new AssertionError(); tweetID = param.getLong("tweetID"); username = param.getString("username"); } @@ -264,7 +267,6 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, Tweet tweet = answerAdapter.getData(position); Intent intent = new Intent(this, TweetDetail.class); intent.putExtra("tweetID", tweet.getId()); - intent.putExtra("userID", tweet.getUser().getId()); intent.putExtra("username", tweet.getUser().getScreenname()); startActivityForResult(intent, TWEET); } @@ -281,6 +283,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, public void imageClick(String mediaLinks[]) { Intent image = new Intent(this, ImageDetail.class); image.putExtra("link", mediaLinks); + image.putExtra("storable", true); startActivity(image); } diff --git a/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java b/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java index 659c0e77..7c300df6 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java @@ -15,6 +15,7 @@ import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; +import org.nuclearfog.twidda.BuildConfig; import org.nuclearfog.twidda.R; import org.nuclearfog.twidda.backend.StatusUploader; import org.nuclearfog.twidda.database.GlobalSettings; @@ -52,6 +53,8 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener { Bundle param = getIntent().getExtras(); if (param != null) { + if (BuildConfig.DEBUG && param.size() > 2) + throw new AssertionError(); if (param.containsKey("TweetID")) inReplyId = param.getLong("TweetID"); if (param.containsKey("Addition")) diff --git a/app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java b/app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java index dca94a21..3d566a04 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java @@ -10,6 +10,7 @@ import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; import android.view.View; +import org.nuclearfog.twidda.BuildConfig; import org.nuclearfog.twidda.R; import org.nuclearfog.twidda.adapter.OnItemClickListener; import org.nuclearfog.twidda.adapter.UserAdapter; @@ -46,6 +47,8 @@ public class UserDetail extends AppCompatActivity implements OnItemClickListener Bundle param = getIntent().getExtras(); if (param != null) { + if (BuildConfig.DEBUG && param.size() != 2) + throw new AssertionError(); mode = param.getInt("mode"); id = param.getLong("ID"); } diff --git a/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java b/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java index 29190885..71a638aa 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java @@ -22,6 +22,7 @@ import android.widget.TabHost.OnTabChangeListener; import android.widget.TextView; import org.nuclearfog.tag.Tagger.OnTagClickListener; +import org.nuclearfog.twidda.BuildConfig; import org.nuclearfog.twidda.R; import org.nuclearfog.twidda.adapter.OnItemClickListener; import org.nuclearfog.twidda.adapter.TimelineAdapter; @@ -71,6 +72,8 @@ public class UserProfile extends AppCompatActivity implements OnRefreshListener, Bundle param = getIntent().getExtras(); if (param != null) { + if (BuildConfig.DEBUG && param.size() != 2) + throw new AssertionError(); userId = param.getLong("userID"); username = param.getString("username"); }