Mastodon/Shitter-android-app
1
0
Fork 0
mirror of https://github.com/nuclearfog/Shitter.git synced 2025-01-30 19:05:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix renamed class

Browse Source
This commit is contained in:
nuclearfog 2022-03-04 20:31:15 +01:00
parent ef1ecdb7fc
commit 8ece0c9d3c
No known key found for this signature in database
GPG Key ID: AA0271FBE406DB98
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -120,7 +120,7 @@
android:windowSoftInputMode="stateHidden" />
<activity
android:name=".activities.UserLists"
android:name=".activities.Userlists"
android:screenOrientation="portrait"
android:theme="@style/AppTheme" />

4
app/src/main/java/org/nuclearfog/twidda/activities/UserProfile.java
View File

@ -16,7 +16,7 @@ import static org.nuclearfog.twidda.activities.UserDetail.KEY_USERDETAIL_ID;
import static org.nuclearfog.twidda.activities.UserDetail.KEY_USERDETAIL_MODE;
import static org.nuclearfog.twidda.activities.UserDetail.USERLIST_FOLLOWER;
import static org.nuclearfog.twidda.activities.UserDetail.USERLIST_FRIENDS;
import static org.nuclearfog.twidda.activities.UserLists.KEY_USERLIST_OWNER_ID;
import static org.nuclearfog.twidda.activities.Userlists.KEY_USERLIST_OWNER_ID;
import static org.nuclearfog.twidda.backend.UserAction.Action.ACTION_BLOCK;
import static org.nuclearfog.twidda.backend.UserAction.Action.ACTION_FOLLOW;
import static org.nuclearfog.twidda.backend.UserAction.Action.ACTION_MUTE;
@ -406,7 +406,7 @@ public class UserProfile extends AppCompatActivity implements OnClickListener, O
}
// open users list
else if (item.getItemId() == R.id.profile_lists) {
Intent listPage = new Intent(this, UserLists.class);
Intent listPage = new Intent(this, Userlists.class);
listPage.putExtra(KEY_USERLIST_OWNER_ID, user.getId());
startActivity(listPage);
}

2
app/src/main/java/org/nuclearfog/twidda/activities/UserLists.java → app/src/main/java/org/nuclearfog/twidda/activities/Userlists.java
View File

@ -25,7 +25,7 @@ import org.nuclearfog.twidda.database.GlobalSettings;
*
* @author nuclearfog
*/
public class UserLists extends AppCompatActivity implements TabLayout.OnTabSelectedListener {
public class Userlists extends AppCompatActivity implements TabLayout.OnTabSelectedListener {
/**
* Key for the ID the list owner

6
app/src/main/java/org/nuclearfog/twidda/backend/LinkLoader.java
View File

@ -4,7 +4,7 @@ import static org.nuclearfog.twidda.activities.SearchPage.KEY_SEARCH_QUERY;
import static org.nuclearfog.twidda.activities.TweetActivity.KEY_TWEET_ID;
import static org.nuclearfog.twidda.activities.TweetActivity.KEY_TWEET_NAME;
import static org.nuclearfog.twidda.activities.TweetEditor.KEY_TWEETPOPUP_TEXT;
import static org.nuclearfog.twidda.activities.UserLists.KEY_USERLIST_OWNER_NAME;
import static org.nuclearfog.twidda.activities.Userlists.KEY_USERLIST_OWNER_NAME;
import static org.nuclearfog.twidda.activities.UserProfile.KEY_PROFILE_DATA;
import static org.nuclearfog.twidda.activities.UserProfile.KEY_PROFILE_DISABLE_RELOAD;
import static org.nuclearfog.twidda.activities.UserlistActivity.KEY_LIST_ID;
@ -21,7 +21,7 @@ import org.nuclearfog.twidda.activities.MainActivity;
import org.nuclearfog.twidda.activities.SearchPage;
import org.nuclearfog.twidda.activities.TweetActivity;
import org.nuclearfog.twidda.activities.TweetEditor;
import org.nuclearfog.twidda.activities.UserLists;
import org.nuclearfog.twidda.activities.Userlists;
import org.nuclearfog.twidda.activities.UserProfile;
import org.nuclearfog.twidda.activities.UserlistActivity;
import org.nuclearfog.twidda.backend.api.Twitter;
@ -147,7 +147,7 @@ public class LinkLoader extends AsyncTask<Uri, Void, LinkLoader.DataHolder> {
// show userlists
else if (USERLISTS_PATH.matcher(path).matches()) {
data.putString(KEY_USERLIST_OWNER_NAME, username);
dataHolder = new DataHolder(data, UserLists.class);
dataHolder = new DataHolder(data, Userlists.class);
}
}
}

7
app/src/main/java/org/nuclearfog/twidda/database/TweetImpl.java
View File

@ -48,7 +48,7 @@ class TweetImpl implements Tweet {
private String text;
private String source;
private String userMentions;
private String[] mediaLinks;
private String[] mediaLinks = {};
private boolean retweeted;
private boolean favorited;
private boolean sensitive;
@ -74,8 +74,9 @@ class TweetImpl implements Tweet {
favorited = (tweetRegister & FAV_MASK) != 0;
retweeted = (tweetRegister & RTW_MASK) != 0;
sensitive = (tweetRegister & MEDIA_SENS_MASK) != 0;
mediaLinks = SEPARATOR.split(linkStr);
userMentions = StringTools.getUserMentions(text, "");
if (!linkStr.isEmpty())
mediaLinks = SEPARATOR.split(linkStr);
userMentions = StringTools.getUserMentions(text, author.getScreenname());
// get media type
if ((tweetRegister & MEDIA_ANGIF_MASK) == MEDIA_ANGIF_MASK) {
mediaType = MEDIA_GIF;

2
app/src/main/res/layout/page_list.xml
View File

@ -6,7 +6,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activities.UserLists">
tools:context=".activities.Userlists">
<androidx.appcompat.widget.Toolbar
android:id="@+id/list_toolbar"