diff options
Diffstat (limited to 'app/src/main/java/app')
4 files changed, 23 insertions, 12 deletions
diff --git a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java index 692f0c430..5207547ff 100644 --- a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java @@ -593,7 +593,12 @@ public class LoginActivity extends BaseActivity { editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token); editor.apply(); //Update the account with the token; - new UpdateAccountInfoAsyncTask(LoginActivity.this, token, client_id, client_secret, refresh_token, instance, socialNetwork).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + if (instance != null) { + new UpdateAccountInfoAsyncTask(LoginActivity.this, token, client_id, client_secret, refresh_token, instance, socialNetwork).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + } else { + connectionButton.setEnabled(true); + Toasty.error(LoginActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show(); + } } catch (JSONException e) { e.printStackTrace(); } diff --git a/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java b/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java index f360dcc3c..ffddd14ff 100644 --- a/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java @@ -150,7 +150,9 @@ public class WebviewConnectActivity extends BaseActivity { } }); - + if (instance == null) { + finish(); + } webView.setWebViewClient(new WebViewClient() { @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { @@ -200,6 +202,7 @@ public class WebviewConnectActivity extends BaseActivity { }); webView.loadUrl(LoginActivity.redirectUserToAuthorizeAndLogin(WebviewConnectActivity.this, clientId, instance)); + } @Override diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Status.java b/app/src/main/java/app/fedilab/android/client/Entities/Status.java index 063f477d3..b9cd3f100 100644 --- a/app/src/main/java/app/fedilab/android/client/Entities/Status.java +++ b/app/src/main/java/app/fedilab/android/client/Entities/Status.java @@ -145,17 +145,17 @@ public class Status implements Parcelable { private Card card; private String language; private boolean isTranslated = false; - private boolean isEmojiFound = false; - private boolean isPollEmojiFound = false; - private boolean isImageFound = false; - private boolean isEmojiTranslateFound = false; + private transient boolean isEmojiFound = false; + private transient boolean isPollEmojiFound = false; + private transient boolean isImageFound = false; + private transient boolean isEmojiTranslateFound = false; private boolean isTranslationShown = false; private boolean isNew = false; private boolean isVisible = true; private boolean fetchMore = false; private String content, contentCW, contentTranslated; private SpannableString contentSpan, contentSpanCW, contentSpanTranslated; - private RetrieveFeedsAsyncTask.Type type; + private transient RetrieveFeedsAsyncTask.Type type; private int itemViewType; private String conversationId; private boolean isExpanded = false; @@ -184,9 +184,9 @@ public class Status implements Parcelable { private List<String> imageURL; private int viewType; private boolean isFocused = false; - private long db_id; - private boolean commentsFetched = false; - private List<Status> comments = new ArrayList<>(); + private transient long db_id; + private transient boolean commentsFetched = false; + private transient List<Status> comments = new ArrayList<>(); public Status() { } @@ -1314,7 +1314,7 @@ public class Status implements Parcelable { } public String getContent() { - return content; + return content.replaceAll("\\p{C}", "?"); } public void setContent(Context context, String content) { diff --git a/app/src/main/java/app/fedilab/android/sqlite/StatusCacheDAO.java b/app/src/main/java/app/fedilab/android/sqlite/StatusCacheDAO.java index bc72083d9..014caf65c 100644 --- a/app/src/main/java/app/fedilab/android/sqlite/StatusCacheDAO.java +++ b/app/src/main/java/app/fedilab/android/sqlite/StatusCacheDAO.java @@ -78,7 +78,10 @@ public class StatusCacheDAO { values.put(Sqlite.COL_ACCOUNT, Helper.accountToStringStorage(status.getAccount())); values.put(Sqlite.COL_IN_REPLY_TO_ID, status.getIn_reply_to_id()); values.put(Sqlite.COL_IN_REPLY_TO_ACCOUNT_ID, status.getIn_reply_to_account_id()); - values.put(Sqlite.COL_REBLOG, status.getReblog() != null ? Helper.statusToStringStorage(status.getReblog()) : null); + try { + values.put(Sqlite.COL_REBLOG, status.getReblog() != null ? Helper.statusToStringStorage(status.getReblog()) : ""); + } catch (Exception ignored) { + } values.put(Sqlite.COL_CONTENT, status.getContent()); values.put(Sqlite.COL_EMOJIS, status.getEmojis() != null ? Helper.emojisToStringStorage(status.getEmojis()) : null); values.put(Sqlite.COL_POLL, status.getPoll() != null ? Helper.pollToStringStorage(status.getPoll()) : null); |