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 2018-12-02 15:22:29 +01:00
parent 2a2eef26bc
commit d9619c73bc
7 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@ import org.nuclearfog.twidda.window.TweetPopup;
import org.nuclearfog.twidda.window.UserProfile;
import static android.os.AsyncTask.Status.RUNNING;
import static org.nuclearfog.twidda.window.TweetDetail.CHANGED;
/**
* Main Activity
@ -172,6 +173,11 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
case SETTING:
home = null;
break;
case TWEET:
if (returnCode == CHANGED)
home = null;
break;
}
}

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

@ -300,14 +300,21 @@ public class ProfileLoader extends AsyncTask<Long, Long, Long> {
Toast.makeText(ui.get(), R.string.unmuted, Toast.LENGTH_SHORT).show();
} else if (MODE == FAILURE) {
switch (returnCode) {
case 420:
Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_LONG).show();
break;
case 136:
case 50:
Toast.makeText(ui.get(), R.string.profile_not_found, Toast.LENGTH_LONG).show();
break;
case -1:
case 136:
Toast.makeText(ui.get(), R.string.error_not_specified, Toast.LENGTH_LONG).show();
break;
default:
Toast.makeText(ui.get(), errMsg, Toast.LENGTH_LONG).show();
}

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

@ -115,7 +115,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
} catch (TwitterException err) {
returnCode = err.getErrorCode();
if (returnCode == 144)
if (returnCode == 144 || returnCode == 34)
database.removeStatus(TWEETID);
else
errMsg += err.getMessage();
@ -225,22 +225,25 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
ansReload.setRefreshing(false);
if (mode == DELETE) {
Toast.makeText(ui.get(), R.string.tweet_removed, Toast.LENGTH_SHORT).show();
ui.get().setResult(TweetDetail.CHANGED);
ui.get().finish();
ui.get().deleteTweet();
} else if (mode == ERROR) {
switch (returnCode) {
case 136:
break;
case 420:
Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_LONG).show();
break;
case 34:
case 144:
Toast.makeText(ui.get(), R.string.tweet_not_found, Toast.LENGTH_LONG).show();
ui.get().setResult(TweetDetail.CHANGED);
ui.get().finish();
break;
default:
Toast.makeText(ui.get(), errMsg, Toast.LENGTH_LONG).show();
}

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

@ -120,6 +120,15 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
}
@Override
protected void onActivityResult(int reqCode, int returnCode, Intent i) {
super.onActivityResult(reqCode, returnCode, i);
if (reqCode == TWEET && returnCode == CHANGED) {
mStat = null;
}
}
@Override
public boolean onCreateOptionsMenu(Menu m) {
getMenuInflater().inflate(R.menu.tweet, m);
@ -247,4 +256,10 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
image.putExtra("link", mediaLinks);
startActivity(image);
}
public void deleteTweet() {
Toast.makeText(this, R.string.tweet_removed, Toast.LENGTH_SHORT).show();
setResult(TweetDetail.CHANGED);
finish();
}
}

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

@ -29,6 +29,7 @@ import org.nuclearfog.twidda.backend.items.Tweet;
import org.nuclearfog.twidda.database.GlobalSettings;
import static android.os.AsyncTask.Status.RUNNING;
import static org.nuclearfog.twidda.window.TweetDetail.CHANGED;
/**
* User Profile Activity
@ -131,6 +132,15 @@ public class UserProfile extends AppCompatActivity implements OnRefreshListener,
}
@Override
protected void onActivityResult(int reqCode, int returnCode, Intent i) {
super.onActivityResult(reqCode, returnCode, i);
if (reqCode == TWEET && returnCode == CHANGED) {
mProfile = null;
}
}
@Override
public boolean onCreateOptionsMenu(Menu m) {
getMenuInflater().inflate(R.menu.profile, m);
@ -360,6 +370,7 @@ public class UserProfile extends AppCompatActivity implements OnRefreshListener,
this.canDm = canDm;
}
public void imageClick(String link) {
Intent image = new Intent(this, ImageDetail.class);
image.putExtra("link", new String[]{link});

9
app/src/main/res/values-de-rDE/strings.xml
View File

@ -75,7 +75,12 @@
<string name="dm_not_found">Nachricht nicht gefunden!</string>
<string name="image_folder_created">Ordner erstellt unter Pictures</string>
<string name="image_saved">Bild gespeichert!</string>
<string name="tweet_processing">in bearbeitung...</string>
<string name="tweet_loading">lädt...</string>
<string name="tweet_processing">in bearbeitung..</string>
<string name="tweet_loading">lädt..</string>
<string name="site_load_failure">Fehler beim Abrufen der Seite!</string>
<string name="profile_not_found">Profil nicht gefunden!</string>
<string name="tweet_close">Tweetfenster schließen</string>
<string name="send_tweet">Tweet senden</string>
<string name="add_image">Bild hinzufügen</string>
<string name="image_preview">Bildvorschau</string>
</resources>

1
app/src/main/res/values/strings.xml
View File

@ -90,4 +90,5 @@
<string name="add_image">add new image</string>
<string name="send_tweet">send Tweet</string>
<string name="tweet_close">close tweet</string>
<string name="profile_not_found">Profile not found!</string>
</resources>