bug fix
This commit is contained in:
parent
2a2eef26bc
commit
d9619c73bc
|
@ -36,6 +36,7 @@ import org.nuclearfog.twidda.window.TweetPopup;
|
||||||
import org.nuclearfog.twidda.window.UserProfile;
|
import org.nuclearfog.twidda.window.UserProfile;
|
||||||
|
|
||||||
import static android.os.AsyncTask.Status.RUNNING;
|
import static android.os.AsyncTask.Status.RUNNING;
|
||||||
|
import static org.nuclearfog.twidda.window.TweetDetail.CHANGED;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Main Activity
|
* Main Activity
|
||||||
|
@ -172,6 +173,11 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
|
||||||
case SETTING:
|
case SETTING:
|
||||||
home = null;
|
home = null;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case TWEET:
|
||||||
|
if (returnCode == CHANGED)
|
||||||
|
home = null;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -300,14 +300,21 @@ public class ProfileLoader extends AsyncTask<Long, Long, Long> {
|
||||||
Toast.makeText(ui.get(), R.string.unmuted, Toast.LENGTH_SHORT).show();
|
Toast.makeText(ui.get(), R.string.unmuted, Toast.LENGTH_SHORT).show();
|
||||||
|
|
||||||
} else if (MODE == FAILURE) {
|
} else if (MODE == FAILURE) {
|
||||||
|
|
||||||
switch (returnCode) {
|
switch (returnCode) {
|
||||||
case 420:
|
case 420:
|
||||||
Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_LONG).show();
|
Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_LONG).show();
|
||||||
break;
|
break;
|
||||||
case 136:
|
|
||||||
|
case 50:
|
||||||
|
Toast.makeText(ui.get(), R.string.profile_not_found, Toast.LENGTH_LONG).show();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case -1:
|
case -1:
|
||||||
|
case 136:
|
||||||
Toast.makeText(ui.get(), R.string.error_not_specified, Toast.LENGTH_LONG).show();
|
Toast.makeText(ui.get(), R.string.error_not_specified, Toast.LENGTH_LONG).show();
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
Toast.makeText(ui.get(), errMsg, Toast.LENGTH_LONG).show();
|
Toast.makeText(ui.get(), errMsg, Toast.LENGTH_LONG).show();
|
||||||
}
|
}
|
||||||
|
|
|
@ -115,7 +115,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
|
||||||
|
|
||||||
} catch (TwitterException err) {
|
} catch (TwitterException err) {
|
||||||
returnCode = err.getErrorCode();
|
returnCode = err.getErrorCode();
|
||||||
if (returnCode == 144)
|
if (returnCode == 144 || returnCode == 34)
|
||||||
database.removeStatus(TWEETID);
|
database.removeStatus(TWEETID);
|
||||||
else
|
else
|
||||||
errMsg += err.getMessage();
|
errMsg += err.getMessage();
|
||||||
|
@ -225,22 +225,25 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
|
||||||
ansReload.setRefreshing(false);
|
ansReload.setRefreshing(false);
|
||||||
|
|
||||||
if (mode == DELETE) {
|
if (mode == DELETE) {
|
||||||
Toast.makeText(ui.get(), R.string.tweet_removed, Toast.LENGTH_SHORT).show();
|
ui.get().deleteTweet();
|
||||||
ui.get().setResult(TweetDetail.CHANGED);
|
|
||||||
ui.get().finish();
|
|
||||||
|
|
||||||
} else if (mode == ERROR) {
|
} else if (mode == ERROR) {
|
||||||
|
|
||||||
switch (returnCode) {
|
switch (returnCode) {
|
||||||
case 136:
|
case 136:
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 420:
|
case 420:
|
||||||
Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_LONG).show();
|
Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_LONG).show();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 34:
|
||||||
case 144:
|
case 144:
|
||||||
Toast.makeText(ui.get(), R.string.tweet_not_found, Toast.LENGTH_LONG).show();
|
Toast.makeText(ui.get(), R.string.tweet_not_found, Toast.LENGTH_LONG).show();
|
||||||
ui.get().setResult(TweetDetail.CHANGED);
|
ui.get().setResult(TweetDetail.CHANGED);
|
||||||
ui.get().finish();
|
ui.get().finish();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
Toast.makeText(ui.get(), errMsg, Toast.LENGTH_LONG).show();
|
Toast.makeText(ui.get(), errMsg, Toast.LENGTH_LONG).show();
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu m) {
|
public boolean onCreateOptionsMenu(Menu m) {
|
||||||
getMenuInflater().inflate(R.menu.tweet, m);
|
getMenuInflater().inflate(R.menu.tweet, m);
|
||||||
|
@ -247,4 +256,10 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
|
||||||
image.putExtra("link", mediaLinks);
|
image.putExtra("link", mediaLinks);
|
||||||
startActivity(image);
|
startActivity(image);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void deleteTweet() {
|
||||||
|
Toast.makeText(this, R.string.tweet_removed, Toast.LENGTH_SHORT).show();
|
||||||
|
setResult(TweetDetail.CHANGED);
|
||||||
|
finish();
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -29,6 +29,7 @@ import org.nuclearfog.twidda.backend.items.Tweet;
|
||||||
import org.nuclearfog.twidda.database.GlobalSettings;
|
import org.nuclearfog.twidda.database.GlobalSettings;
|
||||||
|
|
||||||
import static android.os.AsyncTask.Status.RUNNING;
|
import static android.os.AsyncTask.Status.RUNNING;
|
||||||
|
import static org.nuclearfog.twidda.window.TweetDetail.CHANGED;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* User Profile Activity
|
* 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
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu m) {
|
public boolean onCreateOptionsMenu(Menu m) {
|
||||||
getMenuInflater().inflate(R.menu.profile, m);
|
getMenuInflater().inflate(R.menu.profile, m);
|
||||||
|
@ -360,6 +370,7 @@ public class UserProfile extends AppCompatActivity implements OnRefreshListener,
|
||||||
this.canDm = canDm;
|
this.canDm = canDm;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void imageClick(String link) {
|
public void imageClick(String link) {
|
||||||
Intent image = new Intent(this, ImageDetail.class);
|
Intent image = new Intent(this, ImageDetail.class);
|
||||||
image.putExtra("link", new String[]{link});
|
image.putExtra("link", new String[]{link});
|
||||||
|
|
|
@ -75,7 +75,12 @@
|
||||||
<string name="dm_not_found">Nachricht nicht gefunden!</string>
|
<string name="dm_not_found">Nachricht nicht gefunden!</string>
|
||||||
<string name="image_folder_created">Ordner erstellt unter Pictures</string>
|
<string name="image_folder_created">Ordner erstellt unter Pictures</string>
|
||||||
<string name="image_saved">Bild gespeichert!</string>
|
<string name="image_saved">Bild gespeichert!</string>
|
||||||
<string name="tweet_processing">in bearbeitung...</string>
|
<string name="tweet_processing">in bearbeitung..</string>
|
||||||
<string name="tweet_loading">lädt...</string>
|
<string name="tweet_loading">lädt..</string>
|
||||||
<string name="site_load_failure">Fehler beim Abrufen der Seite!</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>
|
</resources>
|
|
@ -90,4 +90,5 @@
|
||||||
<string name="add_image">add new image</string>
|
<string name="add_image">add new image</string>
|
||||||
<string name="send_tweet">send Tweet</string>
|
<string name="send_tweet">send Tweet</string>
|
||||||
<string name="tweet_close">close tweet</string>
|
<string name="tweet_close">close tweet</string>
|
||||||
|
<string name="profile_not_found">Profile not found!</string>
|
||||||
</resources>
|
</resources>
|
Loading…
Reference in New Issue