diff --git a/app/build.gradle b/app/build.gradle index f99e50c87..d0167e2b8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 15 targetSdkVersion 28 - versionCode 147 - versionName "1.14.2" + versionCode 148 + versionName "1.14.3" } flavorDimensions "default" buildTypes { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java index 24f0061b6..8cbbdef53 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java @@ -784,6 +784,7 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount WeakReference activityWeakReference; android.net.Uri uriFile; Account accountReply; + asyncPicture(Activity activity, Account accountReply, android.net.Uri uri){ this.activityWeakReference = new WeakReference<>(activity); this.uriFile = uri; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java index e450e19ee..d6f2bb6d0 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java @@ -559,7 +559,7 @@ public class API { List howToVideos = new ArrayList<>(); try { HttpsConnection httpsConnection = new HttpsConnection(context); - String response = httpsConnection.get("https://peertube.fr/api/v1/video-channels/bb32394a-a6d2-4f41-9b8e-ad9514a66009/videos", 60, null, null); + String response = httpsConnection.get("https://peertube.social/api/v1/video-channels/mastalab_channel/videos", 60, null, null); JSONArray jsonArray = new JSONObject(response).getJSONArray("data"); howToVideos = parseHowTos(jsonArray); } catch (HttpsConnection.HttpsConnectionException e) { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/HowToVideosAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/HowToVideosAdapter.java index e5ce1df64..7d7f80f51 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/HowToVideosAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/HowToVideosAdapter.java @@ -118,14 +118,14 @@ public class HowToVideosAdapter extends BaseAdapter implements OnListActionInter next.setBounds(0,0,(int) (30 * scale + 0.5f),(int) (30 * scale + 0.5f)); holder.how_to_description.setCompoundDrawables(null, null, next, null); Glide.with(holder.how_to_image.getContext()) - .load("https://peertube.fr" + howToVideo.getThumbnailPath()) + .load("https://peertube.social" + howToVideo.getThumbnailPath()) .into(holder.how_to_image); holder.how_to_container.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Intent intent = new Intent(context, WebviewActivity.class); Bundle b = new Bundle(); - String finalUrl = "https://peertube.fr" + howToVideo.getEmbedPath(); + String finalUrl = "https://peertube.social" + howToVideo.getEmbedPath(); b.putString("url", finalUrl); b.putBoolean("peertubeLink", true); Pattern link = Pattern.compile("(https?:\\/\\/[\\da-z\\.-]+\\.[a-z\\.]{2,10})\\/videos\\/embed\\/(\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12})$"); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index 09f6d362a..6804d2823 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -20,7 +20,6 @@ import android.database.sqlite.SQLiteDatabase; import android.graphics.Bitmap; import android.os.Handler; import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; import android.support.v7.app.AlertDialog; import android.content.ClipData; import android.content.ClipboardManager; @@ -82,7 +81,6 @@ import java.util.regex.Pattern; import fr.gouv.etalab.mastodon.R; import fr.gouv.etalab.mastodon.activities.BaseMainActivity; -import fr.gouv.etalab.mastodon.activities.MainActivity; import fr.gouv.etalab.mastodon.activities.MediaActivity; import fr.gouv.etalab.mastodon.activities.ShowAccountActivity; import fr.gouv.etalab.mastodon.activities.ShowConversationActivity; @@ -97,7 +95,6 @@ import fr.gouv.etalab.mastodon.client.Entities.Attachment; import fr.gouv.etalab.mastodon.client.Entities.Card; import fr.gouv.etalab.mastodon.client.Entities.Emojis; import fr.gouv.etalab.mastodon.client.Entities.Error; -import fr.gouv.etalab.mastodon.client.Entities.Filters; import fr.gouv.etalab.mastodon.client.Entities.Status; import fr.gouv.etalab.mastodon.fragments.DisplayStatusFragment; import fr.gouv.etalab.mastodon.helper.CrossActions; @@ -105,7 +102,6 @@ import fr.gouv.etalab.mastodon.helper.CustomTextView; import fr.gouv.etalab.mastodon.helper.Helper; import fr.gouv.etalab.mastodon.interfaces.OnPostActionInterface; import fr.gouv.etalab.mastodon.interfaces.OnRetrieveCardInterface; -import fr.gouv.etalab.mastodon.interfaces.OnRetrieveEmojiAccountInterface; import fr.gouv.etalab.mastodon.interfaces.OnRetrieveEmojiInterface; import fr.gouv.etalab.mastodon.interfaces.OnRetrieveFeedsInterface; import fr.gouv.etalab.mastodon.interfaces.OnRetrieveRepliesInterface; @@ -115,9 +111,7 @@ import fr.gouv.etalab.mastodon.sqlite.StatusCacheDAO; import fr.gouv.etalab.mastodon.sqlite.StatusStoredDAO; import fr.gouv.etalab.mastodon.sqlite.TempMuteDAO; -import static fr.gouv.etalab.mastodon.activities.BaseMainActivity.filters; import static fr.gouv.etalab.mastodon.activities.MainActivity.currentLocale; -import static fr.gouv.etalab.mastodon.helper.Helper.HOME_TIMELINE_INTENT; import static fr.gouv.etalab.mastodon.helper.Helper.THEME_BLACK; import static fr.gouv.etalab.mastodon.helper.Helper.THEME_DARK; import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor; @@ -145,22 +139,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct private int conversationPosition; private List timedMute; private boolean redraft; - private Status status; private Status toot; - public StatusListAdapter(Context context, List timedMute, RetrieveFeedsAsyncTask.Type type, String targetedId, boolean isOnWifi, int behaviorWithAttachments, int translator, List statuses){ - super(); - this.context = context; - this.statuses = statuses; - this.isOnWifi = isOnWifi; - this.behaviorWithAttachments = behaviorWithAttachments; - layoutInflater = LayoutInflater.from(this.context); - statusListAdapter = this; - this.type = type; - this.targetedId = targetedId; - this.translator = translator; - this.timedMute = timedMute; - redraft = false; - } + public StatusListAdapter(Context context, RetrieveFeedsAsyncTask.Type type, String targetedId, boolean isOnWifi, int behaviorWithAttachments, int translator, List statuses){ super(); @@ -377,7 +357,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct @Override public int getItemViewType(int position) { - status = statuses.get(position); SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); boolean isCompactMode = sharedpreferences.getBoolean(Helper.SET_COMPACT_MODE, true); if( type == RetrieveFeedsAsyncTask.Type.CONTEXT && position == conversationPosition) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index fed0e8821..a8162fdc5 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -2413,7 +2413,7 @@ public class Helper { ArrayList filterContext = mfilter.getContext(); if( (type == RetrieveFeedsAsyncTask.Type.HOME && filterContext.contains("home")) || - (type == RetrieveFeedsAsyncTask.Type.LOCAL && filterContext.contains("local")) || + (type == RetrieveFeedsAsyncTask.Type.LOCAL && filterContext.contains("public")) || (type == RetrieveFeedsAsyncTask.Type.PUBLIC && filterContext.contains("public")) ) { diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml index ef18602b2..81f257a42 100644 --- a/app/src/main/res/layout/drawer_status.xml +++ b/app/src/main/res/layout/drawer_status.xml @@ -113,7 +113,6 @@ android:orientation="vertical"> Mututu kontu hau? Blokeatu kontu hau? Salatu toot hau? - Block this domain? + Blokeatu domeinu hau? Kendu toot hau? @@ -563,17 +563,17 @@ Eskerrik asko Stéphane logoagatik. Hautatu doinua Gaitu denbora-tartea Laguntza bideoak - Fetching remote thread! - No blocked domains! - Unblock domain - Are you sure to unblock %s? - Are you sure to block %s? - Blocked domains - Block domain - The domain is blocked - The domain is no longer blocked! - Fetching remote status - Comment + Urruneko haria eskuratzen! + Ez dago blokeatutako domeinurik! + Desblokeatu domeinua + Ziur al zaude %s desblokeatu nahi duzula? + Ziur al zaude %s blokeatu nahi duzula? + Blokeatutako domeinuak + Blokeatu domeinua + Domeinu hau blokeatuta dago + Domeinua ez dago jada blokeatuta! + Urruneko mezua jasotzen + Iruzkina Inoiz ez 30 minutu diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 92caeff08..90995cc75 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -123,7 +123,7 @@ Ућуткај овај налог? Блокирај овај налог? Пријави овaj тут? - Block this domain? + Блокирај овај домен? Уклони овај тут? @@ -567,17 +567,17 @@ Изаберите тон Омогући термин Видео упутства - Fetching remote thread! - No blocked domains! - Unblock domain - Are you sure to unblock %s? - Are you sure to block %s? - Blocked domains - Block domain - The domain is blocked - The domain is no longer blocked! - Fetching remote status - Comment + Дохватам удаљену преписку! + Нема блокираних домена! + Одблокирај домен + Да ли сте сигурни да желите да одблокирате %s? + Да ли сте сигурни да желите да блокирате %s? + Блокирани домени + Блокирај домен + Домен блокиран + Домен није више блокиран! + Дохватам удаљени статус + Коментар Никадa 30 минута