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

bug fix

This commit is contained in:
NudeDude 2019-02-27 16:17:19 +01:00
parent 12d018dac7
commit 55a3c0542d
6 changed files with 94 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,11 @@ abstract class ErrorHandling {
if (mConnect.getActiveNetworkInfo() == null || !mConnect.getActiveNetworkInfo().isConnected()) {
Toast.makeText(c, R.string.connection_failed, Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(c, error.getErrorMessage(), Toast.LENGTH_LONG).show();
String strMsg = error.getMessage();
if (strMsg != null && strMsg.trim().isEmpty())
Toast.makeText(c, R.string.error, Toast.LENGTH_LONG).show();
else
Toast.makeText(c, error.getErrorMessage(), Toast.LENGTH_LONG).show();
}
}
return false;

1
app/src/main/java/org/nuclearfog/twidda/backend/ImageLoad.java
View File

@ -45,7 +45,6 @@ public class ImageLoad extends AsyncTask<String, Void, Boolean> {
images[i] = BitmapFactory.decodeStream(new URL(link).openStream());
}
} catch (Exception err) {
err.printStackTrace();
Log.e("Image Popup", err.getMessage());
return false;
}

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

@ -132,27 +132,36 @@ public class ProfileLoader extends AsyncTask<Long, Long, Long> {
if (MODE == ACTION_FOLLOW) {
if (user.isLocked()) {
if (isFollowing) {
isFollowing = false;
user = mTwitter.followAction(UID, false);
} else if (user.followRequested()) {
user = mTwitter.followAction(UID, false);
} else {
user = mTwitter.followAction(UID, true);
}
if (isFollowing)
user = mTwitter.unfollowUser(UID);
else if (!user.followRequested())
user = mTwitter.followUser(UID);
// TODO purge follow request
} else {
if (!isFollowing)
user = mTwitter.followUser(UID);
else
user = mTwitter.unfollowUser(UID);
isFollowing = !isFollowing;
user = mTwitter.followAction(UID, isFollowing);
}
publishProgress(GET_USER);
} else if (MODE == ACTION_BLOCK) {
if (!isBlocked)
user = mTwitter.blockUser(UID);
else
user = mTwitter.unblockUser(UID);
isBlocked = !isBlocked;
user = mTwitter.blockAction(UID, isBlocked);
publishProgress(GET_USER);
} else if (MODE == ACTION_MUTE) {
if (!isMuted)
user = mTwitter.muteUser(UID);
else
user = mTwitter.unmuteUser(UID);
isMuted = !isMuted;
user = mTwitter.muteAction(UID, isMuted);
publishProgress(GET_USER);
} else {
if (!user.isLocked() || isFollowing) {
if ((MODE == GET_TWEETS || homeTl.getItemCount() == 0)) {

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

@ -36,7 +36,6 @@ public class Registration extends AsyncTask<String, Void, Boolean> {
return true;
}
} catch (Exception e) {
e.printStackTrace();
Log.e("Registration", e.getMessage());
failure = true;
}

121
app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java
View File

@ -255,12 +255,12 @@ public class TwitterEngine {
/**
* Get User Context
*
* @param id User ID
* @param userId User ID
* @return User Object
* @throws TwitterException if Access is unavailable
*/
public TwitterUser getUser(long id) throws TwitterException {
return new TwitterUser(twitter.showUser(id));
public TwitterUser getUser(long userId) throws TwitterException {
return new TwitterUser(twitter.showUser(userId));
}
@ -278,12 +278,12 @@ public class TwitterEngine {
/**
* Efficient Access of Connection Information
*
* @param id User ID compared with Home ID
* @param userId User ID compared with Home ID
* @return array of connection states Index 0: Following, 1: Follow, 2: blocked 3: muted 4: canDM
* @throws TwitterException if Connection is unavailable
*/
public boolean[] getConnection(long id) throws TwitterException {
Relationship connect = twitter.showFriendship(twitterID, id);
public boolean[] getConnection(long userId) throws TwitterException {
Relationship connect = twitter.showFriendship(twitterID, userId);
boolean connection[] = new boolean[5];
connection[0] = connect.isSourceFollowingTarget();
connection[1] = connect.isTargetFollowingSource();
@ -295,68 +295,83 @@ public class TwitterEngine {
/**
* Switch following User
*
* @param userId User ID
* @param action using action
* @return updated user information
* Follow Twitter user
* @param userID User ID
* @return Twitter User
* @throws TwitterException if Access is unavailable
*/
public TwitterUser followAction(long userId, boolean action) throws TwitterException {
User user;
if (action)
user = twitter.createFriendship(userId);
else
user = twitter.destroyFriendship(userId);
return new TwitterUser(user);
public TwitterUser followUser(long userID) throws TwitterException {
return new TwitterUser(twitter.createFriendship(userID));
}
/**
* Switch blocking User
*
* @param userId User ID
* @param action using action
* @return updated user information
* Unfollow Twitter user
* @param userID User ID
* @return Twitter User
* @throws TwitterException if Access is unavailable
*/
public TwitterUser blockAction(long userId, boolean action) throws TwitterException {
User user;
if (action)
user = twitter.createBlock(userId);
else
user = twitter.destroyBlock(userId);
return new TwitterUser(user);
public TwitterUser unfollowUser(long userID) throws TwitterException {
return new TwitterUser(twitter.destroyFriendship(userID));
}
/**
* Switch muting User
* Block Twitter user
*
* @param userId User ID
* @param action using action
* @return updated user information
* @param UserID User ID
* @return Twitter User
* @throws TwitterException if Access is unavailable
*/
public TwitterUser muteAction(long userId, boolean action) throws TwitterException {
User user;
if (action)
user = twitter.createMute(userId);
else
user = twitter.destroyMute(userId);
return new TwitterUser(user);
public TwitterUser blockUser(long UserID) throws TwitterException {
return new TwitterUser(twitter.createBlock(UserID));
}
/**
* Unblock Twitter user
*
* @param UserID User ID
* @return Twitter User
* @throws TwitterException if Access is unavailable
*/
public TwitterUser unblockUser(long UserID) throws TwitterException {
return new TwitterUser(twitter.destroyBlock(UserID));
}
/**
* Mute Twitter user
*
* @param UserID User ID
* @return Twitter User
* @throws TwitterException if Access is unavailable
*/
public TwitterUser muteUser(long UserID) throws TwitterException {
return new TwitterUser(twitter.createMute(UserID));
}
/**
* Unmute Twitter user
* @param UserID User ID
* @return Twitter User
* @throws TwitterException if Access is unavailable
*/
public TwitterUser unmuteUser(long UserID) throws TwitterException {
return new TwitterUser(twitter.destroyMute(UserID));
}
/**
* get Following User List
*
* @param id User ID
* @param userId User ID
* @return List of Following User
* @throws TwitterException if Access is unavailable
*/
public List<TwitterUser> getFollowing(long id, long cursor) throws TwitterException {
IDs userIDs = twitter.getFriendsIDs(id, cursor, load);
public List<TwitterUser> getFollowing(long userId, long cursor) throws TwitterException {
IDs userIDs = twitter.getFriendsIDs(userId, cursor, load);
return convertUserList(twitter.lookupUsers(userIDs.getIDs()));
}
@ -364,12 +379,12 @@ public class TwitterEngine {
/**
* get Follower
*
* @param id User ID
* @param userId User ID
* @return List of Follower
* @throws TwitterException if Access is unavailable
*/
public List<TwitterUser> getFollower(long id, long cursor) throws TwitterException {
IDs userIDs = twitter.getFollowersIDs(id, cursor, load);
public List<TwitterUser> getFollower(long userId, long cursor) throws TwitterException {
IDs userIDs = twitter.getFollowersIDs(userId, cursor, load);
return convertUserList(twitter.lookupUsers(userIDs.getIDs()));
}
@ -404,12 +419,12 @@ public class TwitterEngine {
/**
* Get Tweet
*
* @param id Tweet ID
* @param tweetId Tweet ID
* @return Tweet Object
* @throws TwitterException if Access is unavailable
*/
public Tweet getStatus(long id) throws TwitterException {
Status tweet = twitter.showStatus(id);
public Tweet getStatus(long tweetId) throws TwitterException {
Status tweet = twitter.showStatus(tweetId);
return new Tweet(tweet);
}
@ -475,11 +490,11 @@ public class TwitterEngine {
/**
* @param id Tweet ID
* @param tweetId Tweet ID
* @throws TwitterException if Access is unavailable
*/
public void deleteTweet(long id) throws TwitterException {
twitter.destroyStatus(id);
public void deleteTweet(long tweetId) throws TwitterException {
twitter.destroyStatus(tweetId);
}

2
build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.0'
classpath 'com.android.tools.build:gradle:3.3.1'
}
}