From f536f462c946ff02afcce1dd1a76c7a91053a68c Mon Sep 17 00:00:00 2001 From: tom79 Date: Tue, 26 Nov 2019 18:29:20 +0100 Subject: [PATCH] some fixes --- .../fedilab/android/activities/AboutActivity.java | 2 +- .../app/fedilab/android/activities/TootActivity.java | 9 +++++++-- .../java/app/fedilab/android/client/PeertubeAPI.java | 2 +- .../android/drawers/AccountSearchDevAdapter.java | 12 +++++++----- .../android/fragments/ColorSettingsFragment.java | 10 +++++++--- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java index ce17b0e9e..dda95cf50 100644 --- a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java @@ -242,7 +242,7 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) { new RetrieveRemoteDataAsyncTask(getApplicationContext(), "kasun", "toot.fedilab.app", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - new RetrieveRemoteDataAsyncTask(getApplicationContext(), "fedilab", "oot.fedilab.app", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + new RetrieveRemoteDataAsyncTask(getApplicationContext(), "fedilab", "toot.fedilab.app", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); new RetrieveRemoteDataAsyncTask(getApplicationContext(), "mmarif", "mastodon.social", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); new RetrieveRemoteDataAsyncTask(getApplicationContext(), "PhotonQyv", "mastodon.xyz", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); new RetrieveRemoteDataAsyncTask(getApplicationContext(), "angrytux", "social.tchncs.de", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java index 3a3554ec4..fae2c9983 100644 --- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java @@ -1316,10 +1316,15 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, private void addNewMedia(JSONObject response, ArrayList successfullyUploadedFiles) { Attachment attachment; //response = new JSONObject(serverResponse.getBodyAsString()); - if (social != UpdateAccountInfoAsyncTask.SOCIAL.GNU && social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) + if( response == null ){ + Toasty.error(TootActivity.this, getString(R.string.toast_error), Toasty.LENGTH_SHORT).show(); + return; + } + if (social != UpdateAccountInfoAsyncTask.SOCIAL.GNU && social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) { attachment = API.parseAttachmentResponse(response); - else + } else { attachment = GNUAPI.parseUploadedAttachmentResponse(response); + } boolean alreadyAdded = false; int index = 0; diff --git a/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java b/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java index 48cfe8ada..7491ce65b 100644 --- a/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java +++ b/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java @@ -827,7 +827,7 @@ public class PeertubeAPI { SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); String token = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null); //This account is currently logged in, the token is updated - if (prefKeyOauthTokenT.equals(token)) { + if (prefKeyOauthTokenT != null && prefKeyOauthTokenT.equals(token)) { SharedPreferences.Editor editor = sharedpreferences.edit(); editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, targetedAccount.getToken()); editor.apply(); diff --git a/app/src/main/java/app/fedilab/android/drawers/AccountSearchDevAdapter.java b/app/src/main/java/app/fedilab/android/drawers/AccountSearchDevAdapter.java index 38d2a979e..2e21c2085 100644 --- a/app/src/main/java/app/fedilab/android/drawers/AccountSearchDevAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/AccountSearchDevAdapter.java @@ -14,6 +14,7 @@ package app.fedilab.android.drawers; * You should have received a copy of the GNU General Public License along with Fedilab; if not, * see . */ +import android.app.Activity; import android.content.Context; import android.content.Intent; import android.graphics.drawable.Drawable; @@ -54,7 +55,6 @@ import es.dmoral.toasty.Toasty; public class AccountSearchDevAdapter extends BaseAdapter implements OnPostActionInterface { private List accounts; - private LayoutInflater layoutInflater; private Context context; private ViewHolder holder; @@ -83,7 +83,7 @@ public class AccountSearchDevAdapter extends BaseAdapter implements OnPostAction public View getView(final int position, View convertView, ViewGroup parent) { context = parent.getContext(); - layoutInflater = LayoutInflater.from(context); + LayoutInflater layoutInflater = LayoutInflater.from(context); final Account account = accounts.get(position); if (convertView == null) { @@ -132,9 +132,11 @@ public class AccountSearchDevAdapter extends BaseAdapter implements OnPostAction //Profile picture if (account.getAvatar().startsWith("http")) { - Glide.with(holder.account_pp.getContext()) - .load(account.getAvatar()) - .into(holder.account_pp); + if( !((Activity)context).isFinishing()) { + Glide.with(holder.account_pp.getContext()) + .load(account.getAvatar()) + .into(holder.account_pp); + } } else if (account.getSocial() != null && account.getSocial().contains("OPENCOLLECTIVE")) { Glide.with(holder.account_pp.getContext()) .load(R.drawable.missing) diff --git a/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java b/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java index 1ab5b3df0..0f6aae9dc 100644 --- a/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java @@ -178,12 +178,16 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S if (key.compareTo("base_theme") == 0) { SharedPreferences sharedpreferences = getActivity().getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); SharedPreferences.Editor appEditor = sharedpreferences.edit(); - appEditor.putInt(Helper.SET_THEME, Integer.parseInt(value)); + if( value != null && value.matches("-?\\d+")) { + appEditor.putInt(Helper.SET_THEME, Integer.parseInt(value)); + } appEditor.commit(); } else if (key.compareTo("pref_color_navigation_bar") == 0 || key.compareTo("pref_color_status_bar") == 0) { - editor.putBoolean(key, Boolean.valueOf(value)); + editor.putBoolean(key, Boolean.parseBoolean(value)); } else { - editor.putInt(key, Integer.valueOf(value)); + if( value != null && value.matches("-?\\d+")) { + editor.putInt(key, Integer.parseInt(value)); + } } } }