From f63ea0db0113485b02d44249cb837d96e4c8a5e2 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sat, 16 Nov 2019 18:36:08 +0100 Subject: [PATCH] Release 2.25.0 --- app/build.gradle | 4 +- .../android/activities/AboutActivity.java | 50 +++++++------------ .../android/activities/TootActivity.java | 4 ++ .../UpdateAccountInfoByIDAsyncTask.java | 4 +- .../java/app/fedilab/android/client/API.java | 10 +--- .../android/drawers/CustomEmojiAdapter.java | 4 +- .../res/layout-sw600dp/activity_about.xml | 41 ++++----------- app/src/main/res/layout/activity_about.xml | 32 +++--------- .../metadata/android/en-US/changelogs/336.txt | 12 +++++ 9 files changed, 59 insertions(+), 102 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/336.txt diff --git a/app/build.gradle b/app/build.gradle index 1f62083e1..dd3038eee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { minSdkVersion 19 targetSdkVersion 29 - versionCode 335 - versionName "2.25.0-beta-3" + versionCode 336 + versionName "2.25.0" multiDexEnabled true renderscriptTargetApi 28 as int renderscriptSupportModeEnabled true 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 af6e54c50..11a21752b 100644 --- a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java @@ -66,11 +66,9 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou private List developers = new ArrayList<>(); private List contributors = new ArrayList<>(); - private List designers = new ArrayList<>(); private List uxuidesigners = new ArrayList<>(); private AccountSearchDevAdapter accountSearchWebAdapterDeveloper; - private AccountSearchDevAdapter accountSearchWebAdapterDesigner; private AccountSearchDevAdapter accountSearchWebAdapterContributors; private AccountSearchDevAdapter accountSearchWebAdapterUxUiDesigners; @@ -120,7 +118,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou } ExpandableHeightListView lv_developers = findViewById(R.id.lv_developers); - ExpandableHeightListView lv_designers = findViewById(R.id.lv_designers); ExpandableHeightListView lv_contributors = findViewById(R.id.lv_contributors); ExpandableHeightListView lv_ux = findViewById(R.id.lv_ux); @@ -130,10 +127,10 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou Button about_trunk = findViewById(R.id.about_trunk); - TextView txt_developers, txt_ux, txt_designers, txt_thankyou1, txt_thankyou2; + TextView txt_developers, txt_ux, txt_thankyou3, txt_thankyou1, txt_thankyou2; txt_developers = findViewById(R.id.txt_developers); txt_ux = findViewById(R.id.txt_ux); - txt_designers = findViewById(R.id.txt_designers); + txt_thankyou3 = findViewById(R.id.txt_thankyou3); txt_thankyou1 = findViewById(R.id.txt_thankyou1); txt_thankyou2 = findViewById(R.id.txt_thankyou2); @@ -234,22 +231,19 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou setTitle(R.string.action_about); lv_contributors.setExpanded(true); lv_developers.setExpanded(true); - lv_designers.setExpanded(true); lv_ux.setExpanded(true); accountSearchWebAdapterContributors = new AccountSearchDevAdapter(contributors); lv_contributors.setAdapter(accountSearchWebAdapterContributors); - accountSearchWebAdapterDesigner = new AccountSearchDevAdapter(designers); - lv_designers.setAdapter(accountSearchWebAdapterDesigner); accountSearchWebAdapterDeveloper = new AccountSearchDevAdapter(developers); lv_developers.setAdapter(accountSearchWebAdapterDeveloper); accountSearchWebAdapterUxUiDesigners = new AccountSearchDevAdapter(uxuidesigners); lv_ux.setAdapter(accountSearchWebAdapterUxUiDesigners); 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", "framapiaf.org", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); new RetrieveRemoteDataAsyncTask(getApplicationContext(), "mmarif", "mastodon.social", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - new RetrieveRemoteDataAsyncTask(getApplicationContext(), "kasun", "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); new RetrieveRemoteDataAsyncTask(getApplicationContext(), "guzzisti", "mastodon.social", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); @@ -294,25 +288,33 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou Helper.openBrowser(AboutActivity.this, "https://social.tchncs.de/@angrytux"); } }); + + name = new SpannableString("@kasun@stoot.fedilab.app"); + name.setSpan(new UnderlineSpan(), 0, name.length(), 0); + txt_thankyou3.setText(name); + txt_thankyou3.setVisibility(View.VISIBLE); + txt_thankyou3.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Helper.openBrowser(AboutActivity.this, "https://toot.fedilab.app/@kasun"); + } + }); } } @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - finish(); - return true; - default: - return super.onOptionsItemSelected(item); + if (item.getItemId() == android.R.id.home) { + finish(); + return true; } + return super.onOptionsItemSelected(item); } @Override public void onRetrieveRemoteAccount(Results results) { - SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE); if (results == null) { Toasty.error(getApplicationContext(), getString(R.string.toast_error), Toast.LENGTH_LONG).show(); return; @@ -327,10 +329,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou developers.add(account); accountSearchWebAdapterDeveloper.notifyDataSetChanged(); break; - case "kasun": - designers.add(account); - accountSearchWebAdapterDesigner.notifyDataSetChanged(); - break; case "mmarif": uxuidesigners.add(account); accountSearchWebAdapterUxUiDesigners.notifyDataSetChanged(); @@ -353,11 +351,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou new RetrieveRelationshipAsyncTask(getApplicationContext(), account.getId(), AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } } - if (designers != null) { - for (Account account : designers) { - new RetrieveRelationshipAsyncTask(getApplicationContext(), account.getId(), AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - } - } if (contributors != null) { for (Account account : contributors) { new RetrieveRelationshipAsyncTask(getApplicationContext(), account.getId(), AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); @@ -384,13 +377,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou break; } } - for (int i = 0; i < designers.size(); i++) { - if (designers.get(i).getId() != null && designers.get(i).getId().equals(relationship.getId())) { - designers.get(i).setFollowing(relationship.isFollowing() || userId.trim().equals(relationship.getId())); - accountSearchWebAdapterDesigner.notifyDataSetChanged(); - break; - } - } for (int i = 0; i < contributors.size(); i++) { if (contributors.get(i).getId() != null && contributors.get(i).getId().equals(relationship.getId())) { contributors.get(i).setFollowing(relationship.isFollowing() || userId.trim().equals(relationship.getId())); 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 8ae05f095..5ec098841 100644 --- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java @@ -1895,6 +1895,10 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, picker.show(getSupportFragmentManager(), "COUNTRY_PICKER"); return true; case R.id.action_emoji: + if( emojis != null){ + emojis.clear(); + emojis = null; + } emojis = new CustomEmojiDAO(getApplicationContext(), db).getAllEmojis(account.getInstance()); final AlertDialog.Builder builder = new AlertDialog.Builder(this, style); int paddingPixel = 15; diff --git a/app/src/main/java/app/fedilab/android/asynctasks/UpdateAccountInfoByIDAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/UpdateAccountInfoByIDAsyncTask.java index 2f4cd89e7..e575fdf5b 100644 --- a/app/src/main/java/app/fedilab/android/asynctasks/UpdateAccountInfoByIDAsyncTask.java +++ b/app/src/main/java/app/fedilab/android/asynctasks/UpdateAccountInfoByIDAsyncTask.java @@ -86,7 +86,9 @@ public class UpdateAccountInfoByIDAsyncTask extends AsyncTask if (response != null && response.getEmojis() != null && response.getEmojis().size() > 0) { new CustomEmojiDAO(contextReference.get(), db).removeAll(); for (Emojis emojis : response.getEmojis()) { - new CustomEmojiDAO(contextReference.get(), db).insertEmoji(emojis); + if( emojis.isVisible_in_picker()) { + new CustomEmojiDAO(contextReference.get(), db).insertEmoji(emojis); + } } } } catch (Exception ignored) { diff --git a/app/src/main/java/app/fedilab/android/client/API.java b/app/src/main/java/app/fedilab/android/client/API.java index 9a373ea8a..90e5ff62f 100644 --- a/app/src/main/java/app/fedilab/android/client/API.java +++ b/app/src/main/java/app/fedilab/android/client/API.java @@ -4836,18 +4836,10 @@ public class API { HttpsConnection httpsConnection = new HttpsConnection(context, this.instance); String response = httpsConnection.get(getAbsoluteUrl("/custom_emojis"), 10, null, prefKeyOauthTokenT); emojis = parseEmojis(new JSONArray(response)); - apiResponse.setSince_id(httpsConnection.getSince_id()); - apiResponse.setMax_id(httpsConnection.getMax_id()); } catch (HttpsConnection.HttpsConnectionException e) { setError(e.getStatusCode(), e); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } catch (KeyManagementException e) { - e.printStackTrace(); - } catch (JSONException e) { + } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) { e.printStackTrace(); } //Add custom emoji for Pleroma diff --git a/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java b/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java index 5276ced06..eaa9814cb 100644 --- a/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java @@ -84,7 +84,7 @@ public class CustomEmojiAdapter extends BaseAdapter { } - if (!emoji.isDrawableFound()) { + //if (!emoji.isDrawableFound()) { emoji.setDrawableFound(true); Glide.with(parent.getContext()) .asFile() @@ -116,7 +116,7 @@ public class CustomEmojiAdapter extends BaseAdapter { imageView.setImageDrawable(emoji.getDrawable()); } }); - } + // } return convertView; } } \ No newline at end of file diff --git a/app/src/main/res/layout-sw600dp/activity_about.xml b/app/src/main/res/layout-sw600dp/activity_about.xml index 7780fd3c6..b022810e0 100644 --- a/app/src/main/res/layout-sw600dp/activity_about.xml +++ b/app/src/main/res/layout-sw600dp/activity_about.xml @@ -20,7 +20,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - @@ -169,36 +169,6 @@ android:layout_marginRight="150dp" android:textSize="16sp" android:visibility="gone" /> - - - - - - + - - - - - - + +