Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bugfix, cleanup

This commit is contained in:
NudeDude 2018-07-30 11:55:51 +02:00
parent 2e84d3235f
commit 3e4eac5a14
9 changed files with 68 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/nuclearfog/twidda/backend/GlobalSettings.java
View File

@ -66,13 +66,17 @@ public class GlobalSettings {
return woeId;
}
public int getWoeIdSelection(){return woeIdPos;}
public int getWoeIdSelection(){
return woeIdPos;
}
public int getRowLimit() {
return row;
}
public boolean getLogin() { return loggedIn;}
public boolean getLogin() {
return loggedIn;
}
public String[] getKeys() {
String out[] = new String[2];

13
app/src/main/java/org/nuclearfog/twidda/backend/ImagePopup.java
View File

@ -27,12 +27,14 @@ public class ImagePopup extends AsyncTask<String, Void, Boolean> {
private Dialog popup;
private Bitmap imgArray[];
private LayoutInflater inf;
private ErrorLog errorLog;
private int position = 0;
public ImagePopup(Context c) {
popup = new Dialog(c);
ui = new WeakReference<>(c);
inf = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
public ImagePopup(Context context) {
popup = new Dialog(context);
ui = new WeakReference<>(context);
inf = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
errorLog = new ErrorLog(context);
}
@Override
@ -70,8 +72,7 @@ public class ImagePopup extends AsyncTask<String, Void, Boolean> {
}
return true;
} catch (Exception err) {
ErrorLog errorLog = new ErrorLog(ui.get());
errorLog.add(err.getMessage());
errorLog.add("Image load: "+err.getMessage());
return false;
}
}

11
app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java
View File

@ -36,6 +36,7 @@ public class MainPage extends AsyncTask<Integer, Void, Integer> {
private TimelineRecycler timelineAdapter, mentionAdapter;
private TrendRecycler trendsAdapter;
private ErrorLog errorLog;
private int woeId;
private String errMsg;
private int highlight, font;
@ -49,6 +50,7 @@ public class MainPage extends AsyncTask<Integer, Void, Integer> {
ui = new WeakReference<>((MainActivity)context);
mTwitter = TwitterEngine.getInstance(context);
GlobalSettings settings = GlobalSettings.getInstance(context);
errorLog = new ErrorLog(context);
woeId = settings.getWoeId();
highlight = settings.getHighlightColor();
font = settings.getFontColor();
@ -155,17 +157,18 @@ public class MainPage extends AsyncTask<Integer, Void, Integer> {
break;
}
} catch(TwitterException e) {
errMsg = e.getMessage();
int errCode = e.getErrorCode();
if(errCode == 420) {
int retry = e.getRetryAfter();
errMsg = "Rate limit erreicht!\n Weiter in "+retry+" Sekunden";
} else {
errMsg = "Fehler: "+e.getMessage();
}
return FAIL;
}
catch (Exception e) {
errMsg = e.getMessage();
errMsg = "Main Page: "+e.getMessage();
if(ui.get() != null) {
ErrorLog errorLog = new ErrorLog(ui.get());
errorLog.add(errMsg);
}
return FAIL;
@ -203,7 +206,7 @@ public class MainPage extends AsyncTask<Integer, Void, Integer> {
break;
case FAIL:
Toast.makeText(connect, "Fehler: "+errMsg, Toast.LENGTH_LONG).show();
Toast.makeText(connect,errMsg, Toast.LENGTH_LONG).show();
default:
timelineRefresh.setRefreshing(false);
trendRefresh.setRefreshing(false);

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

@ -196,7 +196,7 @@ public class ProfileLoader extends AsyncTask<Long,Void,Long> {
return FAILURE;
}
catch(Exception err) {
errMsg = err.getMessage();
errMsg = "Profile Load: "+err.getMessage();
err.printStackTrace();
ErrorLog errorLog = new ErrorLog(ui.get());
errorLog.add(errMsg);
@ -285,7 +285,7 @@ public class ProfileLoader extends AsyncTask<Long,Void,Long> {
}
else if(mode == FAILURE)
{
Toast.makeText(connect,"Fehler: "+errMsg,Toast.LENGTH_LONG).show();
Toast.makeText(connect,errMsg,Toast.LENGTH_LONG).show();
SwipeRefreshLayout tweetsReload = connect.findViewById(R.id.hometweets);
SwipeRefreshLayout favoritsReload = connect.findViewById(R.id.homefavorits);
tweetsReload.setRefreshing(false);

14
app/src/main/java/org/nuclearfog/twidda/backend/Registration.java
View File

@ -12,10 +12,13 @@ import org.nuclearfog.twidda.window.LoginPage;
import java.lang.ref.WeakReference;
import twitter4j.TwitterException;
public class Registration extends AsyncTask<String, Void, Boolean> {
private WeakReference<LoginPage> ui;
private TwitterEngine mTwitter;
private ErrorLog errorLog;
private String errorMessage;
private String redirectionURL = "";
@ -23,6 +26,7 @@ public class Registration extends AsyncTask<String, Void, Boolean> {
public Registration(Context context) {
ui = new WeakReference<>((LoginPage)context);
mTwitter = TwitterEngine.getInstance(context);
errorLog = new ErrorLog(context);
}
@ -36,9 +40,11 @@ public class Registration extends AsyncTask<String, Void, Boolean> {
mTwitter.initialize(pin);
return true;
}
} catch ( Exception e ) {
errorMessage = e.getMessage();
ErrorLog errorLog = new ErrorLog(ui.get());
} catch(TwitterException e) {
errorMessage = e.getErrorMessage();
}
catch ( Exception e ) {
errorMessage = "Registration: "+e.getMessage();
errorLog.add(errorMessage);
}
return false;
@ -59,7 +65,7 @@ public class Registration extends AsyncTask<String, Void, Boolean> {
connect.startActivity(i);
}
if(errorMessage != null) {
Toast.makeText(connect,"Fehler: "+errorMessage,Toast.LENGTH_LONG).show();
Toast.makeText(connect,errorMessage,Toast.LENGTH_LONG).show();
}
}
}

31
app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
View File

@ -50,6 +50,8 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> implements View.On
private TwitterEngine mTwitter;
private TimelineRecycler answerAdapter;
private DatabaseAdapter database;
private ErrorLog errorLog;
private String usernameStr, scrNameStr, tweetStr, dateString;
private String repliedUsername, apiName, retweeter;
private String medialinks[], profile_pb;
@ -62,16 +64,18 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> implements View.On
private WeakReference<TweetDetail> ui;
public StatusLoader(Context c) {
mTwitter = TwitterEngine.getInstance(c);
GlobalSettings settings = GlobalSettings.getInstance(c);
public StatusLoader(Context context) {
mTwitter = TwitterEngine.getInstance(context);
GlobalSettings settings = GlobalSettings.getInstance(context);
font = settings.getFontColor();
highlight = settings.getHighlightColor();
toggleImg = settings.loadImages();
homeId = settings.getUserId();
ui = new WeakReference<>((TweetDetail)c);
ui = new WeakReference<>((TweetDetail)context);
RecyclerView replyList = ui.get().findViewById(R.id.answer_list);
answerAdapter = (TimelineRecycler) replyList.getAdapter();
database = new DatabaseAdapter(ui.get());
errorLog = new ErrorLog(context);
if(answerAdapter == null) {
answerAdapter = new TimelineRecycler(ui.get());
replyList.setAdapter(answerAdapter);
@ -87,9 +91,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> implements View.On
tweetID = data[0];
final long MODE = data[1];
try {
DatabaseAdapter database = new DatabaseAdapter(ui.get());
Tweet tweet;
if(MODE == DELETE) {
mTwitter.deleteTweet(tweetID);
database.removeStatus(tweetID);
@ -178,23 +180,20 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> implements View.On
}
}
catch(TwitterException e) {
int err = e.getErrorCode();
if(err == 144) {
new DatabaseAdapter(ui.get()).removeStatus(tweetID);
int errCode = e.getErrorCode();
if(errCode == 144) {
database.removeStatus(tweetID);
errorMessage = "Tweet nicht gefunden!\nID:"+tweetID;
} else if(err == 420) {
} else if(errCode == 420) {
int retry = e.getRetryAfter();
errorMessage = "Rate limit erreicht!\n Weiter in "+retry+" Sekunden";
} else {
errorMessage = e.getMessage();
ErrorLog errorLog = new ErrorLog(ui.get());
errorLog.add(errorMessage);
errorMessage = "Fehler: "+e.getMessage();
}
return ERROR;
}
catch(Exception err) {
errorMessage = err.getMessage();
ErrorLog errorLog = new ErrorLog(ui.get());
errorMessage = "Status load: "+err.getMessage();
errorLog.add(errorMessage);
return ERROR;
}
@ -312,7 +311,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> implements View.On
ui.get().finish();
}
else if(mode == ERROR) {
Toast.makeText(ui.get(),"Fehler beim Laden: "+errorMessage,Toast.LENGTH_LONG).show();
Toast.makeText(ui.get(),errorMessage,Toast.LENGTH_LONG).show();
SwipeRefreshLayout ansReload = connect.findViewById(R.id.answer_reload);
if(ansReload.isRefreshing()) {
ansReload.setRefreshing(false);

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

@ -18,13 +18,14 @@ public class StatusUpload extends AsyncTask<Object, Void, Boolean> implements Al
private WeakReference<TweetPopup> ui;
private TwitterEngine mTwitter;
private ErrorLog errorLog;
private String[] path;
public StatusUpload(Context context, String[] path) {
ui = new WeakReference<>((TweetPopup)context);
mTwitter = TwitterEngine.getInstance(context);
errorLog = new ErrorLog(context);
this.path = path;
}
@ -52,8 +53,7 @@ public class StatusUpload extends AsyncTask<Object, Void, Boolean> implements Al
}
return true;
} catch(Exception err) {
ErrorLog errorLog = new ErrorLog(ui.get());
errorLog.add(err.getMessage());
errorLog.add("Status Upload: "+err.getMessage());
return false;
}
}

14
app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java
View File

@ -25,6 +25,7 @@ public class TwitterSearch extends AsyncTask<String, Void, Void> {
private TimelineRecycler searchAdapter;
private UserRecycler userAdapter;
private TwitterEngine mTwitter;
private ErrorLog errorLog;
private WeakReference<SearchPage> ui;
private int highlight, font_color;
private String errorMessage;
@ -33,6 +34,7 @@ public class TwitterSearch extends AsyncTask<String, Void, Void> {
public TwitterSearch(Context context) {
ui = new WeakReference<>((SearchPage)context);
mTwitter = TwitterEngine.getInstance(context);
errorLog = new ErrorLog(context);
GlobalSettings settings = GlobalSettings.getInstance(context);
font_color = settings.getFontColor();
@ -84,13 +86,10 @@ public class TwitterSearch extends AsyncTask<String, Void, Void> {
int retry = err.getRetryAfter();
errorMessage = "Rate limit erreicht!\n Weiter in "+retry+" Sekunden";
} else {
errorMessage = err.getErrorMessage();
errorMessage = "Fehler beim Laden: "+err.getErrorMessage();
}
ErrorLog errorLog = new ErrorLog(ui.get());
errorLog.add(errorMessage);
} catch(Exception err) {
errorMessage = err.getMessage();
ErrorLog errorLog = new ErrorLog(ui.get());
errorMessage = "Twitter search: "+err.getMessage();
errorLog.add(errorMessage);
}
return null;
@ -102,8 +101,9 @@ public class TwitterSearch extends AsyncTask<String, Void, Void> {
SearchPage connect = ui.get();
if(connect == null)
return;
if(errorMessage != null)
Toast.makeText(connect,"Fehler beim Laden: "+errorMessage,Toast.LENGTH_LONG).show();
if(errorMessage != null) {
Toast.makeText(connect,errorMessage,Toast.LENGTH_LONG).show();
}
SwipeRefreshLayout tweetReload = connect.findViewById(R.id.searchtweets);
View circleLoad = connect.findViewById(R.id.search_progress);

22
app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java
View File

@ -17,7 +17,7 @@ import java.util.List;
import twitter4j.TwitterException;
public class UserLists extends AsyncTask <Long, Void, Void> {
public class UserLists extends AsyncTask <Long, Void, Boolean> {
public static final long FOLLOWING = 0L;
public static final long FOLLOWERS = 1L;
@ -27,6 +27,7 @@ public class UserLists extends AsyncTask <Long, Void, Void> {
private WeakReference<UserDetail> ui;
private TwitterEngine mTwitter;
private UserRecycler usrAdp;
private ErrorLog errorLog;
private String errorMessage;
private boolean imageLoad;
@ -36,6 +37,7 @@ public class UserLists extends AsyncTask <Long, Void, Void> {
public UserLists(Context context) {
GlobalSettings settings = GlobalSettings.getInstance(context);
imageLoad = settings.loadImages();
errorLog = new ErrorLog(context);
ui = new WeakReference<>((UserDetail)context);
mTwitter = TwitterEngine.getInstance(context);
@ -47,7 +49,7 @@ public class UserLists extends AsyncTask <Long, Void, Void> {
@Override
protected Void doInBackground(Long... data) {
protected Boolean doInBackground(Long... data) {
long id = data[0];
long mode = data[1];
long cursor = data[2];
@ -66,6 +68,7 @@ public class UserLists extends AsyncTask <Long, Void, Void> {
usrAdp.setData(user);
}
usrAdp.toggleImage(imageLoad);
return true;
}
catch(TwitterException err) {
int errCode = err.getErrorCode();
@ -75,28 +78,25 @@ public class UserLists extends AsyncTask <Long, Void, Void> {
} else {
errorMessage = "Fehler: "+err.getMessage();
}
return false;
} catch(Exception err) {
errorMessage = "Fehler: "+err.getMessage();
ErrorLog errorLog = new ErrorLog(ui.get());
errorMessage = "Userlist: "+err.getMessage();
errorLog.add(errorMessage);
return false;
}
return null;
}
@Override
protected void onPostExecute(Void v) {
protected void onPostExecute(Boolean success) {
if(ui.get() == null)
return;
View mProgress = ui.get().findViewById(R.id.userlist_progress);
mProgress.setVisibility(View.INVISIBLE);
if(errorMessage == null) {
if(success) {
usrAdp.notifyDataSetChanged();
}
else {
} else {
Toast.makeText(ui.get(),errorMessage,Toast.LENGTH_LONG).show();
}
}