Mastodon/Shitter-android-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
NudeDude 2018-08-16 21:00:49 +02:00
parent eca6fb718d
commit be101c5fd7
10 changed files with 34 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/nuclearfog/twidda/MainActivity.java
View File

@ -255,7 +255,7 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
} }
@Override @Override
public void onItemClick(View v, ViewGroup parent, int position) { public void onItemClick(ViewGroup parent, int position) {
switch(parent.getId()) { switch(parent.getId()) {
case R.id.tl_list: case R.id.tl_list:
if(!timelineReload.isRefreshing()) { if(!timelineReload.isRefreshing()) {

41
app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java
View File

@ -30,13 +30,20 @@ import twitter4j.TwitterException;
public class ProfileLoader extends AsyncTask<Long,Void,Long> { public class ProfileLoader extends AsyncTask<Long,Void,Long> {
public static final long GET_INFORMATION = 0; //Profilinformation // GET INFORMATION
public static final long ACTION_FOLLOW = 1; // Folgen/Entfolgen public static final long GET_INF = 0;
public static final long GET_TWEETS = 2; // Tweets Laden public static final long LOAD_DB = 1;
public static final long GET_FAVS = 3; // Favoriten Laden
// GET USER TWEETS
public static final long GET_TWEETS = 2;
public static final long GET_FAVORS = 3;
// USER ACTION
public static final long ACTION_FOLLOW = 6;
public static final long ACTION_BLOCK = 4; public static final long ACTION_BLOCK = 4;
public static final long ACTION_MUTE = 5; public static final long ACTION_MUTE = 5;
public static final long LOAD_DB = 6;
// INTERN FLAGS
private static final long FAILURE = 7; private static final long FAILURE = 7;
private static final long IGNORE = 8; private static final long IGNORE = 8;
@ -102,7 +109,7 @@ public class ProfileLoader extends AsyncTask<Long,Void,Long> {
long id = 1L; long id = 1L;
try { try {
isHome = homeId == userId; isHome = homeId == userId;
if (!isHome && (MODE == ACTION_FOLLOW || MODE == ACTION_BLOCK || MODE == ACTION_MUTE || MODE == GET_INFORMATION)) if (!isHome && (MODE == ACTION_FOLLOW || MODE == ACTION_BLOCK || MODE == ACTION_MUTE || MODE == GET_INF))
{ {
boolean connection[] = mTwitter.getConnection(userId); boolean connection[] = mTwitter.getConnection(userId);
isFollowing = connection[0]; isFollowing = connection[0];
@ -112,7 +119,7 @@ public class ProfileLoader extends AsyncTask<Long,Void,Long> {
} }
TwitterUser user; TwitterUser user;
if(MODE == GET_INFORMATION) { if (MODE == GET_INF) {
user = mTwitter.getUser(userId); user = mTwitter.getUser(userId);
database.storeUser(user); database.storeUser(user);
} else { } else {
@ -137,7 +144,6 @@ public class ProfileLoader extends AsyncTask<Long,Void,Long> {
if (MODE == GET_TWEETS && !isLocked) if (MODE == GET_TWEETS && !isLocked)
{ {
List<Tweet> tweets; List<Tweet> tweets;
if(homeTl.getItemCount() > 0) { if(homeTl.getItemCount() > 0) {
id = homeTl.getItemId(0); id = homeTl.getItemId(0);
tweets = mTwitter.getUserTweets(userId,args[2],id); tweets = mTwitter.getUserTweets(userId,args[2],id);
@ -151,7 +157,7 @@ public class ProfileLoader extends AsyncTask<Long,Void,Long> {
} }
} }
homeTl.setData(tweets); homeTl.setData(tweets);
} else if (MODE == GET_FAVS && !isLocked) } else if (MODE == GET_FAVORS && !isLocked)
{ {
List<Tweet> favorits; List<Tweet> favorits;
if(homeFav.getItemCount() > 0) { if(homeFav.getItemCount() > 0) {
@ -203,8 +209,7 @@ public class ProfileLoader extends AsyncTask<Long,Void,Long> {
final UserProfile connect = ui.get(); final UserProfile connect = ui.get();
if(connect == null) if(connect == null)
return; return;
if (mode == GET_INF || mode == LOAD_DB) {
if(mode == GET_INFORMATION || mode == LOAD_DB) {
TextView txtUser = connect.findViewById(R.id.profile_username); TextView txtUser = connect.findViewById(R.id.profile_username);
TextView txtScrName = connect.findViewById(R.id.profile_screenname); TextView txtScrName = connect.findViewById(R.id.profile_screenname);
TextView txtBio = connect.findViewById(R.id.bio); TextView txtBio = connect.findViewById(R.id.bio);
@ -250,18 +255,14 @@ public class ProfileLoader extends AsyncTask<Long,Void,Long> {
} }
}); });
} }
} } else if (mode == GET_TWEETS) {
else if(mode == GET_TWEETS)
{
homeTl.notifyDataSetChanged(); homeTl.notifyDataSetChanged();
SwipeRefreshLayout tweetsReload = connect.findViewById(R.id.hometweets); SwipeRefreshLayout tweetsReload = connect.findViewById(R.id.hometweets);
tweetsReload.setRefreshing(false); tweetsReload.setRefreshing(false);
} } else if (mode == GET_FAVORS) {
else if(mode == GET_FAVS)
{
homeFav.notifyDataSetChanged(); homeFav.notifyDataSetChanged();
SwipeRefreshLayout favoritsReload = connect.findViewById(R.id.homefavorits); SwipeRefreshLayout favorReload = connect.findViewById(R.id.homefavorits);
favoritsReload.setRefreshing(false); favorReload.setRefreshing(false);
} }
else if(mode == ACTION_FOLLOW) { else if(mode == ACTION_FOLLOW) {
int textId; int textId;
@ -296,7 +297,7 @@ public class ProfileLoader extends AsyncTask<Long,Void,Long> {
Toast.makeText(connect, errMsg, Toast.LENGTH_LONG).show(); Toast.makeText(connect, errMsg, Toast.LENGTH_LONG).show();
} }
} }
if (!isHome && (mode == ACTION_FOLLOW || mode == ACTION_BLOCK || mode == ACTION_MUTE || mode == GET_INFORMATION)) { if (!isHome && (mode == ACTION_FOLLOW || mode == ACTION_BLOCK || mode == ACTION_MUTE || mode == GET_INF)) {
Toolbar tool = connect.findViewById(R.id.profile_toolbar); Toolbar tool = connect.findViewById(R.id.profile_toolbar);
if(tool.getMenu().size() >= 2) { if(tool.getMenu().size() >= 2) {
MenuItem followIcon = tool.getMenu().getItem(1); MenuItem followIcon = tool.getMenu().getItem(1);

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

@ -46,13 +46,6 @@ public class AppDatabase extends SQLiteOpenHelper
@Override @Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
db.execSQL("DROP TABLE IF EXISTS " + "user");
db.execSQL("DROP TABLE IF EXISTS " + "tweet");
db.execSQL("DROP TABLE IF EXISTS " + "favorit");
db.execSQL("DROP TABLE IF EXISTS " + "trend");
db.execSQL("DROP TABLE IF EXISTS " + "error");
} }

18
app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java
View File

@ -45,7 +45,6 @@ public class DatabaseAdapter {
public void storeUser(TwitterUser user) { public void storeUser(TwitterUser user) {
SQLiteDatabase db = dataHelper.getWritableDatabase(); SQLiteDatabase db = dataHelper.getWritableDatabase();
storeUser(user, db); storeUser(user, db);
db.close();
} }
/** /**
@ -58,7 +57,6 @@ public class DatabaseAdapter {
Tweet tweet = home.get(pos); Tweet tweet = home.get(pos);
storeStatus(tweet, homeMask, db); storeStatus(tweet, homeMask, db);
} }
db.close();
} }
/** /**
@ -71,7 +69,6 @@ public class DatabaseAdapter {
Tweet tweet = mentions.get(pos); Tweet tweet = mentions.get(pos);
storeStatus(tweet, mentionMask, db); storeStatus(tweet, mentionMask, db);
} }
db.close();
} }
/** /**
@ -84,7 +81,6 @@ public class DatabaseAdapter {
Tweet tweet = stats.get(pos); Tweet tweet = stats.get(pos);
storeStatus(tweet, userTweetMask, db); storeStatus(tweet, userTweetMask, db);
} }
db.close();
} }
/** /**
@ -102,7 +98,6 @@ public class DatabaseAdapter {
favTable.put("ownerID", ownerId); favTable.put("ownerID", ownerId);
db.insertWithOnConflict("favorit",null,favTable,CONFLICT_IGNORE); db.insertWithOnConflict("favorit",null,favTable,CONFLICT_IGNORE);
} }
db.close();
} }
/** /**
@ -115,7 +110,6 @@ public class DatabaseAdapter {
Tweet tweet = replies.get(pos); Tweet tweet = replies.get(pos);
storeStatus(tweet, replyMask, db); storeStatus(tweet, replyMask, db);
} }
db.close();
} }
/** /**
@ -125,7 +119,6 @@ public class DatabaseAdapter {
public void storeFavorite(Tweet tweet) { public void storeFavorite(Tweet tweet) {
SQLiteDatabase db = dataHelper.getWritableDatabase(); SQLiteDatabase db = dataHelper.getWritableDatabase();
storeStatus(tweet, favoritedMask, db); storeStatus(tweet, favoritedMask, db);
db.close();
} }
/** /**
@ -143,7 +136,6 @@ public class DatabaseAdapter {
if (cursor.moveToFirst()) if (cursor.moveToFirst())
user = getUser(cursor); user = getUser(cursor);
cursor.close(); cursor.close();
db.close();
return user; return user;
} }
@ -166,7 +158,6 @@ public class DatabaseAdapter {
} while (cursor.moveToNext()); } while (cursor.moveToNext());
} }
cursor.close(); cursor.close();
db.close();
return tweetList; return tweetList;
} }
@ -189,7 +180,6 @@ public class DatabaseAdapter {
} while (cursor.moveToNext()); } while (cursor.moveToNext());
} }
cursor.close(); cursor.close();
db.close();
return tweetList; return tweetList;
} }
@ -215,7 +205,6 @@ public class DatabaseAdapter {
} while (cursor.moveToNext()); } while (cursor.moveToNext());
} }
cursor.close(); cursor.close();
db.close();
return tweetList; return tweetList;
} }
@ -239,7 +228,6 @@ public class DatabaseAdapter {
} while (cursor.moveToNext()); } while (cursor.moveToNext());
} }
cursor.close(); cursor.close();
db.close();
return tweetList; return tweetList;
} }
@ -259,7 +247,6 @@ public class DatabaseAdapter {
if(cursor.moveToFirst()) if(cursor.moveToFirst())
result = getStatus(cursor); result = getStatus(cursor);
cursor.close(); cursor.close();
db.close();
return result; return result;
} }
@ -283,7 +270,6 @@ public class DatabaseAdapter {
} while (cursor.moveToNext()); } while (cursor.moveToNext());
} }
cursor.close(); cursor.close();
db.close();
return tweetList; return tweetList;
} }
@ -309,7 +295,6 @@ public class DatabaseAdapter {
status.put("favorite",tweet.favorit); status.put("favorite",tweet.favorit);
status.put("statusregister",register); status.put("statusregister",register);
db.update("tweet",status,"tweet.tweetID="+tweet.tweetID,null); db.update("tweet",status,"tweet.tweetID="+tweet.tweetID,null);
db.close();
} }
/** /**
@ -319,7 +304,6 @@ public class DatabaseAdapter {
public void removeStatus(long id) { public void removeStatus(long id) {
SQLiteDatabase db = dataHelper.getWritableDatabase(); SQLiteDatabase db = dataHelper.getWritableDatabase();
db.delete("tweet","tweetID="+id,null); db.delete("tweet","tweetID="+id,null);
db.close();
} }
/** /**
@ -337,7 +321,6 @@ public class DatabaseAdapter {
ContentValues status = new ContentValues(); ContentValues status = new ContentValues();
status.put("statusregister", register); status.put("statusregister", register);
db.update("tweet", status, "tweet.tweetID=" + tweetId, null); db.update("tweet", status, "tweet.tweetID=" + tweetId, null);
db.close();
} }
/** /**
@ -351,7 +334,6 @@ public class DatabaseAdapter {
Cursor c = db.rawQuery(query,null); Cursor c = db.rawQuery(query,null);
boolean result = c.moveToFirst(); boolean result = c.moveToFirst();
c.close(); c.close();
db.close();
return result; return result;
} }

4
app/src/main/java/org/nuclearfog/twidda/viewadapter/TrendRecycler.java
View File

@ -77,7 +77,7 @@ public class TrendRecycler extends Adapter<TrendRecycler.ItemHolder>
ViewGroup p = TrendRecycler.this.parent; ViewGroup p = TrendRecycler.this.parent;
RecyclerView rv = (RecyclerView) p; RecyclerView rv = (RecyclerView) p;
int position = rv.getChildLayoutPosition(view); int position = rv.getChildLayoutPosition(view);
mListener.onItemClick(view, p, position); mListener.onItemClick(p, position);
} }
@ -95,6 +95,6 @@ public class TrendRecycler extends Adapter<TrendRecycler.ItemHolder>
* Custom Click Listener * Custom Click Listener
*/ */
public interface OnItemClicked { public interface OnItemClicked {
void onItemClick(View v, ViewGroup parent, int position); void onItemClick(ViewGroup parent, int position);
} }
} }

4
app/src/main/java/org/nuclearfog/twidda/viewadapter/UserRecycler.java
View File

@ -95,7 +95,7 @@ public class UserRecycler extends Adapter<UserRecycler.ItemHolder> implements On
ViewGroup p = UserRecycler.this.parent; ViewGroup p = UserRecycler.this.parent;
RecyclerView rv = (RecyclerView) p; RecyclerView rv = (RecyclerView) p;
int position = rv.getChildLayoutPosition(view); int position = rv.getChildLayoutPosition(view);
mListener.onItemClick(view, p, position); mListener.onItemClick(p, position);
} }
@ -114,6 +114,6 @@ public class UserRecycler extends Adapter<UserRecycler.ItemHolder> implements On
public interface OnItemClicked { public interface OnItemClicked {
void onItemClick(View v, ViewGroup parent, int position); void onItemClick(ViewGroup parent, int position);
} }
} }

2
app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java
View File

@ -138,7 +138,7 @@ public class SearchPage extends AppCompatActivity implements UserRecycler.OnItem
} }
@Override @Override
public void onItemClick(View view, ViewGroup parent, int position) { public void onItemClick(ViewGroup parent, int position) {
Intent intent; Intent intent;
switch(parent.getId()) { switch(parent.getId()) {
case R.id.tweet_result: case R.id.tweet_result:

2
app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java
View File

@ -184,7 +184,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
} }
@Override @Override
public void onItemClick(View view, ViewGroup parent, int position) { public void onItemClick(ViewGroup parent, int position) {
TimelineRecycler timeLineAdapter = (TimelineRecycler) answer_list.getAdapter(); TimelineRecycler timeLineAdapter = (TimelineRecycler) answer_list.getAdapter();
if (timeLineAdapter != null) { if (timeLineAdapter != null) {
Tweet tweet = timeLineAdapter.getData().get(position); Tweet tweet = timeLineAdapter.getData().get(position);

3
app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java
View File

@ -8,7 +8,6 @@ import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import org.nuclearfog.twidda.R; import org.nuclearfog.twidda.R;
@ -72,7 +71,7 @@ public class UserDetail extends AppCompatActivity implements OnItemClicked {
} }
@Override @Override
public void onItemClick(View view, ViewGroup parent, int position) { public void onItemClick(ViewGroup parent, int position) {
UserRecycler userListAdapter = (UserRecycler) userList.getAdapter(); UserRecycler userListAdapter = (UserRecycler) userList.getAdapter();
if (userListAdapter != null) { if (userListAdapter != null) {
TwitterUser user = userListAdapter.getData().get(position); TwitterUser user = userListAdapter.getData().get(position);

10
app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java
View File

@ -178,7 +178,7 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
break; break;
case 1: case 1:
mFavorites = new ProfileLoader(this); mFavorites = new ProfileLoader(this);
mFavorites.execute(userId, ProfileLoader.GET_FAVS,1L); mFavorites.execute(userId, ProfileLoader.GET_FAVORS, 1L);
break; break;
} }
} }
@ -198,7 +198,7 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
} }
@Override @Override
public void onItemClick(View v, ViewGroup parent, int position){ public void onItemClick(ViewGroup parent, int position) {
TimelineRecycler tweetAdapter; TimelineRecycler tweetAdapter;
if(parent.getId() == R.id.ht_list) { if(parent.getId() == R.id.ht_list) {
tweetAdapter = (TimelineRecycler) homeList.getAdapter(); tweetAdapter = (TimelineRecycler) homeList.getAdapter();
@ -257,13 +257,13 @@ public class UserProfile extends AppCompatActivity implements OnClickListener,
} }
private void getProfileTweets() { private void getProfileTweets() {
new ProfileLoader(this).execute(userId, ProfileLoader.LOAD_DB, 1L); new ProfileLoader(this).execute(userId, ProfileLoader.LOAD_DB);
mProfile = new ProfileLoader(this); mProfile = new ProfileLoader(this);
mTweets = new ProfileLoader(this); mTweets = new ProfileLoader(this);
mFavorites = new ProfileLoader(this); mFavorites = new ProfileLoader(this);
mProfile.execute(userId, ProfileLoader.GET_INFORMATION,1L); mProfile.execute(userId, ProfileLoader.GET_INF);
mTweets.execute(userId, ProfileLoader.GET_TWEETS,1L); mTweets.execute(userId, ProfileLoader.GET_TWEETS,1L);
mFavorites.execute(userId, ProfileLoader.GET_FAVS,1L); mFavorites.execute(userId, ProfileLoader.GET_FAVORS, 1L);
} }
private void getConnection(int mode) { private void getConnection(int mode) {