forked from mirrors/Fedilab
Compare commits
No commits in common. "main" and "peertube_integration" have entirely different histories.
main
...
peertube_i
162 changed files with 1411 additions and 3554 deletions
|
|
@ -13,8 +13,8 @@ android {
|
|||
defaultConfig {
|
||||
minSdk 21
|
||||
targetSdk 33
|
||||
versionCode 477
|
||||
versionName "3.17.0"
|
||||
versionCode 471
|
||||
versionName "3.15.2"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
flavorDimensions "default"
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
<shortcut
|
||||
android:shortcutId="compose"
|
||||
android:enabled="true"
|
||||
android:icon="@drawable/ic_baseline_add_comment_24"
|
||||
android:shortcutShortLabel="@string/compose_shortcut_short_label1"
|
||||
tools:targetApi="n_mr1">
|
||||
<intent
|
||||
android:action="app.fedilab.android.shorcut.compose"
|
||||
android:targetClass="app.fedilab.android.activities.MainActivity"
|
||||
android:targetPackage="fr.gouv.etalab.mastodon.debug" />
|
||||
|
||||
<categories android:name="android.shortcut.conversation" />
|
||||
<capability-binding android:key="actions.intent.CREATE_MESSAGE" />
|
||||
</shortcut>
|
||||
|
||||
|
||||
</shortcuts>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package app.fedilab.android.activities;
|
||||
/* Copyright 2023 Thomas Schneider
|
||||
/* Copyright 2021 Thomas Schneider
|
||||
*
|
||||
* This file is a part of Fedilab
|
||||
* This file is a part of TubeLab
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it under the terms of the
|
||||
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
|
||||
|
|
@ -15,7 +15,6 @@ package app.fedilab.android.activities;
|
|||
* see <http://www.gnu.org/licenses>. */
|
||||
|
||||
|
||||
|
||||
import static app.fedilab.android.peertube.helper.Helper.CAST_ID;
|
||||
|
||||
import android.content.Intent;
|
||||
|
|
@ -63,8 +62,6 @@ public class BasePeertubeActivity extends BaseBarActivity {
|
|||
binding = ActivityPeertubeBinding.inflate(getLayoutInflater());
|
||||
View view = binding.getRoot();
|
||||
setContentView(view);
|
||||
|
||||
|
||||
binding.minController.castPlay.setOnClickListener(v -> {
|
||||
binding.minController.castLoader.setVisibility(View.VISIBLE);
|
||||
if (PeertubeBaseMainActivity.chromeCast != null) {
|
||||
|
|
@ -100,7 +97,7 @@ public class BasePeertubeActivity extends BaseBarActivity {
|
|||
if (item.getItemId() == R.id.action_cast) {
|
||||
if (PeertubeBaseMainActivity.chromeCasts != null && PeertubeBaseMainActivity.chromeCasts.size() > 0) {
|
||||
String[] chromecast_choice = new String[PeertubeBaseMainActivity.chromeCasts.size()];
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(this);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
alt_bld.setTitle(R.string.chromecast_choice);
|
||||
int i = 0;
|
||||
for (ChromeCast cc : PeertubeBaseMainActivity.chromeCasts) {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package app.fedilab.android.activities;
|
||||
/* Copyright 2023 Thomas Schneider
|
||||
/* Copyright 2021 Thomas Schneider
|
||||
*
|
||||
* This file is a part of Fedilab
|
||||
* This file is a part of TubeLab
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it under the terms of the
|
||||
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
|
||||
|
|
@ -14,7 +14,6 @@ package app.fedilab.android.activities;
|
|||
* You should have received a copy of the GNU General Public License along with Fedilab; if not,
|
||||
* see <http://www.gnu.org/licenses>. */
|
||||
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
<shortcut
|
||||
android:shortcutId="compose"
|
||||
android:enabled="true"
|
||||
android:icon="@drawable/ic_baseline_add_comment_24"
|
||||
android:shortcutShortLabel="@string/compose_shortcut_short_label1"
|
||||
tools:targetApi="n_mr1">
|
||||
<intent
|
||||
android:action="app.fedilab.android.shorcut.compose"
|
||||
android:targetClass="app.fedilab.android.activities.MainActivity"
|
||||
android:targetPackage="fr.gouv.etalab.mastodon" />
|
||||
|
||||
<categories android:name="android.shortcut.conversation" />
|
||||
<capability-binding android:key="actions.intent.CREATE_MESSAGE" />
|
||||
</shortcut>
|
||||
|
||||
|
||||
</shortcuts>
|
||||
|
|
@ -80,13 +80,9 @@
|
|||
android:roundIcon="@mipmap/ic_launcher_bubbles_round"
|
||||
android:targetActivity=".activities.MainActivity">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
<meta-data
|
||||
android:name="android.app.shortcuts"
|
||||
android:resource="@xml/compose_shortcuts" />
|
||||
</activity-alias>
|
||||
|
||||
<activity-alias
|
||||
|
|
@ -100,9 +96,6 @@
|
|||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
<meta-data
|
||||
android:name="android.app.shortcuts"
|
||||
android:resource="@xml/compose_shortcuts" />
|
||||
</activity-alias>
|
||||
|
||||
<activity-alias
|
||||
|
|
@ -116,9 +109,6 @@
|
|||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
<meta-data
|
||||
android:name="android.app.shortcuts"
|
||||
android:resource="@xml/compose_shortcuts" />
|
||||
</activity-alias>
|
||||
|
||||
<activity-alias
|
||||
|
|
@ -132,9 +122,6 @@
|
|||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
<meta-data
|
||||
android:name="android.app.shortcuts"
|
||||
android:resource="@xml/compose_shortcuts" />
|
||||
</activity-alias>
|
||||
|
||||
<activity-alias
|
||||
|
|
@ -148,9 +135,6 @@
|
|||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
<meta-data
|
||||
android:name="android.app.shortcuts"
|
||||
android:resource="@xml/compose_shortcuts" />
|
||||
</activity-alias>
|
||||
|
||||
<activity-alias
|
||||
|
|
@ -164,9 +148,6 @@
|
|||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
<meta-data
|
||||
android:name="android.app.shortcuts"
|
||||
android:resource="@xml/compose_shortcuts" />
|
||||
</activity-alias>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,34 +1,4 @@
|
|||
[
|
||||
{
|
||||
"version": "3.17.0",
|
||||
"code": "477",
|
||||
"note": "Added:\n- Peertube 2FA support\n- Cache home in background (default disabled -> New settings category and per account) / change frequency\n- Auto-fetch missing messages for the Home (default disabled -> in Settings - Timelines)\n- Automatically switch between tabs when searching\n- More deep links detection\n- Allow to group mentions at the top (default: disabled)\n\n\nFixed:\n- Dynamic color for Android 12+\n- Missing media description for previews\n- Fix a crash when replying\n- Fix button size not changed\n- Forward tags in replies\n- Media cannot be downloaded or shared with Android 10\n- Some crashes"
|
||||
},
|
||||
{
|
||||
"version": "3.16.4",
|
||||
"code": "476",
|
||||
"note": "Added:\n- Cache home in background (default disabled -> New settings category and per account) / change frequency\n- Auto-fetch missing messages for the Home (default disabled -> in Settings - Timelines)\n- Automatically switch between tabs when searching\n\nFixed:\n- Some crashes"
|
||||
},
|
||||
{
|
||||
"version": "3.16.3",
|
||||
"code": "475",
|
||||
"note": "Added:\n- Peertube 2FA support\n\nFixed:\n- Dynamic color for Android 12+"
|
||||
},
|
||||
{
|
||||
"version": "3.16.2",
|
||||
"code": "474",
|
||||
"note": "Added:\n- Peertube support\n- Compose shortcut (long press launcher)\n- Long press compose button to write with another account\n- Edit description and focus for media (for the next Mastodon release)\n\nChanged:\n- Cross actions with two accounts display a dialog\n- Order & compact og values when sharing > title - url - content\n- Tap on top message (user info) open threads\n\nFixed:\n- Text cleared when adding a media\n- Fix Maths not working with quotes\n- Fix crashes"
|
||||
},
|
||||
{
|
||||
"version": "3.16.1",
|
||||
"code": "473",
|
||||
"note": "Changed:\n- Edit description and focus for media (for the next Mastodon release)\n\nChanged:\n- Peertube: remove role support to avoid crashes with older instances\n\nFixed:\n- Fix some crashes"
|
||||
},
|
||||
{
|
||||
"version": "3.16.0",
|
||||
"code": "472",
|
||||
"note": "Changed:\n- Peertube support\n- Compose shortcut\n- Long press compose button to write with another account\n\nChanged:\n- Cross actions with two accounts display a dialog\n- Order & compact og values when sharing > title - url - content\n\nFixed:\n- Text cleared when adding a media\n- Fix crashes"
|
||||
},
|
||||
{
|
||||
"version": "3.15.2",
|
||||
"code": "471",
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_INSTANCE;
|
|||
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_SOFTWARE;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_TOKEN;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.displayReleaseNotesIfNeeded;
|
||||
import static app.fedilab.android.mastodon.helper.ThemeHelper.fetchAccentColor;
|
||||
import static app.fedilab.android.mastodon.ui.drawer.StatusAdapter.sendAction;
|
||||
|
||||
import android.Manifest;
|
||||
|
|
@ -36,7 +35,6 @@ import android.content.IntentFilter;
|
|||
import android.content.SharedPreferences;
|
||||
import android.database.MatrixCursor;
|
||||
import android.graphics.PorterDuff;
|
||||
import android.graphics.drawable.BitmapDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
|
|
@ -83,19 +81,13 @@ import androidx.navigation.Navigation;
|
|||
import androidx.navigation.ui.AppBarConfiguration;
|
||||
import androidx.navigation.ui.NavigationUI;
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.viewpager.widget.ViewPager;
|
||||
|
||||
import com.avatarfirst.avatargenlib.AvatarGenerator;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
|
||||
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
|
||||
import com.bumptech.glide.load.resource.gif.GifDrawable;
|
||||
import com.bumptech.glide.request.FutureTarget;
|
||||
import com.bumptech.glide.request.RequestOptions;
|
||||
import com.bumptech.glide.request.target.CustomTarget;
|
||||
import com.bumptech.glide.request.target.Target;
|
||||
import com.bumptech.glide.request.transition.Transition;
|
||||
import com.google.android.material.bottomnavigation.BottomNavigationView;
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
import com.google.android.material.navigation.NavigationView;
|
||||
import com.google.android.material.snackbar.Snackbar;
|
||||
|
|
@ -434,7 +426,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
|
|||
headerMainBinding.ownerAccounts.setImageResource(R.drawable.ic_baseline_arrow_drop_up_24);
|
||||
new Thread(() -> {
|
||||
try {
|
||||
List<BaseAccount> accounts = new Account(activity).getOtherAccounts();
|
||||
List<BaseAccount> accounts = new Account(activity).getCrossAccounts();
|
||||
Handler mainHandler = new Handler(Looper.getMainLooper());
|
||||
Runnable myRunnable = () -> {
|
||||
navigationView.getMenu().clear();
|
||||
|
|
@ -465,42 +457,16 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
|
|||
}
|
||||
} else if (account.peertube_account != null) {
|
||||
acct = account.peertube_account.getAcct();
|
||||
if (account.peertube_account.getAvatar() != null) {
|
||||
url = account.peertube_account.getAvatar().getPath();
|
||||
if (url != null && url.startsWith("/")) {
|
||||
url = "https://" + account.instance + account.peertube_account.getAvatar().getPath();
|
||||
}
|
||||
url = account.peertube_account.getAvatar().getPath();
|
||||
if (url != null && url.startsWith("/")) {
|
||||
url = "https://" + account.instance + account.peertube_account.getAvatar().getPath();
|
||||
}
|
||||
}
|
||||
|
||||
final MenuItem item = currentSubmenu.add("@" + acct);
|
||||
item.setIcon(R.drawable.ic_person);
|
||||
if (!activity.isDestroyed() && !activity.isFinishing() && url != null) {
|
||||
if (url.trim().isEmpty()) {
|
||||
BitmapDrawable avatar = new AvatarGenerator.AvatarBuilder(activity)
|
||||
.setLabel(account.peertube_account.getAcct())
|
||||
.setAvatarSize(120)
|
||||
.setTextSize(30)
|
||||
.toSquare()
|
||||
.setBackgroundColor(fetchAccentColor(activity))
|
||||
.build();
|
||||
Glide.with(activity)
|
||||
.asDrawable()
|
||||
.load(avatar)
|
||||
.apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(10)))
|
||||
.into(new CustomTarget<Drawable>() {
|
||||
@Override
|
||||
public void onResourceReady(@NonNull Drawable resource, Transition<? super Drawable> transition) {
|
||||
item.setIcon(resource);
|
||||
item.getIcon().setColorFilter(0xFFFFFFFF, PorterDuff.Mode.MULTIPLY);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLoadCleared(@Nullable Drawable placeholder) {
|
||||
|
||||
}
|
||||
});
|
||||
} else if (url.contains(".gif")) {
|
||||
if (url.contains(".gif")) {
|
||||
Glide.with(activity)
|
||||
.asGif()
|
||||
.load(url)
|
||||
|
|
@ -605,7 +571,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
|
|||
popup.setOnMenuItemClickListener(item -> {
|
||||
int itemId = item.getItemId();
|
||||
if (itemId == R.id.action_logout_account) {
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(activity);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(activity, Helper.dialogStyle());
|
||||
alt_bld.setTitle(R.string.action_logout);
|
||||
if (currentAccount.mastodon_account != null && currentAccount.instance != null) {
|
||||
alt_bld.setMessage(activity.getString(R.string.logout_account_confirmation, currentAccount.mastodon_account.username, currentAccount.instance));
|
||||
|
|
@ -637,391 +603,10 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
|
|||
|
||||
protected abstract void rateThisApp();
|
||||
|
||||
/**
|
||||
* Open notifications tab when coming from a notification device
|
||||
*
|
||||
* @param intent - Intent intent that will be cancelled
|
||||
*/
|
||||
private static void openNotifications(Activity activity, Intent intent) {
|
||||
final Handler handler = new Handler();
|
||||
handler.postDelayed(() -> {
|
||||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(activity);
|
||||
boolean singleBar = sharedpreferences.getBoolean(activity.getString(R.string.SET_USE_SINGLE_TOPBAR), false);
|
||||
BottomNavigationView bottomNavigationView = activity.findViewById(R.id.bottom_nav_view);
|
||||
TabLayout tabLayout = activity.findViewById(R.id.tabLayout);
|
||||
ViewPager viewPager = activity.findViewById(R.id.view_pager);
|
||||
|
||||
if (bottomNavigationView != null && tabLayout != null && viewPager != null) {
|
||||
if (!singleBar) {
|
||||
bottomNavigationView.setSelectedItemId(R.id.nav_notifications);
|
||||
} else {
|
||||
int position = 0;
|
||||
for (int i = 0; i < tabLayout.getTabCount(); i++) {
|
||||
TabLayout.Tab tab = tabLayout.getTabAt(i);
|
||||
if (tab != null && tab.getTag() != null && tab.getTag().equals(Timeline.TimeLineEnum.NOTIFICATION.getValue())) {
|
||||
break;
|
||||
}
|
||||
position++;
|
||||
}
|
||||
viewPager.setCurrentItem(position);
|
||||
}
|
||||
}
|
||||
}, 1000);
|
||||
intent.removeExtra(Helper.INTENT_ACTION);
|
||||
}
|
||||
|
||||
@SuppressLint("ApplySharedPref")
|
||||
public static void mamageNewIntent(Activity activity, Intent intent) {
|
||||
if (intent == null)
|
||||
return;
|
||||
String action = intent.getAction();
|
||||
String type = intent.getType();
|
||||
Bundle extras = intent.getExtras();
|
||||
String userIdIntent, instanceIntent, urlOfMessage;
|
||||
if (action != null && action.equalsIgnoreCase("app.fedilab.android.shorcut.compose")) {
|
||||
if (!activity.isFinishing()) {
|
||||
CrossActionHelper.doCrossAction(activity, CrossActionHelper.TypeOfCrossAction.COMPOSE, null, null);
|
||||
intent.replaceExtras(new Bundle());
|
||||
intent.setAction("");
|
||||
intent.setData(null);
|
||||
intent.setFlags(0);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (extras != null && extras.containsKey(Helper.INTENT_ACTION)) {
|
||||
userIdIntent = extras.getString(Helper.PREF_USER_ID); //Id of the account in the intent
|
||||
instanceIntent = extras.getString(Helper.PREF_USER_INSTANCE);
|
||||
urlOfMessage = extras.getString(Helper.PREF_MESSAGE_URL);
|
||||
if (extras.getInt(Helper.INTENT_ACTION) == Helper.NOTIFICATION_INTENT) {
|
||||
if (userIdIntent != null && instanceIntent != null && userIdIntent.equals(currentUserID) && instanceIntent.equals(currentInstance)) {
|
||||
openNotifications(activity, intent);
|
||||
} else {
|
||||
try {
|
||||
BaseAccount account = new Account(activity).getUniqAccount(userIdIntent, instanceIntent);
|
||||
if (account == null) {
|
||||
return;
|
||||
}
|
||||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(activity);
|
||||
headerMenuOpen = false;
|
||||
String acct = "";
|
||||
if (account.mastodon_account != null) {
|
||||
acct = "@" + account.mastodon_account.username + "@" + account.instance;
|
||||
} else if (account.peertube_account != null) {
|
||||
acct = "@" + account.peertube_account.getUsername() + "@" + account.instance;
|
||||
}
|
||||
Toasty.info(activity, activity.getString(R.string.toast_account_changed, acct), Toasty.LENGTH_LONG).show();
|
||||
BaseMainActivity.currentToken = account.token;
|
||||
BaseMainActivity.currentUserID = account.user_id;
|
||||
api = account.api;
|
||||
SharedPreferences.Editor editor = sharedpreferences.edit();
|
||||
editor.putString(PREF_USER_TOKEN, account.token);
|
||||
editor.putString(PREF_USER_SOFTWARE, account.software);
|
||||
editor.commit();
|
||||
Intent mainActivity = new Intent(activity, MainActivity.class);
|
||||
mainActivity.putExtra(Helper.INTENT_ACTION, Helper.OPEN_NOTIFICATION);
|
||||
activity.startActivity(mainActivity);
|
||||
activity.finish();
|
||||
} catch (DBException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
} else if (extras.getInt(Helper.INTENT_ACTION) == Helper.OPEN_NOTIFICATION) {
|
||||
openNotifications(activity, intent);
|
||||
} else if (extras.getInt(Helper.INTENT_ACTION) == Helper.OPEN_WITH_ANOTHER_ACCOUNT) {
|
||||
CrossActionHelper.fetchRemoteStatus(activity, MainActivity.currentAccount, urlOfMessage, new CrossActionHelper.Callback() {
|
||||
@Override
|
||||
public void federatedStatus(Status status) {
|
||||
if (status != null) {
|
||||
Intent intent = new Intent(activity, ContextActivity.class);
|
||||
intent.putExtra(Helper.ARG_STATUS, status);
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
activity.startActivity(intent);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void federatedAccount(app.fedilab.android.mastodon.client.entities.api.Account account) {
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
} else if (Intent.ACTION_SEND.equals(action) && type != null) {
|
||||
if ("text/plain".equals(type)) {
|
||||
final String[] url = {null};
|
||||
String sharedSubject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
|
||||
String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
|
||||
//SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(BaseMainActivity.this);
|
||||
//boolean shouldRetrieveMetaData = sharedpreferences.getBoolean(getString(R.string.SET_RETRIEVE_METADATA_IF_URL_FROM_EXTERAL), true);
|
||||
if (sharedText != null) {
|
||||
/* Some apps don't send the URL as the first part of the EXTRA_TEXT,
|
||||
the BBC News app being one such, in this case find where the URL
|
||||
is and strip that out into sharedText.
|
||||
*/
|
||||
Matcher matcher;
|
||||
matcher = Patterns.WEB_URL.matcher(sharedText);
|
||||
int count = 0;
|
||||
while (matcher.find()) {
|
||||
int matchStart = matcher.start(1);
|
||||
int matchEnd = matcher.end();
|
||||
if (matchStart < matchEnd && sharedText.length() >= matchEnd) {
|
||||
url[0] = sharedText.substring(matchStart, matchEnd);
|
||||
count++;
|
||||
}
|
||||
}
|
||||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(activity);
|
||||
boolean fetchSharedMedia = sharedpreferences.getBoolean(activity.getString(R.string.SET_RETRIEVE_METADATA_IF_URL_FROM_EXTERAL), true);
|
||||
boolean fetchShareContent = sharedpreferences.getBoolean(activity.getString(R.string.SET_SHARE_DETAILS), true);
|
||||
if (url[0] != null && count == 1 && (fetchShareContent || fetchSharedMedia)) {
|
||||
String originalUrl = url[0];
|
||||
new Thread(() -> {
|
||||
if (!url[0].matches("^https?://.*")) url[0] = "http://" + url[0];
|
||||
Matcher matcherPattern = Patterns.WEB_URL.matcher(url[0]);
|
||||
String potentialUrl = null;
|
||||
while (matcherPattern.find()) {
|
||||
int matchStart = matcherPattern.start(1);
|
||||
int matchEnd = matcherPattern.end();
|
||||
if (matchStart < matchEnd && url[0].length() >= matchEnd)
|
||||
potentialUrl = url[0].substring(matchStart, matchEnd);
|
||||
}
|
||||
// If we actually have a URL then make use of it.
|
||||
if (potentialUrl != null && potentialUrl.length() > 0) {
|
||||
|
||||
|
||||
try {
|
||||
OkHttpClient client = new OkHttpClient.Builder()
|
||||
.connectTimeout(10, TimeUnit.SECONDS)
|
||||
.writeTimeout(10, TimeUnit.SECONDS)
|
||||
.proxy(Helper.getProxy(activity.getApplication().getApplicationContext()))
|
||||
.readTimeout(10, TimeUnit.SECONDS).build();
|
||||
Request request = new Request.Builder()
|
||||
.url(potentialUrl)
|
||||
.build();
|
||||
String finalPotentialUrl = potentialUrl;
|
||||
client.newCall(request).enqueue(new Callback() {
|
||||
@Override
|
||||
public void onFailure(@NonNull Call call, @NonNull IOException e) {
|
||||
e.printStackTrace();
|
||||
activity.runOnUiThread(() -> Toasty.warning(activity, activity.getString(R.string.toast_error), Toast.LENGTH_LONG).show());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResponse(@NonNull Call call, @NonNull final Response response) {
|
||||
if (response.isSuccessful()) {
|
||||
try {
|
||||
String data = response.body().string();
|
||||
Document html = Jsoup.parse(data);
|
||||
|
||||
Element titleEl = html.selectFirst("meta[property='og:title']");
|
||||
Element descriptionEl = html.selectFirst("meta[property='og:description']");
|
||||
Element imageUrlEl = html.selectFirst("meta[property='og:image']");
|
||||
|
||||
String title = "";
|
||||
String description = "";
|
||||
|
||||
if (titleEl != null) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||
title = Html.fromHtml(titleEl.attr("content"), Html.FROM_HTML_MODE_LEGACY).toString();
|
||||
} else {
|
||||
title = Html.fromHtml(titleEl.attr("content")).toString();
|
||||
}
|
||||
}
|
||||
|
||||
if (descriptionEl != null) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||
description = Html.fromHtml(descriptionEl.attr("content"), Html.FROM_HTML_MODE_LEGACY).toString();
|
||||
} else {
|
||||
description = Html.fromHtml(descriptionEl.attr("content")).toString();
|
||||
}
|
||||
}
|
||||
|
||||
String imageUrl = "";
|
||||
if (imageUrlEl != null) {
|
||||
imageUrl = imageUrlEl.attr("content");
|
||||
}
|
||||
|
||||
StringBuilder titleBuilder = new StringBuilder();
|
||||
|
||||
if (!originalUrl.trim().equalsIgnoreCase(sharedText.trim())) {
|
||||
// If the shared text is not just the URL, add it to the top
|
||||
String toAppend = sharedText.replaceAll("\\s*" + Pattern.quote(originalUrl) + "\\s*", "");
|
||||
titleBuilder.append(toAppend);
|
||||
}
|
||||
|
||||
if (title.length() > 0) {
|
||||
// OG title fetched from source
|
||||
if (titleBuilder.length() > 0)
|
||||
titleBuilder.append("\n\n");
|
||||
titleBuilder.append(title);
|
||||
}
|
||||
|
||||
String finalImage = imageUrl;
|
||||
String finalTitle = titleBuilder.toString();
|
||||
String finalDescription = description;
|
||||
|
||||
activity.runOnUiThread(() -> {
|
||||
Bundle b = new Bundle();
|
||||
b.putString(Helper.ARG_SHARE_URL, url[0]);
|
||||
if (fetchSharedMedia) {
|
||||
b.putString(Helper.ARG_SHARE_URL_MEDIA, finalImage);
|
||||
}
|
||||
b.putString(Helper.ARG_SHARE_TITLE, finalTitle);
|
||||
b.putString(Helper.ARG_SHARE_DESCRIPTION, finalDescription);
|
||||
b.putString(Helper.ARG_SHARE_SUBJECT, sharedSubject);
|
||||
b.putString(Helper.ARG_SHARE_CONTENT, sharedText);
|
||||
CrossActionHelper.doCrossShare(activity, b);
|
||||
});
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
} else if (response.code() == 103) {
|
||||
activity.runOnUiThread(() -> {
|
||||
Bundle b = new Bundle();
|
||||
b.putString(Helper.ARG_SHARE_DESCRIPTION, finalPotentialUrl);
|
||||
CrossActionHelper.doCrossShare(activity, b);
|
||||
});
|
||||
} else {
|
||||
activity.runOnUiThread(() -> Toasty.warning(activity, activity.getString(R.string.toast_error), Toast.LENGTH_LONG).show());
|
||||
}
|
||||
}
|
||||
});
|
||||
} catch (IndexOutOfBoundsException e) {
|
||||
Toasty.warning(activity, activity.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
|
||||
}
|
||||
|
||||
}
|
||||
}).start();
|
||||
} else {
|
||||
Bundle b = new Bundle();
|
||||
b.putString(Helper.ARG_SHARE_TITLE, sharedSubject);
|
||||
b.putString(Helper.ARG_SHARE_DESCRIPTION, sharedText);
|
||||
CrossActionHelper.doCrossShare(activity, b);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
} else if (type.startsWith("image/") || type.startsWith("video/")) {
|
||||
Uri imageUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
|
||||
if (imageUri != null) {
|
||||
Bundle b = new Bundle();
|
||||
List<Uri> uris = new ArrayList<>();
|
||||
uris.add(imageUri);
|
||||
Helper.createAttachmentFromUri(activity, uris, attachments -> {
|
||||
b.putSerializable(Helper.ARG_MEDIA_ATTACHMENTS, new ArrayList<>(attachments));
|
||||
CrossActionHelper.doCrossShare(activity, b);
|
||||
});
|
||||
} else {
|
||||
Toasty.warning(activity, activity.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
|
||||
}
|
||||
}
|
||||
} else if (Intent.ACTION_SEND_MULTIPLE.equals(action) && type != null) {
|
||||
if (type.startsWith("image/") || type.startsWith("video/")) {
|
||||
ArrayList<Uri> imageList = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
|
||||
if (imageList != null) {
|
||||
Bundle b = new Bundle();
|
||||
Helper.createAttachmentFromUri(activity, imageList, attachments -> {
|
||||
b.putSerializable(Helper.ARG_MEDIA_ATTACHMENTS, new ArrayList<>(attachments));
|
||||
CrossActionHelper.doCrossShare(activity, b);
|
||||
});
|
||||
} else {
|
||||
Toasty.warning(activity, activity.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
|
||||
}
|
||||
}
|
||||
} else if (Intent.ACTION_VIEW.equals(action)) {
|
||||
String url = intent.getDataString();
|
||||
|
||||
if (url == null) {
|
||||
intent.replaceExtras(new Bundle());
|
||||
intent.setAction("");
|
||||
intent.setData(null);
|
||||
intent.setFlags(0);
|
||||
return;
|
||||
}
|
||||
Matcher matcher;
|
||||
matcher = Patterns.WEB_URL.matcher(url);
|
||||
boolean isUrl = false;
|
||||
while (matcher.find()) {
|
||||
isUrl = true;
|
||||
}
|
||||
if (!isUrl) {
|
||||
intent.replaceExtras(new Bundle());
|
||||
intent.setAction("");
|
||||
intent.setData(null);
|
||||
intent.setFlags(0);
|
||||
return;
|
||||
}
|
||||
//Here we know that the intent contains a valid URL
|
||||
if (!url.contains("medium.com")) {
|
||||
Pattern link = Pattern.compile("https?://([\\da-z.-]+[à-ü]?\\.[a-z.]{2,10})/(@[\\w._-]*[0-9]*)(/[0-9]+)?$");
|
||||
Matcher matcherLink;
|
||||
matcherLink = link.matcher(url);
|
||||
if (matcherLink.find()) {
|
||||
if (currentAccount == null) {
|
||||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(activity);
|
||||
if (currentToken == null || currentToken.trim().isEmpty()) {
|
||||
currentToken = sharedpreferences.getString(Helper.PREF_USER_TOKEN, null);
|
||||
}
|
||||
try {
|
||||
currentAccount = new Account(activity).getConnectedAccount();
|
||||
} catch (DBException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
if (matcherLink.group(3) != null && Objects.requireNonNull(matcherLink.group(3)).length() > 0) { //It's a toot
|
||||
CrossActionHelper.fetchRemoteStatus(activity, currentAccount, url, new CrossActionHelper.Callback() {
|
||||
@Override
|
||||
public void federatedStatus(Status status) {
|
||||
if (status != null) {
|
||||
Intent intent = new Intent(activity, ContextActivity.class);
|
||||
intent.putExtra(Helper.ARG_STATUS, status);
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
activity.startActivity(intent);
|
||||
} else {
|
||||
Toasty.error(activity, activity.getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void federatedAccount(app.fedilab.android.mastodon.client.entities.api.Account account) {
|
||||
}
|
||||
});
|
||||
} else {//It's an account
|
||||
CrossActionHelper.fetchRemoteAccount(activity, currentAccount, matcherLink.group(2) + "@" + matcherLink.group(1), new CrossActionHelper.Callback() {
|
||||
@Override
|
||||
public void federatedStatus(Status status) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void federatedAccount(app.fedilab.android.mastodon.client.entities.api.Account account) {
|
||||
if (account != null) {
|
||||
Intent intent = new Intent(activity, ProfileActivity.class);
|
||||
Bundle b = new Bundle();
|
||||
b.putSerializable(Helper.ARG_ACCOUNT, account);
|
||||
intent.putExtras(b);
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
activity.startActivity(intent);
|
||||
} else {
|
||||
Toasty.error(activity, activity.getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
} else {
|
||||
Helper.forwardToBrowser(activity, intent);
|
||||
}
|
||||
} else {
|
||||
Helper.forwardToBrowser(activity, intent);
|
||||
}
|
||||
}
|
||||
intent.replaceExtras(new Bundle());
|
||||
intent.setAction("");
|
||||
intent.setData(null);
|
||||
intent.setFlags(0);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onNewIntent(Intent intent) {
|
||||
super.onNewIntent(intent);
|
||||
mamageNewIntent(BaseMainActivity.this, intent);
|
||||
mamageNewIntent(intent);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -1038,7 +623,11 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
|
|||
BaseMainActivity.currentToken = sharedpreferences.getString(Helper.PREF_USER_TOKEN, null);
|
||||
}
|
||||
String software = sharedpreferences.getString(PREF_USER_SOFTWARE, null);
|
||||
|
||||
if (software != null && software.equalsIgnoreCase("peertube")) {
|
||||
startActivity(new Intent(this, PeertubeMainActivity.class));
|
||||
finish();
|
||||
return;
|
||||
}
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||
ActivityResultLauncher<String> permissionLauncher = registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
|
||||
|
|
@ -1054,34 +643,14 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
|
|||
new Thread(() -> {
|
||||
try {
|
||||
if (currentToken == null) {
|
||||
currentToken = sharedpreferences.getString(PREF_USER_TOKEN, null);
|
||||
currentToken = sharedpreferences.getString(Helper.PREF_USER_TOKEN, null);
|
||||
}
|
||||
currentAccount = new Account(BaseMainActivity.this).getConnectedAccount();
|
||||
} catch (DBException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
if (currentAccount != null && currentAccount.peertube_account != null) {
|
||||
//It is a peertube user
|
||||
Intent intent = getIntent();
|
||||
Intent myIntent = new Intent(this, PeertubeMainActivity.class);
|
||||
if (intent.getExtras() != null) {
|
||||
Bundle currentExtra = myIntent.getExtras();
|
||||
if (currentExtra == null) {
|
||||
currentExtra = new Bundle();
|
||||
}
|
||||
Bundle bundleToForward = intent.getExtras();
|
||||
currentExtra.putAll(bundleToForward);
|
||||
myIntent.putExtras(currentExtra);
|
||||
}
|
||||
if (intent.getAction() != null) {
|
||||
myIntent.setAction(intent.getAction());
|
||||
}
|
||||
startActivity(myIntent);
|
||||
finish();
|
||||
return;
|
||||
}
|
||||
//If the attached account is null, the app will fetch remote instance to get up-to-date values
|
||||
if (currentAccount != null && currentAccount.mastodon_account == null) {
|
||||
if (currentAccount != null && currentAccount.mastodon_account == null && currentAccount.peertube_account == null) {
|
||||
OkHttpClient okHttpClient = new OkHttpClient.Builder()
|
||||
.readTimeout(60, TimeUnit.SECONDS)
|
||||
.connectTimeout(60, TimeUnit.SECONDS)
|
||||
|
|
@ -1258,13 +827,12 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
|
|||
}).start();
|
||||
}
|
||||
});
|
||||
mamageNewIntent(this, getIntent());
|
||||
|
||||
};
|
||||
mainHandler.post(myRunnable);
|
||||
}).start();
|
||||
filteredAccounts = new ArrayList<>();
|
||||
|
||||
mamageNewIntent(getIntent());
|
||||
filterFetched = false;
|
||||
networkStateReceiver = new NetworkStateReceiver();
|
||||
networkStateReceiver.addListener(this);
|
||||
|
|
@ -1279,10 +847,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
|
|||
rateThisApp();
|
||||
|
||||
binding.compose.setOnClickListener(v -> startActivity(new Intent(this, ComposeActivity.class)));
|
||||
binding.compose.setOnLongClickListener(view -> {
|
||||
CrossActionHelper.doCrossAction(BaseMainActivity.this, CrossActionHelper.TypeOfCrossAction.COMPOSE, null, null);
|
||||
return false;
|
||||
});
|
||||
headerMenuOpen = false;
|
||||
|
||||
PushHelper.startStreaming(BaseMainActivity.this);
|
||||
|
|
@ -1491,6 +1055,356 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
|
|||
fetchRecentAccounts(BaseMainActivity.this, headerMainBinding);
|
||||
}
|
||||
|
||||
/**
|
||||
* Open notifications tab when coming from a notification device
|
||||
*
|
||||
* @param intent - Intent intent that will be cancelled
|
||||
*/
|
||||
private void openNotifications(Intent intent) {
|
||||
final Handler handler = new Handler();
|
||||
handler.postDelayed(() -> {
|
||||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(BaseMainActivity.this);
|
||||
boolean singleBar = sharedpreferences.getBoolean(getString(R.string.SET_USE_SINGLE_TOPBAR), false);
|
||||
if (!singleBar) {
|
||||
binding.bottomNavView.setSelectedItemId(R.id.nav_notifications);
|
||||
} else {
|
||||
int position = 0;
|
||||
for (int i = 0; i < binding.tabLayout.getTabCount(); i++) {
|
||||
TabLayout.Tab tab = binding.tabLayout.getTabAt(i);
|
||||
if (tab != null && tab.getTag() != null && tab.getTag().equals(Timeline.TimeLineEnum.NOTIFICATION.getValue())) {
|
||||
break;
|
||||
}
|
||||
position++;
|
||||
}
|
||||
binding.viewPager.setCurrentItem(position);
|
||||
}
|
||||
}, 1000);
|
||||
intent.removeExtra(Helper.INTENT_ACTION);
|
||||
}
|
||||
|
||||
|
||||
@SuppressLint("ApplySharedPref")
|
||||
private void mamageNewIntent(Intent intent) {
|
||||
if (intent == null)
|
||||
return;
|
||||
String action = intent.getAction();
|
||||
String type = intent.getType();
|
||||
Bundle extras = intent.getExtras();
|
||||
String userIdIntent, instanceIntent, urlOfMessage;
|
||||
if (extras != null && extras.containsKey(Helper.INTENT_ACTION)) {
|
||||
userIdIntent = extras.getString(Helper.PREF_USER_ID); //Id of the account in the intent
|
||||
instanceIntent = extras.getString(Helper.PREF_USER_INSTANCE);
|
||||
urlOfMessage = extras.getString(Helper.PREF_MESSAGE_URL);
|
||||
if (extras.getInt(Helper.INTENT_ACTION) == Helper.NOTIFICATION_INTENT) {
|
||||
if (userIdIntent != null && instanceIntent != null && userIdIntent.equals(currentUserID) && instanceIntent.equals(currentInstance)) {
|
||||
openNotifications(intent);
|
||||
} else {
|
||||
try {
|
||||
BaseAccount account = new Account(BaseMainActivity.this).getUniqAccount(userIdIntent, instanceIntent);
|
||||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(BaseMainActivity.this);
|
||||
headerMenuOpen = false;
|
||||
Toasty.info(BaseMainActivity.this, getString(R.string.toast_account_changed, "@" + account.mastodon_account.acct + "@" + account.instance), Toasty.LENGTH_LONG).show();
|
||||
BaseMainActivity.currentToken = account.token;
|
||||
BaseMainActivity.currentUserID = account.user_id;
|
||||
api = account.api;
|
||||
SharedPreferences.Editor editor = sharedpreferences.edit();
|
||||
editor.putString(PREF_USER_TOKEN, account.token);
|
||||
editor.putString(PREF_USER_SOFTWARE, account.software);
|
||||
editor.commit();
|
||||
Intent mainActivity = new Intent(this, MainActivity.class);
|
||||
mainActivity.putExtra(Helper.INTENT_ACTION, Helper.OPEN_NOTIFICATION);
|
||||
startActivity(mainActivity);
|
||||
finish();
|
||||
} catch (DBException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
} else if (extras.getInt(Helper.INTENT_ACTION) == Helper.OPEN_NOTIFICATION) {
|
||||
openNotifications(intent);
|
||||
} else if (extras.getInt(Helper.INTENT_ACTION) == Helper.OPEN_WITH_ANOTHER_ACCOUNT) {
|
||||
CrossActionHelper.fetchRemoteStatus(BaseMainActivity.this, MainActivity.currentAccount, urlOfMessage, new CrossActionHelper.Callback() {
|
||||
@Override
|
||||
public void federatedStatus(Status status) {
|
||||
if (status != null) {
|
||||
Intent intent = new Intent(BaseMainActivity.this, ContextActivity.class);
|
||||
intent.putExtra(Helper.ARG_STATUS, status);
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
startActivity(intent);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void federatedAccount(app.fedilab.android.mastodon.client.entities.api.Account account) {
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
} else if (Intent.ACTION_SEND.equals(action) && type != null) {
|
||||
if ("text/plain".equals(type)) {
|
||||
final String[] url = {null};
|
||||
String sharedSubject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
|
||||
String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT);
|
||||
//SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(BaseMainActivity.this);
|
||||
//boolean shouldRetrieveMetaData = sharedpreferences.getBoolean(getString(R.string.SET_RETRIEVE_METADATA_IF_URL_FROM_EXTERAL), true);
|
||||
if (sharedText != null) {
|
||||
/* Some apps don't send the URL as the first part of the EXTRA_TEXT,
|
||||
the BBC News app being one such, in this case find where the URL
|
||||
is and strip that out into sharedText.
|
||||
*/
|
||||
Matcher matcher;
|
||||
matcher = Patterns.WEB_URL.matcher(sharedText);
|
||||
int count = 0;
|
||||
while (matcher.find()) {
|
||||
int matchStart = matcher.start(1);
|
||||
int matchEnd = matcher.end();
|
||||
if (matchStart < matchEnd && sharedText.length() >= matchEnd) {
|
||||
url[0] = sharedText.substring(matchStart, matchEnd);
|
||||
count++;
|
||||
}
|
||||
}
|
||||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(BaseMainActivity.this);
|
||||
boolean fetchSharedMedia = sharedpreferences.getBoolean(getString(R.string.SET_RETRIEVE_METADATA_IF_URL_FROM_EXTERAL), true);
|
||||
boolean fetchShareContent = sharedpreferences.getBoolean(getString(R.string.SET_SHARE_DETAILS), true);
|
||||
if (url[0] != null && count == 1 && (fetchShareContent || fetchSharedMedia)) {
|
||||
String originalUrl = url[0];
|
||||
new Thread(() -> {
|
||||
if (!url[0].matches("^https?://.*")) url[0] = "http://" + url[0];
|
||||
Matcher matcherPattern = Patterns.WEB_URL.matcher(url[0]);
|
||||
String potentialUrl = null;
|
||||
while (matcherPattern.find()) {
|
||||
int matchStart = matcherPattern.start(1);
|
||||
int matchEnd = matcherPattern.end();
|
||||
if (matchStart < matchEnd && url[0].length() >= matchEnd)
|
||||
potentialUrl = url[0].substring(matchStart, matchEnd);
|
||||
}
|
||||
// If we actually have a URL then make use of it.
|
||||
if (potentialUrl != null && potentialUrl.length() > 0) {
|
||||
|
||||
|
||||
try {
|
||||
OkHttpClient client = new OkHttpClient.Builder()
|
||||
.connectTimeout(10, TimeUnit.SECONDS)
|
||||
.writeTimeout(10, TimeUnit.SECONDS)
|
||||
.proxy(Helper.getProxy(getApplication().getApplicationContext()))
|
||||
.readTimeout(10, TimeUnit.SECONDS).build();
|
||||
Request request = new Request.Builder()
|
||||
.url(potentialUrl)
|
||||
.build();
|
||||
client.newCall(request).enqueue(new Callback() {
|
||||
@Override
|
||||
public void onFailure(@NonNull Call call, @NonNull IOException e) {
|
||||
e.printStackTrace();
|
||||
runOnUiThread(() -> Toasty.warning(BaseMainActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResponse(@NonNull Call call, @NonNull final Response response) {
|
||||
if (response.isSuccessful()) {
|
||||
try {
|
||||
String data = response.body().string();
|
||||
Document html = Jsoup.parse(data);
|
||||
|
||||
Element titleEl = html.selectFirst("meta[property='og:title']");
|
||||
Element descriptionEl = html.selectFirst("meta[property='og:description']");
|
||||
Element imageUrlEl = html.selectFirst("meta[property='og:image']");
|
||||
|
||||
String title = "";
|
||||
String description = "";
|
||||
|
||||
if (titleEl != null) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||
title = Html.fromHtml(titleEl.attr("content"), Html.FROM_HTML_MODE_LEGACY).toString();
|
||||
} else {
|
||||
title = Html.fromHtml(titleEl.attr("content")).toString();
|
||||
}
|
||||
}
|
||||
|
||||
if (descriptionEl != null) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||
description = Html.fromHtml(descriptionEl.attr("content"), Html.FROM_HTML_MODE_LEGACY).toString();
|
||||
} else {
|
||||
description = Html.fromHtml(descriptionEl.attr("content")).toString();
|
||||
}
|
||||
}
|
||||
|
||||
String imageUrl = "";
|
||||
if (imageUrlEl != null) {
|
||||
imageUrl = imageUrlEl.attr("content");
|
||||
}
|
||||
|
||||
StringBuilder titleBuilder = new StringBuilder();
|
||||
|
||||
if (!originalUrl.trim().equalsIgnoreCase(sharedText.trim())) {
|
||||
// If the shared text is not just the URL, add it to the top
|
||||
String toAppend = sharedText.replaceAll("\\s*" + Pattern.quote(originalUrl) + "\\s*", "");
|
||||
titleBuilder.append(toAppend);
|
||||
}
|
||||
|
||||
if (title.length() > 0) {
|
||||
// OG title fetched from source
|
||||
if (titleBuilder.length() > 0)
|
||||
titleBuilder.append("\n\n");
|
||||
titleBuilder.append(title);
|
||||
}
|
||||
|
||||
String finalImage = imageUrl;
|
||||
String finalTitle = titleBuilder.toString();
|
||||
String finalDescription = description;
|
||||
|
||||
runOnUiThread(() -> {
|
||||
Bundle b = new Bundle();
|
||||
b.putString(Helper.ARG_SHARE_URL, url[0]);
|
||||
if (fetchSharedMedia) {
|
||||
b.putString(Helper.ARG_SHARE_URL_MEDIA, finalImage);
|
||||
}
|
||||
b.putString(Helper.ARG_SHARE_TITLE, finalTitle);
|
||||
b.putString(Helper.ARG_SHARE_DESCRIPTION, finalDescription);
|
||||
b.putString(Helper.ARG_SHARE_SUBJECT, sharedSubject);
|
||||
b.putString(Helper.ARG_SHARE_CONTENT, sharedText);
|
||||
CrossActionHelper.doCrossShare(BaseMainActivity.this, b);
|
||||
});
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
} else {
|
||||
runOnUiThread(() -> Toasty.warning(BaseMainActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show());
|
||||
}
|
||||
}
|
||||
});
|
||||
} catch (IndexOutOfBoundsException e) {
|
||||
Toasty.warning(BaseMainActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show();
|
||||
}
|
||||
|
||||
}
|
||||
}).start();
|
||||
} else {
|
||||
Bundle b = new Bundle();
|
||||
b.putString(Helper.ARG_SHARE_TITLE, sharedSubject);
|
||||
b.putString(Helper.ARG_SHARE_DESCRIPTION, sharedText);
|
||||
CrossActionHelper.doCrossShare(BaseMainActivity.this, b);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
} else if (type.startsWith("image/") || type.startsWith("video/")) {
|
||||
Uri imageUri = intent.getParcelableExtra(Intent.EXTRA_STREAM);
|
||||
if (imageUri != null) {
|
||||
Bundle b = new Bundle();
|
||||
List<Uri> uris = new ArrayList<>();
|
||||
uris.add(imageUri);
|
||||
Helper.createAttachmentFromUri(BaseMainActivity.this, uris, attachments -> {
|
||||
b.putSerializable(Helper.ARG_MEDIA_ATTACHMENTS, new ArrayList<>(attachments));
|
||||
CrossActionHelper.doCrossShare(BaseMainActivity.this, b);
|
||||
});
|
||||
} else {
|
||||
Toasty.warning(BaseMainActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show();
|
||||
}
|
||||
}
|
||||
} else if (Intent.ACTION_SEND_MULTIPLE.equals(action) && type != null) {
|
||||
if (type.startsWith("image/") || type.startsWith("video/")) {
|
||||
ArrayList<Uri> imageList = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
|
||||
if (imageList != null) {
|
||||
Bundle b = new Bundle();
|
||||
Helper.createAttachmentFromUri(BaseMainActivity.this, imageList, attachments -> {
|
||||
b.putSerializable(Helper.ARG_MEDIA_ATTACHMENTS, new ArrayList<>(attachments));
|
||||
CrossActionHelper.doCrossShare(BaseMainActivity.this, b);
|
||||
});
|
||||
} else {
|
||||
Toasty.warning(BaseMainActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show();
|
||||
}
|
||||
}
|
||||
} else if (Intent.ACTION_VIEW.equals(action)) {
|
||||
String url = intent.getDataString();
|
||||
|
||||
if (url == null) {
|
||||
intent.replaceExtras(new Bundle());
|
||||
intent.setAction("");
|
||||
intent.setData(null);
|
||||
intent.setFlags(0);
|
||||
return;
|
||||
}
|
||||
Matcher matcher;
|
||||
matcher = Patterns.WEB_URL.matcher(url);
|
||||
boolean isUrl = false;
|
||||
while (matcher.find()) {
|
||||
isUrl = true;
|
||||
}
|
||||
if (!isUrl) {
|
||||
intent.replaceExtras(new Bundle());
|
||||
intent.setAction("");
|
||||
intent.setData(null);
|
||||
intent.setFlags(0);
|
||||
return;
|
||||
}
|
||||
//Here we know that the intent contains a valid URL
|
||||
if (!url.contains("medium.com")) {
|
||||
Pattern link = Pattern.compile("https?://([\\da-z.-]+[à-ü]?\\.[a-z.]{2,10})/(@[\\w._-]*[0-9]*)(/[0-9]+)?$");
|
||||
Matcher matcherLink;
|
||||
matcherLink = link.matcher(url);
|
||||
if (matcherLink.find()) {
|
||||
if (currentAccount == null) {
|
||||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(BaseMainActivity.this);
|
||||
if (currentToken == null || currentToken.trim().isEmpty()) {
|
||||
currentToken = sharedpreferences.getString(Helper.PREF_USER_TOKEN, null);
|
||||
}
|
||||
try {
|
||||
currentAccount = new Account(BaseMainActivity.this).getConnectedAccount();
|
||||
} catch (DBException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
if (matcherLink.group(3) != null && Objects.requireNonNull(matcherLink.group(3)).length() > 0) { //It's a toot
|
||||
CrossActionHelper.fetchRemoteStatus(BaseMainActivity.this, currentAccount, url, new CrossActionHelper.Callback() {
|
||||
@Override
|
||||
public void federatedStatus(Status status) {
|
||||
if (status != null) {
|
||||
Intent intent = new Intent(BaseMainActivity.this, ContextActivity.class);
|
||||
intent.putExtra(Helper.ARG_STATUS, status);
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
startActivity(intent);
|
||||
} else {
|
||||
Toasty.error(BaseMainActivity.this, getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void federatedAccount(app.fedilab.android.mastodon.client.entities.api.Account account) {
|
||||
}
|
||||
});
|
||||
} else {//It's an account
|
||||
CrossActionHelper.fetchRemoteAccount(BaseMainActivity.this, currentAccount, matcherLink.group(2) + "@" + matcherLink.group(1), new CrossActionHelper.Callback() {
|
||||
@Override
|
||||
public void federatedStatus(Status status) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void federatedAccount(app.fedilab.android.mastodon.client.entities.api.Account account) {
|
||||
if (account != null) {
|
||||
Intent intent = new Intent(BaseMainActivity.this, ProfileActivity.class);
|
||||
Bundle b = new Bundle();
|
||||
b.putSerializable(Helper.ARG_ACCOUNT, account);
|
||||
intent.putExtras(b);
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
startActivity(intent);
|
||||
} else {
|
||||
Toasty.error(BaseMainActivity.this, getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
} else {
|
||||
Helper.forwardToBrowser(BaseMainActivity.this, intent);
|
||||
}
|
||||
} else {
|
||||
Helper.forwardToBrowser(BaseMainActivity.this, intent);
|
||||
}
|
||||
}
|
||||
intent.replaceExtras(new Bundle());
|
||||
intent.setAction("");
|
||||
intent.setData(null);
|
||||
intent.setFlags(0);
|
||||
}
|
||||
|
||||
private void manageFilters(int position) {
|
||||
View view = binding.bottomNavView.findViewById(R.id.nav_home);
|
||||
boolean showExtendedFilter = true;
|
||||
|
|
@ -1577,7 +1491,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
|
|||
itemShowDMs.setChecked(show_dms);
|
||||
editor.apply();
|
||||
} else if (itemId == R.id.action_filter) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(BaseMainActivity.this);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(BaseMainActivity.this, Helper.dialogStyle());
|
||||
LayoutInflater inflater = getLayoutInflater();
|
||||
View dialogView = inflater.inflate(R.layout.popup_filter_regex, new LinearLayout(BaseMainActivity.this), false);
|
||||
dialogBuilder.setView(dialogView);
|
||||
|
|
@ -1811,9 +1725,9 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
|
|||
* Allow to scroll to top for bottom navigation items
|
||||
*/
|
||||
private void scrollToTop() {
|
||||
int position = binding.tabLayout.getSelectedTabPosition();
|
||||
|
||||
if (binding.viewPager.getAdapter() != null) {
|
||||
Fragment fragment = (Fragment) binding.viewPager.getAdapter().instantiateItem(binding.viewPager, Math.max(position, 0));
|
||||
Fragment fragment = (Fragment) binding.viewPager.getAdapter().instantiateItem(binding.viewPager, binding.tabLayout.getSelectedTabPosition());
|
||||
if (fragment instanceof FragmentMastodonTimeline) {
|
||||
FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
|
||||
fragmentMastodonTimeline.scrollToTop();
|
||||
|
|
@ -1898,7 +1812,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
|
|||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
if (item.getItemId() == R.id.action_logout) {
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(BaseMainActivity.this);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(BaseMainActivity.this, Helper.dialogStyle());
|
||||
alt_bld.setTitle(R.string.action_logout);
|
||||
alt_bld.setMessage(getString(R.string.logout_account_confirmation, account.mastodon_account.username, account.instance));
|
||||
alt_bld.setPositiveButton(R.string.action_logout, (dialog, id) -> {
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ import androidx.multidex.MultiDex;
|
|||
import androidx.multidex.MultiDexApplication;
|
||||
import androidx.preference.PreferenceManager;
|
||||
|
||||
import com.google.android.material.color.DynamicColors;
|
||||
|
||||
import net.gotev.uploadservice.UploadServiceConfig;
|
||||
import net.gotev.uploadservice.observer.request.GlobalRequestObserver;
|
||||
|
||||
|
|
@ -52,10 +54,15 @@ public class MainApplication extends MultiDexApplication {
|
|||
@Override
|
||||
public void onCreate() {
|
||||
super.onCreate();
|
||||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(MainApplication.this);
|
||||
try {
|
||||
webView = new WebView(this);
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
boolean dynamicColor = sharedpreferences.getBoolean(getString(R.string.SET_DYNAMICCOLOR), false);
|
||||
if (dynamicColor) {
|
||||
DynamicColors.applyToActivitiesIfAvailable(this);
|
||||
}
|
||||
StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
|
||||
StrictMode.setVmPolicy(builder.build());
|
||||
Toasty.Config.getInstance().apply();
|
||||
|
|
|
|||
|
|
@ -15,8 +15,6 @@ package app.fedilab.android.activities;
|
|||
* see <http://www.gnu.org/licenses>. */
|
||||
|
||||
|
||||
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_SOFTWARE;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.app.Activity;
|
||||
import android.content.Intent;
|
||||
|
|
@ -72,7 +70,6 @@ public class LoginActivity extends BaseActivity {
|
|||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(activity);
|
||||
SharedPreferences.Editor editor = sharedpreferences.edit();
|
||||
editor.putString(Helper.PREF_USER_TOKEN, account.token);
|
||||
editor.putString(PREF_USER_SOFTWARE, BaseMainActivity.api.name());
|
||||
editor.commit();
|
||||
//The user is now authenticated, it will be redirected to MainActivity
|
||||
Runnable myRunnable = () -> {
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ import androidx.appcompat.app.AppCompatActivity;
|
|||
import androidx.appcompat.app.AppCompatDelegate;
|
||||
import androidx.preference.PreferenceManager;
|
||||
|
||||
import com.google.android.material.color.DynamicColors;
|
||||
import com.vanniktech.emoji.EmojiManager;
|
||||
import com.vanniktech.emoji.one.EmojiOneProvider;
|
||||
|
||||
|
|
@ -54,7 +53,6 @@ public class BaseActivity extends AppCompatActivity {
|
|||
|
||||
@Override
|
||||
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
|
||||
boolean patch_provider = true;
|
||||
final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
|
||||
try {
|
||||
|
|
@ -144,10 +142,6 @@ public class BaseActivity extends AppCompatActivity {
|
|||
}
|
||||
}
|
||||
super.onCreate(savedInstanceState);
|
||||
boolean dynamicColor = sharedpreferences.getBoolean(getString(R.string.SET_DYNAMICCOLOR), false);
|
||||
if (dynamicColor) {
|
||||
DynamicColors.applyToActivityIfAvailable(this);
|
||||
}
|
||||
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N) {
|
||||
ThemeHelper.adjustFontScale(this, getResources().getConfiguration());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,153 @@
|
|||
package app.fedilab.android.mastodon.activities;
|
||||
/* Copyright 2021 Thomas Schneider
|
||||
*
|
||||
* This file is a part of Fedilab
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it under the terms of the
|
||||
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
||||
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
||||
* Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with Fedilab; if not,
|
||||
* see <http://www.gnu.org/licenses>. */
|
||||
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.res.Configuration;
|
||||
import android.graphics.Color;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.view.Window;
|
||||
import android.view.WindowManager;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.appcompat.app.AppCompatDelegate;
|
||||
import androidx.preference.PreferenceManager;
|
||||
|
||||
import com.vanniktech.emoji.EmojiManager;
|
||||
import com.vanniktech.emoji.one.EmojiOneProvider;
|
||||
|
||||
import org.conscrypt.Conscrypt;
|
||||
|
||||
import java.security.Security;
|
||||
|
||||
import app.fedilab.android.R;
|
||||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
import app.fedilab.android.mastodon.helper.ThemeHelper;
|
||||
|
||||
|
||||
@SuppressLint("Registered")
|
||||
public class BaseAlertDialogActivity extends AppCompatActivity {
|
||||
|
||||
static {
|
||||
EmojiManager.install(new EmojiOneProvider());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
|
||||
boolean patch_provider = true;
|
||||
try {
|
||||
patch_provider = sharedpreferences.getBoolean(Helper.SET_SECURITY_PROVIDER, true);
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
if (patch_provider) {
|
||||
try {
|
||||
Security.insertProviderAt(Conscrypt.newProvider(), 1);
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
}
|
||||
|
||||
String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));
|
||||
//Default automatic switch
|
||||
if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {
|
||||
|
||||
int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
|
||||
switch (currentNightMode) {
|
||||
case Configuration.UI_MODE_NIGHT_NO:
|
||||
String defaultLight = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_LIGHT), "LIGHT");
|
||||
switch (defaultLight) {
|
||||
case "LIGHT":
|
||||
setTheme(R.style.AppThemeAlertDialog);
|
||||
break;
|
||||
case "SOLARIZED_LIGHT":
|
||||
setTheme(R.style.SolarizedAlertDialog);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case Configuration.UI_MODE_NIGHT_YES:
|
||||
String defaultDark = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_DARK), "DARK");
|
||||
switch (defaultDark) {
|
||||
case "DARK":
|
||||
setTheme(R.style.AppThemeAlertDialog);
|
||||
break;
|
||||
case "SOLARIZED_DARK":
|
||||
setTheme(R.style.SolarizedAlertDialog);
|
||||
break;
|
||||
case "BLACK":
|
||||
Window window = getWindow();
|
||||
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
|
||||
window.setStatusBarColor(Color.BLACK);
|
||||
setTheme(R.style.BlackAlertDialog);
|
||||
break;
|
||||
case "DRACULA":
|
||||
setTheme(R.style.DraculaAlertDialog);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
switch (currentTheme) {
|
||||
case "LIGHT":
|
||||
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
|
||||
setTheme(R.style.AppThemeAlertDialog);
|
||||
break;
|
||||
case "DARK":
|
||||
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
|
||||
setTheme(R.style.AppThemeAlertDialog);
|
||||
break;
|
||||
case "SOLARIZED_LIGHT":
|
||||
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
|
||||
setTheme(R.style.SolarizedAlertDialog);
|
||||
break;
|
||||
case "SOLARIZED_DARK":
|
||||
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
|
||||
setTheme(R.style.SolarizedAlertDialog);
|
||||
break;
|
||||
case "BLACK":
|
||||
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
|
||||
Window window = getWindow();
|
||||
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
|
||||
window.setStatusBarColor(Color.BLACK);
|
||||
setTheme(R.style.BlackAlertDialog);
|
||||
break;
|
||||
case "DRACULA":
|
||||
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
|
||||
setTheme(R.style.DraculaAlertDialog);
|
||||
break;
|
||||
}
|
||||
}
|
||||
super.onCreate(savedInstanceState);
|
||||
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N) {
|
||||
ThemeHelper.adjustFontScale(this, getResources().getConfiguration());
|
||||
}
|
||||
Helper.setLocale(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void attachBaseContext(Context newBase) {
|
||||
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {
|
||||
final Configuration override = new Configuration(newBase.getResources().getConfiguration());
|
||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(newBase);
|
||||
override.fontScale = prefs.getFloat(newBase.getString(R.string.SET_FONT_SCALE), 1.1f);
|
||||
applyOverrideConfiguration(override);
|
||||
}
|
||||
super.attachBaseContext(newBase);
|
||||
}
|
||||
}
|
||||
|
|
@ -30,7 +30,6 @@ import androidx.appcompat.app.AppCompatActivity;
|
|||
import androidx.appcompat.app.AppCompatDelegate;
|
||||
import androidx.preference.PreferenceManager;
|
||||
|
||||
import com.google.android.material.color.DynamicColors;
|
||||
import com.vanniktech.emoji.EmojiManager;
|
||||
import com.vanniktech.emoji.one.EmojiOneProvider;
|
||||
|
||||
|
|
@ -129,10 +128,6 @@ public class BaseBarActivity extends AppCompatActivity {
|
|||
}
|
||||
}
|
||||
super.onCreate(savedInstanceState);
|
||||
boolean dynamicColor = sharedpreferences.getBoolean(getString(R.string.SET_DYNAMICCOLOR), false);
|
||||
if (dynamicColor) {
|
||||
DynamicColors.applyToActivityIfAvailable(this);
|
||||
}
|
||||
if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
|
||||
Window window = getWindow();
|
||||
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,59 @@
|
|||
package app.fedilab.android.mastodon.activities;
|
||||
/* Copyright 2022 Thomas Schneider
|
||||
*
|
||||
* This file is a part of Fedilab
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it under the terms of the
|
||||
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
||||
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
||||
* Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with Fedilab; if not,
|
||||
* see <http://www.gnu.org/licenses>. */
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.preference.PreferenceManager;
|
||||
|
||||
import com.vanniktech.emoji.EmojiManager;
|
||||
import com.vanniktech.emoji.one.EmojiOneProvider;
|
||||
|
||||
import org.conscrypt.Conscrypt;
|
||||
|
||||
import java.security.Security;
|
||||
|
||||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
|
||||
|
||||
@SuppressLint("Registered")
|
||||
public class BaseFragmentActivity extends FragmentActivity {
|
||||
|
||||
|
||||
static {
|
||||
EmojiManager.install(new EmojiOneProvider());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
boolean patch_provider = true;
|
||||
try {
|
||||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
|
||||
patch_provider = sharedpreferences.getBoolean(Helper.SET_SECURITY_PROVIDER, true);
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
if (patch_provider) {
|
||||
try {
|
||||
Security.insertProviderAt(Conscrypt.newProvider(), 1);
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
}
|
||||
super.onCreate(savedInstanceState);
|
||||
}
|
||||
}
|
||||
|
|
@ -30,7 +30,6 @@ import androidx.appcompat.app.AppCompatActivity;
|
|||
import androidx.appcompat.app.AppCompatDelegate;
|
||||
import androidx.preference.PreferenceManager;
|
||||
|
||||
import com.google.android.material.color.DynamicColors;
|
||||
import com.vanniktech.emoji.EmojiManager;
|
||||
import com.vanniktech.emoji.one.EmojiOneProvider;
|
||||
|
||||
|
|
@ -129,10 +128,6 @@ public class BaseTransparentActivity extends AppCompatActivity {
|
|||
}
|
||||
}
|
||||
super.onCreate(savedInstanceState);
|
||||
boolean dynamicColor = sharedpreferences.getBoolean(getString(R.string.SET_DYNAMICCOLOR), false);
|
||||
if (dynamicColor) {
|
||||
DynamicColors.applyToActivityIfAvailable(this);
|
||||
}
|
||||
if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
|
||||
Window window = getWindow();
|
||||
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ public class CacheActivity extends BaseBarActivity {
|
|||
finish();
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_clear) {
|
||||
AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(CacheActivity.this);
|
||||
AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(CacheActivity.this, Helper.dialogStyle());
|
||||
deleteConfirm.setTitle(getString(R.string.delete_cache));
|
||||
deleteConfirm.setMessage(getString(R.string.delete_cache_message));
|
||||
deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
|
|
@ -131,7 +131,7 @@ public class CacheActivity extends BaseBarActivity {
|
|||
size = size / 1000000.0f;
|
||||
}
|
||||
binding.fileCacheSize.setText(String.format("%s %s", String.format(Locale.getDefault(), "%.2f", size), getString(R.string.cache_units)));
|
||||
AlertDialog.Builder restartBuilder = new MaterialAlertDialogBuilder(CacheActivity.this);
|
||||
AlertDialog.Builder restartBuilder = new MaterialAlertDialogBuilder(CacheActivity.this, Helper.dialogStyle());
|
||||
restartBuilder.setMessage(getString(R.string.restart_the_app));
|
||||
restartBuilder.setNegativeButton(R.string.no, (dialogRestart, whichRestart) -> {
|
||||
recreate();
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
|
|||
}
|
||||
if (canBeSent(statusDraft)) {
|
||||
if (promptSaveDraft) {
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(ComposeActivity.this);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(ComposeActivity.this, Helper.dialogStyle());
|
||||
alt_bld.setMessage(R.string.save_draft);
|
||||
alt_bld.setPositiveButton(R.string.save, (dialog, id) -> {
|
||||
dialog.dismiss();
|
||||
|
|
@ -316,7 +316,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
|
|||
} else if (item.getItemId() == R.id.action_photo_camera) {
|
||||
photoFileUri = MediaHelper.dispatchTakePictureIntent(ComposeActivity.this);
|
||||
} else if (item.getItemId() == R.id.action_contacts) {
|
||||
AlertDialog.Builder builderSingle = new MaterialAlertDialogBuilder(ComposeActivity.this);
|
||||
AlertDialog.Builder builderSingle = new MaterialAlertDialogBuilder(ComposeActivity.this, Helper.dialogStyle());
|
||||
|
||||
builderSingle.setTitle(getString(R.string.select_accounts));
|
||||
PopupContactBinding popupContactBinding = PopupContactBinding.inflate(getLayoutInflater(), new LinearLayout(ComposeActivity.this), false);
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ import app.fedilab.android.mastodon.client.entities.api.Attachment;
|
|||
import app.fedilab.android.mastodon.client.entities.api.Status;
|
||||
import app.fedilab.android.mastodon.client.entities.app.StatusDraft;
|
||||
import app.fedilab.android.mastodon.exception.DBException;
|
||||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
import app.fedilab.android.mastodon.ui.drawer.StatusDraftAdapter;
|
||||
import app.fedilab.android.mastodon.viewmodel.mastodon.TimelinesVM;
|
||||
|
||||
|
|
@ -99,7 +100,7 @@ public class DraftActivity extends BaseActivity implements StatusDraftAdapter.Dr
|
|||
finish();
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_delete) {
|
||||
AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(DraftActivity.this);
|
||||
AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(DraftActivity.this, Helper.dialogStyle());
|
||||
unfollowConfirm.setTitle(getString(R.string.delete_all));
|
||||
unfollowConfirm.setMessage(getString(R.string.remove_draft));
|
||||
unfollowConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ public class EditProfileActivity extends BaseBarActivity {
|
|||
value = Html.fromHtml(field.value).toString();
|
||||
fieldItemBinding.value.setText(value);
|
||||
fieldItemBinding.remove.setOnClickListener(v -> {
|
||||
AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(EditProfileActivity.this);
|
||||
AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(EditProfileActivity.this, Helper.dialogStyle());
|
||||
deleteConfirm.setTitle(getString(R.string.delete_field));
|
||||
deleteConfirm.setMessage(getString(R.string.delete_field_confirm));
|
||||
deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
|
|
@ -158,7 +158,7 @@ public class EditProfileActivity extends BaseBarActivity {
|
|||
binding.addField.setOnClickListener(view -> {
|
||||
AccountFieldItemBinding fieldItemBinding = AccountFieldItemBinding.inflate(getLayoutInflater());
|
||||
fieldItemBinding.remove.setOnClickListener(v -> {
|
||||
AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(EditProfileActivity.this);
|
||||
AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(EditProfileActivity.this, Helper.dialogStyle());
|
||||
deleteConfirm.setTitle(getString(R.string.delete_field));
|
||||
deleteConfirm.setMessage(getString(R.string.delete_field_confirm));
|
||||
deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ import app.fedilab.android.activities.MainActivity;
|
|||
import app.fedilab.android.databinding.ActivityFiltersBinding;
|
||||
import app.fedilab.android.databinding.PopupAddFilterBinding;
|
||||
import app.fedilab.android.mastodon.client.entities.api.Filter;
|
||||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
import app.fedilab.android.mastodon.ui.drawer.FilterAdapter;
|
||||
import app.fedilab.android.mastodon.ui.drawer.KeywordAdapter;
|
||||
import app.fedilab.android.mastodon.viewmodel.mastodon.FiltersVM;
|
||||
|
|
@ -62,7 +63,7 @@ public class FilterActivity extends BaseBarActivity implements FilterAdapter.Del
|
|||
* @param listener - {@link FilterAdapter.FilterAction}
|
||||
*/
|
||||
public static void addEditFilter(Context context, Filter filter, FilterAdapter.FilterAction listener) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
PopupAddFilterBinding popupAddFilterBinding = PopupAddFilterBinding.inflate(LayoutInflater.from(context));
|
||||
FiltersVM filtersVM = new ViewModelProvider((ViewModelStoreOwner) context).get(FiltersVM.class);
|
||||
dialogBuilder.setView(popupAddFilterBinding.getRoot());
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ public class FollowedTagActivity extends BaseBarActivity implements FollowedTagA
|
|||
onBackPressed();
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_unfollow && tag != null) {
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(FollowedTagActivity.this);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(FollowedTagActivity.this, Helper.dialogStyle());
|
||||
alt_bld.setTitle(R.string.action_unfollow_tag);
|
||||
alt_bld.setMessage(R.string.action_unfollow_tag_confirm);
|
||||
alt_bld.setPositiveButton(R.string.unfollow, (dialog, id) -> {
|
||||
|
|
@ -122,7 +122,7 @@ public class FollowedTagActivity extends BaseBarActivity implements FollowedTagA
|
|||
AlertDialog alert = alt_bld.create();
|
||||
alert.show();
|
||||
} else if (item.getItemId() == R.id.action_follow_tag) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(FollowedTagActivity.this);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(FollowedTagActivity.this, Helper.dialogStyle());
|
||||
PopupAddFollowedTagtBinding popupAddFollowedTagtBinding = PopupAddFollowedTagtBinding.inflate(getLayoutInflater());
|
||||
dialogBuilder.setView(popupAddFollowedTagtBinding.getRoot());
|
||||
popupAddFollowedTagtBinding.addTag.setFilters(new InputFilter[]{new InputFilter.LengthFilter(255)});
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ public class HashTagActivity extends BaseActivity {
|
|||
} else if (item.getItemId() == R.id.action_add_timeline) {
|
||||
|
||||
if (pinnedTag) {
|
||||
AlertDialog.Builder unpinConfirm = new MaterialAlertDialogBuilder(HashTagActivity.this);
|
||||
AlertDialog.Builder unpinConfirm = new MaterialAlertDialogBuilder(HashTagActivity.this, Helper.dialogStyle());
|
||||
unpinConfirm.setMessage(getString(R.string.unpin_timeline_description));
|
||||
unpinConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
unpinConfirm.setPositiveButton(R.string.yes, (dialog, which) -> {
|
||||
|
|
@ -233,10 +233,6 @@ public class HashTagActivity extends BaseActivity {
|
|||
tagTimeline.any.add(stripTag.trim());
|
||||
pinnedTimeline.tagTimeline = tagTimeline;
|
||||
pinned.pinnedTimelines.add(pinnedTimeline);
|
||||
if (pinned.instance == null || pinned.user_id == null) {
|
||||
pinned.instance = MainActivity.currentInstance;
|
||||
pinned.user_id = MainActivity.currentUserID;
|
||||
}
|
||||
if (update) {
|
||||
new Pinned(HashTagActivity.this).updatePinned(pinned);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ public class MastodonListActivity extends BaseBarActivity implements MastodonLis
|
|||
onBackPressed();
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_user_mute_home) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(MastodonListActivity.this);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(MastodonListActivity.this, Helper.dialogStyle());
|
||||
dialogBuilder.setTitle(R.string.put_all_accounts_in_home_muted);
|
||||
dialogBuilder.setPositiveButton(R.string.mute_them_all, (dialog, id) -> {
|
||||
timelinesVM.getAccountsInList(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, mastodonList.id, null, null, 0)
|
||||
|
|
@ -161,7 +161,7 @@ public class MastodonListActivity extends BaseBarActivity implements MastodonLis
|
|||
dialogBuilder.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
|
||||
dialogBuilder.show();
|
||||
} else if (item.getItemId() == R.id.action_manage_users) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(MastodonListActivity.this);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(MastodonListActivity.this, Helper.dialogStyle());
|
||||
PopupManageAccountsListBinding popupManageAccountsListBinding = PopupManageAccountsListBinding.inflate(getLayoutInflater());
|
||||
dialogBuilder.setView(popupManageAccountsListBinding.getRoot());
|
||||
popupManageAccountsListBinding.loader.setVisibility(View.VISIBLE);
|
||||
|
|
@ -258,7 +258,7 @@ public class MastodonListActivity extends BaseBarActivity implements MastodonLis
|
|||
dialogBuilder.setPositiveButton(R.string.close, (dialog, id) -> dialog.dismiss());
|
||||
dialogBuilder.create().show();
|
||||
} else if (item.getItemId() == R.id.action_delete && mastodonList != null) {
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(MastodonListActivity.this);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(MastodonListActivity.this, Helper.dialogStyle());
|
||||
alt_bld.setTitle(R.string.action_lists_delete);
|
||||
alt_bld.setMessage(R.string.action_lists_confirm_delete);
|
||||
alt_bld.setPositiveButton(R.string.delete, (dialog, id) -> {
|
||||
|
|
@ -296,7 +296,7 @@ public class MastodonListActivity extends BaseBarActivity implements MastodonLis
|
|||
AlertDialog alert = alt_bld.create();
|
||||
alert.show();
|
||||
} else if (item.getItemId() == R.id.action_add_list) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(MastodonListActivity.this);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(MastodonListActivity.this, Helper.dialogStyle());
|
||||
PopupAddListBinding popupAddListBinding = PopupAddListBinding.inflate(getLayoutInflater());
|
||||
dialogBuilder.setView(popupAddListBinding.getRoot());
|
||||
popupAddListBinding.addList.setFilters(new InputFilter[]{new InputFilter.LengthFilter(255)});
|
||||
|
|
@ -336,7 +336,7 @@ public class MastodonListActivity extends BaseBarActivity implements MastodonLis
|
|||
dialogBuilder.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
|
||||
dialogBuilder.create().show();
|
||||
} else if (item.getItemId() == R.id.action_edit) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(MastodonListActivity.this);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(MastodonListActivity.this, Helper.dialogStyle());
|
||||
PopupAddListBinding popupAddListBinding = PopupAddListBinding.inflate(getLayoutInflater());
|
||||
dialogBuilder.setView(popupAddListBinding.getRoot());
|
||||
popupAddListBinding.addList.setFilters(new InputFilter[]{new InputFilter.LengthFilter(255)});
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload
|
|||
int position = binding.mediaViewpager.getCurrentItem();
|
||||
Attachment attachment = attachments.get(position);
|
||||
if (Build.VERSION.SDK_INT >= 23) {
|
||||
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
|
||||
if (ContextCompat.checkSelfPermission(MediaActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(MediaActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
|
||||
ActivityCompat.requestPermissions(MediaActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, Helper.EXTERNAL_STORAGE_REQUEST_CODE_MEDIA_SAVE);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -477,7 +477,7 @@ public class ProfileActivity extends BaseActivity {
|
|||
} else if (doAction == action.UNFOLLOW) {
|
||||
boolean confirm_unfollow = sharedpreferences.getBoolean(getString(R.string.SET_UNFOLLOW_VALIDATION), true);
|
||||
if (confirm_unfollow) {
|
||||
AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(ProfileActivity.this);
|
||||
AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(ProfileActivity.this, Helper.dialogStyle());
|
||||
unfollowConfirm.setTitle(getString(R.string.unfollow_confirm));
|
||||
unfollowConfirm.setMessage(account.acct);
|
||||
unfollowConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
|
|
@ -565,7 +565,7 @@ public class ProfileActivity extends BaseActivity {
|
|||
//Recyclerview for identity proof has not been inflated yet
|
||||
if (identityProofsRecycler == null) {
|
||||
identity_proofs_indicator.setOnClickListener(v -> {
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(ProfileActivity.this);
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(ProfileActivity.this, Helper.dialogStyle());
|
||||
identityProofsRecycler = new RecyclerView(ProfileActivity.this);
|
||||
LinearLayoutManager mLayoutManager = new LinearLayoutManager(ProfileActivity.this);
|
||||
identityProofsRecycler.setLayoutManager(mLayoutManager);
|
||||
|
|
@ -675,7 +675,7 @@ public class ProfileActivity extends BaseActivity {
|
|||
binding.personalNote.setText(relationship.note);
|
||||
}
|
||||
binding.personalNote.setOnClickListener(view -> {
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this);
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this, Helper.dialogStyle());
|
||||
builderInner.setTitle(R.string.note_for_account);
|
||||
EditText input = new EditText(ProfileActivity.this);
|
||||
LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
|
||||
|
|
@ -836,10 +836,6 @@ public class ProfileActivity extends BaseActivity {
|
|||
pinnedTimeline.type = Timeline.TimeLineEnum.REMOTE;
|
||||
pinnedTimeline.position = pinned.pinnedTimelines.size();
|
||||
pinned.pinnedTimelines.add(pinnedTimeline);
|
||||
if (pinned.instance == null || pinned.user_id == null) {
|
||||
pinned.instance = MainActivity.currentInstance;
|
||||
pinned.user_id = MainActivity.currentUserID;
|
||||
}
|
||||
Pinned finalPinned = pinned;
|
||||
boolean finalPresent = present;
|
||||
new Thread(() -> {
|
||||
|
|
@ -864,7 +860,7 @@ public class ProfileActivity extends BaseActivity {
|
|||
});
|
||||
return true;
|
||||
} else if (itemId == R.id.action_filter) {
|
||||
AlertDialog.Builder filterTagDialog = new MaterialAlertDialogBuilder(ProfileActivity.this);
|
||||
AlertDialog.Builder filterTagDialog = new MaterialAlertDialogBuilder(ProfileActivity.this, Helper.dialogStyle());
|
||||
Set<String> featuredTagsSet = sharedpreferences.getStringSet(getString(R.string.SET_FEATURED_TAGS), null);
|
||||
List<String> tags = new ArrayList<>();
|
||||
if (featuredTagsSet != null) {
|
||||
|
|
@ -945,7 +941,7 @@ public class ProfileActivity extends BaseActivity {
|
|||
i++;
|
||||
}
|
||||
}
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(ProfileActivity.this);
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(ProfileActivity.this, Helper.dialogStyle());
|
||||
builder.setTitle(getString(R.string.filter_languages));
|
||||
builder.setMultiChoiceItems(languagesArr, presentArr, (dialog, which, isChecked) -> {
|
||||
List<String> languagesFilter = new ArrayList<>();
|
||||
|
|
@ -990,7 +986,7 @@ public class ProfileActivity extends BaseActivity {
|
|||
}
|
||||
accountsVM.getListContainingAccount(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, account.id)
|
||||
.observe(ProfileActivity.this, mastodonListUserIs -> {
|
||||
AlertDialog.Builder builderSingle = new MaterialAlertDialogBuilder(ProfileActivity.this);
|
||||
AlertDialog.Builder builderSingle = new MaterialAlertDialogBuilder(ProfileActivity.this, Helper.dialogStyle());
|
||||
builderSingle.setTitle(getString(R.string.action_lists_add_to));
|
||||
builderSingle.setPositiveButton(R.string.close, (dialog, which) -> dialog.dismiss());
|
||||
String[] listsId = new String[mastodonLists.size()];
|
||||
|
|
@ -1082,7 +1078,7 @@ public class ProfileActivity extends BaseActivity {
|
|||
});
|
||||
return true;
|
||||
}
|
||||
builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this);
|
||||
builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this, Helper.dialogStyle());
|
||||
builderInner.setTitle(stringArrayConf[0]);
|
||||
|
||||
builderInner.setNeutralButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
|
|
@ -1102,7 +1098,7 @@ public class ProfileActivity extends BaseActivity {
|
|||
builderInner.show();
|
||||
}
|
||||
} else if (itemId == R.id.action_mute_home) {
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this);
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this, Helper.dialogStyle());
|
||||
builderInner.setMessage(account.acct);
|
||||
builderInner.setNeutralButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
if (homeMuted) {
|
||||
|
|
@ -1130,7 +1126,7 @@ public class ProfileActivity extends BaseActivity {
|
|||
});
|
||||
return true;
|
||||
} else if (itemId == R.id.action_report) {
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this);
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this, Helper.dialogStyle());
|
||||
builderInner.setTitle(R.string.report_account);
|
||||
//Text for report
|
||||
EditText input = new EditText(ProfileActivity.this);
|
||||
|
|
@ -1150,7 +1146,7 @@ public class ProfileActivity extends BaseActivity {
|
|||
builderInner.show();
|
||||
return true;
|
||||
} else if (itemId == R.id.action_block) {
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this);
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this, Helper.dialogStyle());
|
||||
if (relationship != null) {
|
||||
if (relationship.blocking) {
|
||||
builderInner.setTitle(stringArrayConf[5]);
|
||||
|
|
@ -1190,7 +1186,7 @@ public class ProfileActivity extends BaseActivity {
|
|||
});
|
||||
builderInner.show();
|
||||
} else if (itemId == R.id.action_block_instance) {
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this);
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(ProfileActivity.this, Helper.dialogStyle());
|
||||
String domain = account.acct.split("@")[1];
|
||||
builderInner.setMessage(getString(R.string.block_domain_confirm_message, domain));
|
||||
builderInner.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@ import java.util.ArrayList;
|
|||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import app.fedilab.android.R;
|
||||
import app.fedilab.android.activities.MainActivity;
|
||||
import app.fedilab.android.databinding.ActivityReorderTabsBinding;
|
||||
import app.fedilab.android.databinding.PopupSearchInstanceBinding;
|
||||
import app.fedilab.android.mastodon.client.entities.app.BottomMenu;
|
||||
|
|
@ -171,7 +170,7 @@ public class ReorderTimelinesActivity extends BaseBarActivity implements OnStart
|
|||
}
|
||||
|
||||
private void addInstance() {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(ReorderTimelinesActivity.this);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(ReorderTimelinesActivity.this, Helper.dialogStyle());
|
||||
PopupSearchInstanceBinding popupSearchInstanceBinding = PopupSearchInstanceBinding.inflate(getLayoutInflater());
|
||||
dialogBuilder.setView(popupSearchInstanceBinding.getRoot());
|
||||
TextWatcher textWatcher = autoComplete(popupSearchInstanceBinding);
|
||||
|
|
@ -262,10 +261,7 @@ public class ReorderTimelinesActivity extends BaseBarActivity implements OnStart
|
|||
pinnedTimeline.type = Timeline.TimeLineEnum.REMOTE;
|
||||
pinnedTimeline.position = pinned.pinnedTimelines.size();
|
||||
pinned.pinnedTimelines.add(pinnedTimeline);
|
||||
if (pinned.user_id == null || pinned.instance == null) {
|
||||
pinned.user_id = MainActivity.currentUserID;
|
||||
pinned.instance = MainActivity.currentInstance;
|
||||
}
|
||||
|
||||
if (update) {
|
||||
try {
|
||||
new Pinned(ReorderTimelinesActivity.this).updatePinned(pinned);
|
||||
|
|
|
|||
|
|
@ -70,7 +70,6 @@ public class SearchResultTabActivity extends BaseBarActivity {
|
|||
private String search;
|
||||
private ActivitySearchResultTabsBinding binding;
|
||||
private TabLayout.Tab initial;
|
||||
public Boolean tagEmpty, accountEmpty;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
|
|
@ -278,17 +277,9 @@ public class SearchResultTabActivity extends BaseBarActivity {
|
|||
|
||||
|
||||
public void moveToAccount() {
|
||||
tagEmpty = null;
|
||||
accountEmpty = null;
|
||||
binding.searchViewpager.setCurrentItem(1);
|
||||
}
|
||||
|
||||
public void moveToMessage() {
|
||||
tagEmpty = null;
|
||||
accountEmpty = null;
|
||||
binding.searchViewpager.setCurrentItem(2);
|
||||
}
|
||||
|
||||
/**
|
||||
* Pager adapter for the 4 fragments
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ public class AdminActionActivity extends BaseBarActivity {
|
|||
return true;
|
||||
} else if (item.getItemId() == R.id.action_filter) {
|
||||
if (getTitle().toString().equalsIgnoreCase(getString(R.string.accounts))) {
|
||||
AlertDialog.Builder alertDialogBuilder = new MaterialAlertDialogBuilder(AdminActionActivity.this);
|
||||
AlertDialog.Builder alertDialogBuilder = new MaterialAlertDialogBuilder(AdminActionActivity.this, Helper.dialogStyle());
|
||||
PopupAdminFilterAccountsBinding binding = PopupAdminFilterAccountsBinding.inflate(getLayoutInflater());
|
||||
alertDialogBuilder.setView(binding.getRoot());
|
||||
if (local != null && remote == null) {
|
||||
|
|
@ -259,7 +259,7 @@ public class AdminActionActivity extends BaseBarActivity {
|
|||
AlertDialog alert = alertDialogBuilder.create();
|
||||
alert.show();
|
||||
} else {
|
||||
AlertDialog.Builder alertDialogBuilder = new MaterialAlertDialogBuilder(AdminActionActivity.this);
|
||||
AlertDialog.Builder alertDialogBuilder = new MaterialAlertDialogBuilder(AdminActionActivity.this, Helper.dialogStyle());
|
||||
PopupAdminFilterReportsBinding binding = PopupAdminFilterReportsBinding.inflate(getLayoutInflater());
|
||||
alertDialogBuilder.setView(binding.getRoot());
|
||||
if (resolved == null) {
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ public class AdminDomainBlockActivity extends BaseBarActivity {
|
|||
return true;
|
||||
} else if (itemId == R.id.action_delete) {
|
||||
if (adminDomainBlock.id != null) {
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(AdminDomainBlockActivity.this);
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(AdminDomainBlockActivity.this, Helper.dialogStyle());
|
||||
builder.setMessage(getString(R.string.unblock_domain_confirm, adminDomainBlock.domain));
|
||||
builder
|
||||
.setPositiveButton(R.string.unblock_domain, (dialog, which) -> {
|
||||
|
|
|
|||
|
|
@ -91,12 +91,10 @@ public interface MastodonStatusesService {
|
|||
@Field("sensitive") Boolean sensitive,
|
||||
@Field("spoiler_text") String spoiler_text,
|
||||
@Field("visibility") String visibility,
|
||||
@Field("language") String language,
|
||||
@Field("media_attributes[id][]") List<String> media_id,
|
||||
@Field("media_attributes[description][]") List<String> media_description,
|
||||
@Field("media_attributes[focus][]") List<String> focus
|
||||
@Field("language") String language
|
||||
);
|
||||
|
||||
|
||||
//Post a scheduled status
|
||||
@FormUrlEncoded
|
||||
@POST("statuses")
|
||||
|
|
@ -318,18 +316,4 @@ public interface MastodonStatusesService {
|
|||
@Header("Authorization") String token,
|
||||
@Path("id") String id
|
||||
);
|
||||
|
||||
@POST("statuses/{id}/react/{name}")
|
||||
Call<Void> addReaction(
|
||||
@Header("Authorization") String app_token,
|
||||
@Path("id") String id,
|
||||
@Path("name") String name
|
||||
);
|
||||
|
||||
@POST("statuses/{id}/unreact/{name}")
|
||||
Call<Void> removeReaction(
|
||||
@Header("Authorization") String app_token,
|
||||
@Path("id") String id,
|
||||
@Path("name") String name
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ import java.util.Date;
|
|||
import java.util.List;
|
||||
|
||||
import app.fedilab.android.mastodon.helper.SpannableHelper;
|
||||
import de.timfreiheit.mathjax.android.MathJaxView;
|
||||
|
||||
public class Status implements Serializable, Cloneable {
|
||||
|
||||
|
|
@ -109,8 +108,6 @@ public class Status implements Serializable, Cloneable {
|
|||
public boolean cached = false;
|
||||
@SerializedName("is_maths")
|
||||
public Boolean isMaths;
|
||||
@SerializedName("reactions")
|
||||
public List<Reaction> reactions;
|
||||
|
||||
public Attachment art_attachment;
|
||||
public boolean isExpended = false;
|
||||
|
|
@ -131,7 +128,6 @@ public class Status implements Serializable, Cloneable {
|
|||
public transient Spannable contentSpan;
|
||||
public transient Spannable contentSpoilerSpan;
|
||||
public transient Spannable contentTranslateSpan;
|
||||
public transient MathJaxView mathJaxView;
|
||||
|
||||
@Override
|
||||
public boolean equals(@Nullable Object obj) {
|
||||
|
|
|
|||
|
|
@ -353,23 +353,6 @@ public class Account extends BaseAccount implements Serializable {
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns all accounts that allows cross-account actions
|
||||
*
|
||||
* @return BaseAccount List<{@link BaseAccount}>
|
||||
*/
|
||||
public List<BaseAccount> getOtherAccounts() throws DBException {
|
||||
if (db == null) {
|
||||
throw new DBException("db is null. Wrong initialization.");
|
||||
}
|
||||
try {
|
||||
Cursor c = db.query(Sqlite.TABLE_USER_ACCOUNT, null, null, null, null, null, null, null);
|
||||
return cursorToListUser(c);
|
||||
} catch (Exception e) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns all accounts that allows cross-account actions
|
||||
*
|
||||
|
|
@ -381,7 +364,7 @@ public class Account extends BaseAccount implements Serializable {
|
|||
}
|
||||
try {
|
||||
Cursor c = db.query(Sqlite.TABLE_USER_ACCOUNT, null, null, null, null, null, null, null);
|
||||
return cursorToListMastodonUser(c);
|
||||
return cursorToListUser(c);
|
||||
} catch (Exception e) {
|
||||
return null;
|
||||
}
|
||||
|
|
@ -472,27 +455,6 @@ public class Account extends BaseAccount implements Serializable {
|
|||
return accountList;
|
||||
}
|
||||
|
||||
|
||||
private List<BaseAccount> cursorToListMastodonUser(Cursor c) {
|
||||
//No element found
|
||||
if (c.getCount() == 0) {
|
||||
c.close();
|
||||
return null;
|
||||
}
|
||||
List<BaseAccount> accountList = new ArrayList<>();
|
||||
while (c.moveToNext()) {
|
||||
BaseAccount account = convertCursorToAccount(c);
|
||||
//We don't add in the list the current connected account
|
||||
if (account.mastodon_account != null) {
|
||||
accountList.add(account);
|
||||
}
|
||||
}
|
||||
//Close the cursor
|
||||
c.close();
|
||||
return accountList;
|
||||
}
|
||||
|
||||
|
||||
private List<BaseAccount> cursorToListUserWithOwner(Cursor c) {
|
||||
//No element found
|
||||
if (c.getCount() == 0) {
|
||||
|
|
|
|||
|
|
@ -166,8 +166,8 @@ public class BottomMenu implements Serializable {
|
|||
throw new DBException("db is null. Wrong initialization.");
|
||||
}
|
||||
ContentValues values = new ContentValues();
|
||||
values.put(Sqlite.COL_INSTANCE, bottomMenu.instance);
|
||||
values.put(Sqlite.COL_USER_ID, bottomMenu.user_id);
|
||||
values.put(Sqlite.COL_INSTANCE, BaseMainActivity.currentInstance);
|
||||
values.put(Sqlite.COL_USER_ID, BaseMainActivity.currentUserID);
|
||||
values.put(Sqlite.COL_BOTTOM_MENU, menuItemListToStringStorage(bottomMenu.bottom_menu));
|
||||
//Inserts bottom
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ import java.util.ArrayList;
|
|||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import app.fedilab.android.BaseMainActivity;
|
||||
import app.fedilab.android.mastodon.exception.DBException;
|
||||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
import app.fedilab.android.sqlite.Sqlite;
|
||||
|
|
@ -103,8 +104,8 @@ public class Pinned implements Serializable {
|
|||
throw new DBException("db is null. Wrong initialization.");
|
||||
}
|
||||
ContentValues values = new ContentValues();
|
||||
values.put(Sqlite.COL_INSTANCE, pinned.instance);
|
||||
values.put(Sqlite.COL_USER_ID, pinned.user_id);
|
||||
values.put(Sqlite.COL_INSTANCE, BaseMainActivity.currentInstance);
|
||||
values.put(Sqlite.COL_USER_ID, BaseMainActivity.currentUserID);
|
||||
values.put(Sqlite.COL_PINNED_TIMELINES, mastodonPinnedTimelinesToStringStorage(pinned.pinnedTimelines));
|
||||
values.put(Sqlite.COL_CREATED_AT, Helper.dateToString(new Date()));
|
||||
//Inserts pinned
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ public class CrossActionHelper {
|
|||
}
|
||||
Handler mainHandler = new Handler(Looper.getMainLooper());
|
||||
Runnable myRunnable = () -> {
|
||||
AlertDialog.Builder builderSingle = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builderSingle = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builderSingle.setTitle(context.getString(R.string.choose_accounts));
|
||||
final AccountsSearchAdapter accountsSearchAdapter = new AccountsSearchAdapter(context, accountList);
|
||||
final BaseAccount[] accountArray = new BaseAccount[accounts.size()];
|
||||
|
|
@ -99,7 +99,7 @@ public class CrossActionHelper {
|
|||
boolean confirmBoost = sharedpreferences.getBoolean(context.getString(R.string.SET_NOTIF_VALIDATION), true);
|
||||
BaseAccount selectedAccount = accountArray[which];
|
||||
if ((actionType == TypeOfCrossAction.REBLOG_ACTION && confirmBoost) || (actionType == TypeOfCrossAction.FAVOURITE_ACTION && confirmFav)) {
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
if (actionType == TypeOfCrossAction.REBLOG_ACTION) {
|
||||
alt_bld.setMessage(context.getString(R.string.reblog_add));
|
||||
} else {
|
||||
|
|
@ -135,9 +135,7 @@ public class CrossActionHelper {
|
|||
private static void fetchRemote(@NonNull Context context, @NonNull TypeOfCrossAction actionType, @NonNull BaseAccount ownerAccount, app.fedilab.android.mastodon.client.entities.api.Account targetedAccount, Status targetedStatus) {
|
||||
|
||||
SearchVM searchVM = new ViewModelProvider((ViewModelStoreOwner) context).get("crossactions", SearchVM.class);
|
||||
if (actionType == TypeOfCrossAction.COMPOSE) {
|
||||
applyAction(context, actionType, ownerAccount, null, null);
|
||||
} else if (targetedAccount != null) {
|
||||
if (targetedAccount != null) {
|
||||
String search;
|
||||
if (targetedAccount.acct.contains("@")) { //Not from same instance
|
||||
search = targetedAccount.acct;
|
||||
|
|
@ -249,11 +247,6 @@ public class CrossActionHelper {
|
|||
intent.putExtra(Helper.ARG_ACCOUNT, ownerAccount);
|
||||
context.startActivity(intent);
|
||||
break;
|
||||
case COMPOSE:
|
||||
Intent intentCompose = new Intent(context, ComposeActivity.class);
|
||||
intentCompose.putExtra(Helper.ARG_ACCOUNT, ownerAccount);
|
||||
context.startActivity(intentCompose);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -408,7 +401,7 @@ public class CrossActionHelper {
|
|||
public static void doCrossShare(final Context context, final Bundle bundle) {
|
||||
List<BaseAccount> accounts;
|
||||
try {
|
||||
accounts = new Account(context).getCrossAccounts();
|
||||
accounts = new Account(context).getAll();
|
||||
List<app.fedilab.android.mastodon.client.entities.api.Account> accountList = new ArrayList<>();
|
||||
for (BaseAccount account : accounts) {
|
||||
account.mastodon_account.acct += "@" + account.instance;
|
||||
|
|
@ -420,7 +413,7 @@ public class CrossActionHelper {
|
|||
context.startActivity(intentToot);
|
||||
((BaseActivity) context).finish();
|
||||
} else {
|
||||
AlertDialog.Builder builderSingle = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builderSingle = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builderSingle.setTitle(context.getString(R.string.choose_accounts));
|
||||
final AccountsSearchAdapter accountsSearchAdapter = new AccountsSearchAdapter(context, accountList);
|
||||
final BaseAccount[] accountArray = new BaseAccount[accounts.size()];
|
||||
|
|
@ -537,8 +530,7 @@ public class CrossActionHelper {
|
|||
UNBOOKMARK_ACTION,
|
||||
REBLOG_ACTION,
|
||||
UNREBLOG_ACTION,
|
||||
REPLY_ACTION,
|
||||
COMPOSE
|
||||
REPLY_ACTION
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ import static android.content.Context.DOWNLOAD_SERVICE;
|
|||
import static app.fedilab.android.BaseMainActivity.currentAccount;
|
||||
import static app.fedilab.android.mastodon.activities.BaseActivity.currentThemeId;
|
||||
import static app.fedilab.android.mastodon.helper.LogoHelper.getNotificationIcon;
|
||||
import static app.fedilab.android.mastodon.helper.ThemeHelper.fetchAccentColor;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.app.Activity;
|
||||
|
|
@ -43,7 +42,6 @@ import android.graphics.Color;
|
|||
import android.graphics.Paint;
|
||||
import android.graphics.PorterDuff;
|
||||
import android.graphics.PorterDuffColorFilter;
|
||||
import android.graphics.drawable.BitmapDrawable;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.media.RingtoneManager;
|
||||
import android.net.ConnectivityManager;
|
||||
|
|
@ -91,7 +89,6 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
|
|||
import androidx.preference.PreferenceManager;
|
||||
import androidx.recyclerview.widget.LinearLayoutManager;
|
||||
|
||||
import com.avatarfirst.avatargenlib.AvatarGenerator;
|
||||
import com.bumptech.glide.Glide;
|
||||
import com.bumptech.glide.RequestBuilder;
|
||||
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
|
||||
|
|
@ -276,7 +273,6 @@ public class Helper {
|
|||
public static final String ARG_SCHEDULED_DATE = "ARG_SCHEDULED_DATE";
|
||||
|
||||
public static final String WORKER_REFRESH_NOTIFICATION = "WORKER_REFRESH_NOTIFICATION";
|
||||
public static final String WORKER_REFRESH_HOME = "WORKER_REFRESH_HOME";
|
||||
public static final String WORKER_SCHEDULED_STATUSES = "WORKER_SCHEDULED_STATUSES";
|
||||
public static final String WORKER_SCHEDULED_REBLOGS = "WORKER_SCHEDULED_REBLOGS";
|
||||
|
||||
|
|
@ -417,7 +413,7 @@ public class Helper {
|
|||
* @param url String download url
|
||||
*/
|
||||
public static void manageDownloads(final Context context, final String url) {
|
||||
final AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
|
||||
final AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
final DownloadManager.Request request;
|
||||
try {
|
||||
request = new DownloadManager.Request(Uri.parse(url.trim()));
|
||||
|
|
@ -909,7 +905,7 @@ public class Helper {
|
|||
if (newAccount == null) {
|
||||
editor.putString(PREF_USER_TOKEN, null);
|
||||
editor.putString(PREF_USER_INSTANCE, null);
|
||||
editor.putString(PREF_USER_SOFTWARE, null);
|
||||
// editor.putString(PREF_USER_SOFTWARE, null);
|
||||
editor.putString(PREF_USER_ID, null);
|
||||
editor.commit();
|
||||
Intent loginActivity = new Intent(activity, LoginActivity.class);
|
||||
|
|
@ -1066,25 +1062,9 @@ public class Helper {
|
|||
if (account.mastodon_account != null) {
|
||||
targetedUrl = disableGif ? account.mastodon_account.avatar_static : account.mastodon_account.avatar;
|
||||
} else if (account.peertube_account != null) {
|
||||
if (account.peertube_account.getAvatar() != null) {
|
||||
targetedUrl = account.peertube_account.getAvatar().getPath();
|
||||
if (targetedUrl != null && targetedUrl.startsWith("/")) {
|
||||
targetedUrl = "https://" + account.instance + account.peertube_account.getAvatar().getPath();
|
||||
}
|
||||
} else {
|
||||
BitmapDrawable avatar = new AvatarGenerator.AvatarBuilder(activity)
|
||||
.setLabel(account.peertube_account.getAcct())
|
||||
.setAvatarSize(120)
|
||||
.setTextSize(30)
|
||||
.toSquare()
|
||||
.setBackgroundColor(fetchAccentColor(activity))
|
||||
.build();
|
||||
Glide.with(activity)
|
||||
.asDrawable()
|
||||
.load(avatar)
|
||||
.apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(10)))
|
||||
.into(view);
|
||||
return;
|
||||
targetedUrl = account.peertube_account.getAvatar().getPath();
|
||||
if (targetedUrl != null && targetedUrl.startsWith("/")) {
|
||||
targetedUrl = "https://" + account.instance + account.peertube_account.getAvatar().getPath();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1812,7 +1792,7 @@ public class Helper {
|
|||
is.close();
|
||||
String json = new String(buffer, StandardCharsets.UTF_8);
|
||||
Gson gson = new Gson();
|
||||
AlertDialog.Builder dialogBuilderOptin = new MaterialAlertDialogBuilder(activity);
|
||||
AlertDialog.Builder dialogBuilderOptin = new MaterialAlertDialogBuilder(activity, Helper.dialogStyle());
|
||||
PopupReleaseNotesBinding binding = PopupReleaseNotesBinding.inflate(activity.getLayoutInflater());
|
||||
dialogBuilderOptin.setView(binding.getRoot());
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -248,16 +248,12 @@ public class MastodonHelper {
|
|||
String targetedUrl = disableGif ? (type == MediaAccountType.AVATAR ? account.avatar_static : account.header_static) : (type == MediaAccountType.AVATAR ? account.avatar : account.header);
|
||||
if (targetedUrl != null) {
|
||||
if (disableGif || (!targetedUrl.endsWith(".gif"))) {
|
||||
try {
|
||||
Glide.with(activity != null ? activity : context)
|
||||
.asDrawable()
|
||||
.load(targetedUrl)
|
||||
.thumbnail(0.1f)
|
||||
.placeholder(placeholder)
|
||||
.into(view);
|
||||
} catch (IllegalArgumentException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
Glide.with(activity != null ? activity : context)
|
||||
.asDrawable()
|
||||
.load(targetedUrl)
|
||||
.thumbnail(0.1f)
|
||||
.placeholder(placeholder)
|
||||
.into(view);
|
||||
} else {
|
||||
Glide.with(activity != null ? activity : context)
|
||||
.asGif()
|
||||
|
|
@ -412,7 +408,7 @@ public class MastodonHelper {
|
|||
* @param status {@link Status}
|
||||
*/
|
||||
public static void scheduleBoost(Context context, ScheduleType scheduleType, Status status, Account account, TimedMuted listener) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
DatetimePickerBinding binding = DatetimePickerBinding.inflate(((Activity) context).getLayoutInflater());
|
||||
dialogBuilder.setView(binding.getRoot());
|
||||
final AlertDialog alertDialogBoost = dialogBuilder.create();
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ public class MediaHelper {
|
|||
AudioRecorder mAudioRecorder = AudioRecorder.getInstance();
|
||||
File mAudioFile = new File(filePath);
|
||||
PopupRecordBinding binding = PopupRecordBinding.inflate(activity.getLayoutInflater());
|
||||
AlertDialog.Builder audioPopup = new MaterialAlertDialogBuilder(activity);
|
||||
AlertDialog.Builder audioPopup = new MaterialAlertDialogBuilder(activity, Helper.dialogStyle());
|
||||
audioPopup.setView(binding.getRoot());
|
||||
AlertDialog alert = audioPopup.create();
|
||||
alert.show();
|
||||
|
|
@ -326,7 +326,7 @@ public class MediaHelper {
|
|||
* @param listener - OnSchedule
|
||||
*/
|
||||
public static void scheduleMessage(Activity activity, OnSchedule listener) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(activity);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(activity, Helper.dialogStyle());
|
||||
DatetimePickerBinding binding = DatetimePickerBinding.inflate(activity.getLayoutInflater());
|
||||
|
||||
dialogBuilder.setView(binding.getRoot());
|
||||
|
|
|
|||
|
|
@ -277,7 +277,6 @@ public class PinnedTimelineHelper {
|
|||
pinnedTimeline.position = pinnedAll.pinnedTimelines.size();
|
||||
pinnedTimeline.mastodonList = mastodonList;
|
||||
pinnedAll.pinnedTimelines.add(pinnedTimeline);
|
||||
|
||||
try {
|
||||
boolean exist = new Pinned(activity).pinnedExist(pinnedAll);
|
||||
if (exist) {
|
||||
|
|
@ -305,7 +304,7 @@ public class PinnedTimelineHelper {
|
|||
//Small hack to hide first tabs (they represent the item of the bottom menu)
|
||||
toRemove = itemToRemoveInBottomMenu(activity);
|
||||
for (int i = 0; i < (FedilabPageAdapter.BOTTOM_TIMELINE_COUNT - toRemove); i++) {
|
||||
activityMainBinding.tabLayout.addTab(activityMainBinding.tabLayout.newTab(), false);
|
||||
activityMainBinding.tabLayout.addTab(activityMainBinding.tabLayout.newTab());
|
||||
((ViewGroup) activityMainBinding.tabLayout.getChildAt(0)).getChildAt(i).setVisibility(View.GONE);
|
||||
}
|
||||
}
|
||||
|
|
@ -414,7 +413,7 @@ public class PinnedTimelineHelper {
|
|||
//We be used to fetch position of tabs
|
||||
String slug = pinnedTimeline.type.getValue() + (ident != null ? "|" + ident : "");
|
||||
tab.setTag(slug);
|
||||
activityMainBinding.tabLayout.addTab(tab, false);
|
||||
activityMainBinding.tabLayout.addTab(tab);
|
||||
pinnedTimelineVisibleList.add(pinnedTimeline);
|
||||
}
|
||||
}
|
||||
|
|
@ -698,7 +697,7 @@ public class PinnedTimelineHelper {
|
|||
itemShowDMs.setChecked(show_dms);
|
||||
editor.apply();
|
||||
} else if (itemId == R.id.action_filter) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(activity);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(activity, Helper.dialogStyle());
|
||||
LayoutInflater inflater = activity.getLayoutInflater();
|
||||
View dialogView = inflater.inflate(R.layout.popup_filter_regex, new LinearLayout(activity), false);
|
||||
dialogBuilder.setView(dialogView);
|
||||
|
|
@ -887,7 +886,7 @@ public class PinnedTimelineHelper {
|
|||
e.printStackTrace();
|
||||
}
|
||||
} else if (itemId == R.id.action_any) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(activity);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(activity, Helper.dialogStyle());
|
||||
LayoutInflater inflater = activity.getLayoutInflater();
|
||||
View dialogView = inflater.inflate(R.layout.tags_any, new LinearLayout(activity), false);
|
||||
dialogBuilder.setView(dialogView);
|
||||
|
|
@ -916,7 +915,7 @@ public class PinnedTimelineHelper {
|
|||
LayoutInflater inflater;
|
||||
View dialogView;
|
||||
AlertDialog alertDialog;
|
||||
dialogBuilder = new MaterialAlertDialogBuilder(activity);
|
||||
dialogBuilder = new MaterialAlertDialogBuilder(activity, Helper.dialogStyle());
|
||||
inflater = activity.getLayoutInflater();
|
||||
dialogView = inflater.inflate(R.layout.tags_all, new LinearLayout(activity), false);
|
||||
dialogBuilder.setView(dialogView);
|
||||
|
|
@ -945,7 +944,7 @@ public class PinnedTimelineHelper {
|
|||
LayoutInflater inflater;
|
||||
View dialogView;
|
||||
AlertDialog alertDialog;
|
||||
dialogBuilder = new MaterialAlertDialogBuilder(activity);
|
||||
dialogBuilder = new MaterialAlertDialogBuilder(activity, Helper.dialogStyle());
|
||||
inflater = activity.getLayoutInflater();
|
||||
dialogView = inflater.inflate(R.layout.tags_all, new LinearLayout(activity), false);
|
||||
dialogBuilder.setView(dialogView);
|
||||
|
|
@ -974,7 +973,7 @@ public class PinnedTimelineHelper {
|
|||
LayoutInflater inflater;
|
||||
View dialogView;
|
||||
AlertDialog alertDialog;
|
||||
dialogBuilder = new MaterialAlertDialogBuilder(activity);
|
||||
dialogBuilder = new MaterialAlertDialogBuilder(activity, Helper.dialogStyle());
|
||||
inflater = activity.getLayoutInflater();
|
||||
dialogView = inflater.inflate(R.layout.tags_name, new LinearLayout(activity), false);
|
||||
dialogBuilder.setView(dialogView);
|
||||
|
|
@ -1115,7 +1114,7 @@ public class PinnedTimelineHelper {
|
|||
e.printStackTrace();
|
||||
}
|
||||
} else if (itemId == R.id.action_exclude_visibility) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(activity);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(activity, Helper.dialogStyle());
|
||||
DialogBubbleExcludeVisibilityBinding dialogBinding = DialogBubbleExcludeVisibilityBinding.inflate(activity.getLayoutInflater());
|
||||
dialogBuilder.setView(dialogBinding.getRoot());
|
||||
dialogBuilder.setTitle(R.string.exclude_visibility);
|
||||
|
|
@ -1209,7 +1208,7 @@ public class PinnedTimelineHelper {
|
|||
} else if (itemId == R.id.action_reply_visibility) {
|
||||
AlertDialog.Builder dialogBuilder;
|
||||
AlertDialog alertDialog;
|
||||
dialogBuilder = new MaterialAlertDialogBuilder(activity);
|
||||
dialogBuilder = new MaterialAlertDialogBuilder(activity, Helper.dialogStyle());
|
||||
DialogBubbleReplyVisibilityBinding dialogBinding = DialogBubbleReplyVisibilityBinding.inflate(activity.getLayoutInflater());
|
||||
dialogBuilder.setView(dialogBinding.getRoot());
|
||||
dialogBuilder.setTitle(R.string.reply_visibility);
|
||||
|
|
@ -1404,7 +1403,7 @@ public class PinnedTimelineHelper {
|
|||
}
|
||||
});
|
||||
changes[0] = true;
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(activity);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(activity, Helper.dialogStyle());
|
||||
LayoutInflater inflater = activity.getLayoutInflater();
|
||||
View dialogView = inflater.inflate(R.layout.tags_instance, new LinearLayout(activity), false);
|
||||
dialogBuilder.setView(dialogView);
|
||||
|
|
@ -1498,7 +1497,7 @@ public class PinnedTimelineHelper {
|
|||
LayoutInflater inflater;
|
||||
View dialogView;
|
||||
AlertDialog alertDialog;
|
||||
dialogBuilder = new MaterialAlertDialogBuilder(activity);
|
||||
dialogBuilder = new MaterialAlertDialogBuilder(activity, Helper.dialogStyle());
|
||||
inflater = activity.getLayoutInflater();
|
||||
dialogView = inflater.inflate(R.layout.tags_name, new LinearLayout(activity), false);
|
||||
dialogBuilder.setView(dialogView);
|
||||
|
|
@ -1528,7 +1527,7 @@ public class PinnedTimelineHelper {
|
|||
alertDialog.show();
|
||||
} else if (itemId == R.id.action_nitter_manage_accounts) {
|
||||
String accounts = remoteInstance.host;
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(activity);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(activity, Helper.dialogStyle());
|
||||
LayoutInflater inflater = activity.getLayoutInflater();
|
||||
View dialogView = inflater.inflate(R.layout.tags_any, new LinearLayout(activity), false);
|
||||
dialogBuilder.setView(dialogView);
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ public class PushHelper {
|
|||
Runnable myRunnable = () -> {
|
||||
List<String> distributors = UnifiedPush.getDistributors(context, new ArrayList<>());
|
||||
if (distributors.size() == 0) {
|
||||
AlertDialog.Builder alert = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder alert = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
alert.setTitle(R.string.no_distributors_found);
|
||||
final TextView message = new TextView(context);
|
||||
String link = "https://fedilab.app/wiki/features/push-notifications/";
|
||||
|
|
@ -136,7 +136,7 @@ public class PushHelper {
|
|||
return;
|
||||
}
|
||||
|
||||
AlertDialog.Builder alert = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder alert = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
alert.setTitle(R.string.select_distributors);
|
||||
String[] distributorsStr = distributors.toArray(new String[0]);
|
||||
alert.setSingleChoiceItems(distributorsStr, -1, (dialog, item) -> {
|
||||
|
|
|
|||
|
|
@ -514,8 +514,6 @@ public class SpannableHelper {
|
|||
Matcher matcherLink = link.matcher(finalUrl);
|
||||
Pattern linkLong = Pattern.compile("https?://([\\da-z.-]+\\.[a-z.]{2,10})/(@[\\w_.-]+@[a-zA-Z0-9][a-zA-Z0-9.-]{1,61}[a-zA-Z0-9](?:\\.[a-zA-Z]{2,})+)(/[0-9]+)?$");
|
||||
Matcher matcherLinkLong = linkLong.matcher(finalUrl);
|
||||
Pattern userWithoutAt = Pattern.compile("https?://([\\da-z.-]+\\.[a-z.]{2,10})/(users/([\\w._-]*[0-9]*))/statuses/([0-9]+)");
|
||||
Matcher matcherUserWithoutAt = userWithoutAt.matcher(finalUrl);
|
||||
if (matcherLink.find() && !finalUrl.contains("medium.com")) {
|
||||
if (matcherLink.group(3) != null && Objects.requireNonNull(matcherLink.group(3)).length() > 0) { //It's a toot
|
||||
CrossActionHelper.fetchRemoteStatus(context, currentAccount, finalUrl, new CrossActionHelper.Callback() {
|
||||
|
|
@ -569,38 +567,6 @@ public class SpannableHelper {
|
|||
public void federatedStatus(Status status) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void federatedAccount(Account account) {
|
||||
Intent intent = new Intent(context, ProfileActivity.class);
|
||||
Bundle b = new Bundle();
|
||||
b.putSerializable(Helper.ARG_ACCOUNT, account);
|
||||
intent.putExtras(b);
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
context.startActivity(intent);
|
||||
}
|
||||
});
|
||||
}
|
||||
} else if (matcherUserWithoutAt.find() && !finalUrl.contains("medium.com")) {
|
||||
if (matcherUserWithoutAt.group(4) != null && Objects.requireNonNull(matcherUserWithoutAt.group(4)).length() > 0) { //It's a toot
|
||||
CrossActionHelper.fetchRemoteStatus(context, currentAccount, finalUrl, new CrossActionHelper.Callback() {
|
||||
@Override
|
||||
public void federatedStatus(Status status) {
|
||||
Intent intent = new Intent(context, ContextActivity.class);
|
||||
intent.putExtra(Helper.ARG_STATUS, status);
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
context.startActivity(intent);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void federatedAccount(Account account) {
|
||||
}
|
||||
});
|
||||
} else {//It's an account
|
||||
CrossActionHelper.fetchRemoteAccount(context, currentAccount, matcherUserWithoutAt.group(3) + "@" + matcherUserWithoutAt.group(1), new CrossActionHelper.Callback() {
|
||||
@Override
|
||||
public void federatedStatus(Status status) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void federatedAccount(Account account) {
|
||||
Intent intent = new Intent(context, ProfileActivity.class);
|
||||
|
|
@ -674,7 +640,7 @@ public class SpannableHelper {
|
|||
return;
|
||||
}
|
||||
}
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builder.setMessage(context.getString(R.string.mute_tag, tag));
|
||||
builder
|
||||
.setPositiveButton(R.string.yes, (dialog, which) -> {
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ public class TranslateHelper {
|
|||
}
|
||||
j++;
|
||||
}
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builder.setTitle(context.getString(R.string.translate_in));
|
||||
builder.setItems(languagesArr, (dialogInterface, i) -> {
|
||||
myTransL.translate(statusToTranslate, codesArr[i], params, new Results() {
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ public class EditImageActivity extends BaseActivity implements OnPhotoEditorList
|
|||
.setClearViewsEnabled(true)
|
||||
.setTransparencyEnabled(true)
|
||||
.build();
|
||||
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
|
||||
if (ContextCompat.checkSelfPermission(EditImageActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) !=
|
||||
PackageManager.PERMISSION_GRANTED) {
|
||||
ActivityCompat.requestPermissions(EditImageActivity.this,
|
||||
|
|
|
|||
|
|
@ -158,9 +158,6 @@ public class ComposeWorker extends Worker {
|
|||
}
|
||||
dataPost.messageToSend = statuses.size() - startingPosition;
|
||||
dataPost.messageSent = 0;
|
||||
List<String> media_edit_id = null;
|
||||
List<String> media_edit_description = null;
|
||||
List<String> media_edit_focus = null;
|
||||
for (int i = startingPosition; i < statuses.size(); i++) {
|
||||
if (dataPost.notificationBuilder != null) {
|
||||
dataPost.notificationBuilder.setProgress(100, dataPost.messageSent * 100 / dataPost.messageToSend, true);
|
||||
|
|
@ -173,15 +170,7 @@ public class ComposeWorker extends Worker {
|
|||
attachmentIds = new ArrayList<>();
|
||||
for (Attachment attachment : statuses.get(i).media_attachments) {
|
||||
if (attachment.id != null) {
|
||||
if (media_edit_id == null) {
|
||||
media_edit_id = new ArrayList<>();
|
||||
media_edit_description = new ArrayList<>();
|
||||
media_edit_focus = new ArrayList<>();
|
||||
}
|
||||
attachmentIds.add(attachment.id);
|
||||
media_edit_id.add(attachment.id);
|
||||
media_edit_description.add(attachment.description);
|
||||
media_edit_focus.add(attachment.focus);
|
||||
} else {
|
||||
MultipartBody.Part fileMultipartBody;
|
||||
if (watermark && attachment.mimeType != null && attachment.mimeType.contains("image")) {
|
||||
|
|
@ -232,16 +221,13 @@ public class ComposeWorker extends Worker {
|
|||
if (statuses.get(i).local_only) {
|
||||
statuses.get(i).text += " \uD83D\uDC41";
|
||||
}
|
||||
|
||||
if (dataPost.scheduledDate == null) {
|
||||
if (dataPost.statusEditId == null) {
|
||||
statusCall = mastodonStatusesService.createStatus(null, dataPost.token, statuses.get(i).text, attachmentIds, poll_options, poll_expire_in,
|
||||
poll_multiple, poll_hide_totals, statuses.get(i).quote_id == null ? in_reply_to_status : null, statuses.get(i).sensitive, statuses.get(i).spoilerChecked ? statuses.get(i).spoiler_text : null, statuses.get(i).visibility.toLowerCase(), language, statuses.get(i).quote_id, statuses.get(i).content_type);
|
||||
} else { //Status is edited
|
||||
statusCall = mastodonStatusesService.updateStatus(null, dataPost.token, dataPost.statusEditId, statuses.get(i).text, attachmentIds, poll_options, poll_expire_in,
|
||||
poll_multiple, poll_hide_totals, statuses.get(i).quote_id == null ? in_reply_to_status : null, statuses.get(i).sensitive,
|
||||
statuses.get(i).spoilerChecked ? statuses.get(i).spoiler_text : null, statuses.get(i).visibility.toLowerCase(), language,
|
||||
media_edit_id, media_edit_description, media_edit_focus);
|
||||
poll_multiple, poll_hide_totals, statuses.get(i).quote_id == null ? in_reply_to_status : null, statuses.get(i).sensitive, statuses.get(i).spoilerChecked ? statuses.get(i).spoiler_text : null, statuses.get(i).visibility.toLowerCase(), language);
|
||||
}
|
||||
try {
|
||||
Response<Status> statusResponse = statusCall.execute();
|
||||
|
|
|
|||
|
|
@ -1,225 +0,0 @@
|
|||
package app.fedilab.android.mastodon.jobs;
|
||||
/* Copyright 2023 Thomas Schneider
|
||||
*
|
||||
* This file is a part of Fedilab
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it under the terms of the
|
||||
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
||||
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
||||
* Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with Fedilab; if not,
|
||||
* see <http://www.gnu.org/licenses>. */
|
||||
|
||||
import android.app.Notification;
|
||||
import android.app.NotificationChannel;
|
||||
import android.app.NotificationManager;
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.graphics.BitmapFactory;
|
||||
import android.os.Build;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.core.app.NotificationCompat;
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.work.Data;
|
||||
import androidx.work.ExistingPeriodicWorkPolicy;
|
||||
import androidx.work.ForegroundInfo;
|
||||
import androidx.work.PeriodicWorkRequest;
|
||||
import androidx.work.WorkManager;
|
||||
import androidx.work.Worker;
|
||||
import androidx.work.WorkerParameters;
|
||||
|
||||
import com.google.common.util.concurrent.Futures;
|
||||
import com.google.common.util.concurrent.ListenableFuture;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import app.fedilab.android.R;
|
||||
import app.fedilab.android.mastodon.client.endpoints.MastodonTimelinesService;
|
||||
import app.fedilab.android.mastodon.client.entities.api.Pagination;
|
||||
import app.fedilab.android.mastodon.client.entities.api.Status;
|
||||
import app.fedilab.android.mastodon.client.entities.app.Account;
|
||||
import app.fedilab.android.mastodon.client.entities.app.BaseAccount;
|
||||
import app.fedilab.android.mastodon.client.entities.app.StatusCache;
|
||||
import app.fedilab.android.mastodon.client.entities.app.Timeline;
|
||||
import app.fedilab.android.mastodon.exception.DBException;
|
||||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
import app.fedilab.android.mastodon.helper.MastodonHelper;
|
||||
import okhttp3.OkHttpClient;
|
||||
import retrofit2.Call;
|
||||
import retrofit2.Response;
|
||||
import retrofit2.Retrofit;
|
||||
import retrofit2.converter.gson.GsonConverterFactory;
|
||||
|
||||
|
||||
public class FetchHomeWorker extends Worker {
|
||||
|
||||
private static final int FETCH_HOME_CHANNEL_ID = 5;
|
||||
private static final String CHANNEL_ID = "fedilab_home";
|
||||
final OkHttpClient okHttpClient = new OkHttpClient.Builder()
|
||||
.readTimeout(60, TimeUnit.SECONDS)
|
||||
.connectTimeout(60, TimeUnit.SECONDS)
|
||||
.callTimeout(60, TimeUnit.SECONDS)
|
||||
.proxy(Helper.getProxy(getApplicationContext().getApplicationContext()))
|
||||
.build();
|
||||
private final NotificationManager notificationManager;
|
||||
|
||||
|
||||
public FetchHomeWorker(@NonNull Context context, @NonNull WorkerParameters workerParams) {
|
||||
super(context, workerParams);
|
||||
notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
|
||||
}
|
||||
|
||||
public static void setRepeatHome(Context context, BaseAccount account, Data inputData) {
|
||||
WorkManager.getInstance(context).cancelAllWorkByTag(Helper.WORKER_REFRESH_HOME + account.user_id + account.instance);
|
||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
||||
String value = prefs.getString(context.getString(R.string.SET_FETCH_HOME_DELAY_VALUE) + account.user_id + account.instance, "60");
|
||||
PeriodicWorkRequest notificationPeriodic = new PeriodicWorkRequest.Builder(FetchHomeWorker.class, Long.parseLong(value), TimeUnit.MINUTES)
|
||||
.setInputData(inputData)
|
||||
.addTag(Helper.WORKER_REFRESH_HOME + account.user_id + account.instance)
|
||||
.build();
|
||||
WorkManager.getInstance(context).enqueueUniquePeriodicWork(Helper.WORKER_REFRESH_HOME + account.user_id + account.instance, ExistingPeriodicWorkPolicy.REPLACE, notificationPeriodic);
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public ListenableFuture<ForegroundInfo> getForegroundInfoAsync() {
|
||||
if (Build.VERSION.SDK_INT >= 26) {
|
||||
String channelName = "Fetch Home";
|
||||
String channelDescription = "Fetch home messages";
|
||||
NotificationChannel fetchHomeChannel = new NotificationChannel(CHANNEL_ID, channelName, NotificationManager.IMPORTANCE_LOW);
|
||||
fetchHomeChannel.setDescription(channelDescription);
|
||||
fetchHomeChannel.setSound(null, null);
|
||||
fetchHomeChannel.setShowBadge(false);
|
||||
notificationManager.createNotificationChannel(fetchHomeChannel);
|
||||
}
|
||||
NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(getApplicationContext(), CHANNEL_ID);
|
||||
notificationBuilder.setSmallIcon(R.drawable.ic_notification)
|
||||
.setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(), R.drawable.ic_launcher_foreground))
|
||||
.setContentTitle(getApplicationContext().getString(R.string.notifications))
|
||||
.setContentText(getApplicationContext().getString(R.string.fetch_notifications))
|
||||
.setDefaults(NotificationCompat.DEFAULT_ALL)
|
||||
.setPriority(Notification.PRIORITY_DEFAULT);
|
||||
return Futures.immediateFuture(new ForegroundInfo(FETCH_HOME_CHANNEL_ID, notificationBuilder.build()));
|
||||
}
|
||||
|
||||
@NonNull
|
||||
private ForegroundInfo createForegroundInfo() {
|
||||
if (Build.VERSION.SDK_INT >= 26) {
|
||||
String channelName = "Fetch Home";
|
||||
String channelDescription = "Fetch home messages";
|
||||
NotificationChannel fetchHomeChannel = new NotificationChannel(CHANNEL_ID, channelName, NotificationManager.IMPORTANCE_LOW);
|
||||
fetchHomeChannel.setSound(null, null);
|
||||
fetchHomeChannel.setShowBadge(false);
|
||||
fetchHomeChannel.setDescription(channelDescription);
|
||||
notificationManager.createNotificationChannel(fetchHomeChannel);
|
||||
|
||||
}
|
||||
NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(getApplicationContext(), CHANNEL_ID);
|
||||
notificationBuilder.setSmallIcon(R.drawable.ic_notification)
|
||||
.setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(), R.drawable.ic_launcher_foreground))
|
||||
.setContentTitle(getApplicationContext().getString(R.string.fetch_home_messages))
|
||||
.setContentText(getApplicationContext().getString(R.string.set_fetch_home))
|
||||
.setDefaults(NotificationCompat.DEFAULT_ALL)
|
||||
.setSilent(true)
|
||||
.setPriority(Notification.PRIORITY_LOW);
|
||||
return new ForegroundInfo(FETCH_HOME_CHANNEL_ID, notificationBuilder.build());
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public Result doWork() {
|
||||
|
||||
setForegroundAsync(createForegroundInfo());
|
||||
|
||||
String instance = getInputData().getString(Helper.ARG_INSTANCE);
|
||||
String userId = getInputData().getString(Helper.ARG_USER_ID);
|
||||
|
||||
try {
|
||||
BaseAccount account = new Account(getApplicationContext()).getUniqAccount(userId, instance);
|
||||
if (account != null) {
|
||||
try {
|
||||
fetchHome(getApplicationContext(), account);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
} catch (DBException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return Result.success(new Data.Builder().putString("WORK_RESULT", getApplicationContext().getString(R.string.notifications)).build());
|
||||
}
|
||||
|
||||
private void fetchHome(Context context, BaseAccount account) throws IOException {
|
||||
SharedPreferences prefs = PreferenceManager
|
||||
.getDefaultSharedPreferences(context);
|
||||
boolean fetch_home = prefs.getBoolean(context.getString(R.string.SET_FETCH_HOME) + account.user_id + account.instance, false);
|
||||
|
||||
if (fetch_home) {
|
||||
int max_calls = 5;
|
||||
int status_per_page = 80;
|
||||
//Browse last 400 home messages
|
||||
boolean canContinue = true;
|
||||
int call = 0;
|
||||
String max_id = null;
|
||||
MastodonTimelinesService mastodonTimelinesService = init(account.instance);
|
||||
while (canContinue && call < max_calls) {
|
||||
Call<List<Status>> homeCall = mastodonTimelinesService.getHome(account.token, max_id, null, null, status_per_page, null);
|
||||
if (homeCall != null) {
|
||||
Response<List<Status>> homeResponse = homeCall.execute();
|
||||
if (homeResponse.isSuccessful()) {
|
||||
List<Status> statusList = homeResponse.body();
|
||||
if (statusList != null && statusList.size() > 0) {
|
||||
for (Status status : statusList) {
|
||||
StatusCache statusCacheDAO = new StatusCache(getApplicationContext());
|
||||
StatusCache statusCache = new StatusCache();
|
||||
statusCache.instance = account.instance;
|
||||
statusCache.user_id = account.user_id;
|
||||
statusCache.status = status;
|
||||
statusCache.type = Timeline.TimeLineEnum.HOME;
|
||||
statusCache.status_id = status.id;
|
||||
try {
|
||||
statusCacheDAO.insertOrUpdate(statusCache, Timeline.TimeLineEnum.HOME.getValue());
|
||||
} catch (DBException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
Pagination pagination = MastodonHelper.getPagination(homeResponse.headers());
|
||||
if (pagination.max_id != null) {
|
||||
max_id = pagination.max_id;
|
||||
} else {
|
||||
canContinue = false;
|
||||
}
|
||||
} else {
|
||||
canContinue = false;
|
||||
}
|
||||
} else {
|
||||
canContinue = false;
|
||||
}
|
||||
}
|
||||
//Pause between calls (1 second)
|
||||
try {
|
||||
Thread.sleep(1000);
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
call++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private MastodonTimelinesService init(String instance) {
|
||||
Retrofit retrofit = new Retrofit.Builder()
|
||||
.baseUrl("https://" + instance + "/api/v1/")
|
||||
.addConverterFactory(GsonConverterFactory.create(Helper.getDateBuilder()))
|
||||
.client(okHttpClient)
|
||||
.build();
|
||||
return retrofit.create(MastodonTimelinesService.class);
|
||||
}
|
||||
}
|
||||
|
|
@ -105,7 +105,7 @@ public class NotificationsWorker extends Worker {
|
|||
public Result doWork() {
|
||||
setForegroundAsync(createForegroundInfo());
|
||||
try {
|
||||
List<BaseAccount> accounts = new Account(getApplicationContext()).getCrossAccounts();
|
||||
List<BaseAccount> accounts = new Account(getApplicationContext()).getAll();
|
||||
for (BaseAccount account : accounts) {
|
||||
try {
|
||||
NotificationsHelper.task(getApplicationContext(), account.user_id + "@" + account.instance);
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@ public class AccountAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
} else if (finalDoAction == ProfileActivity.action.UNFOLLOW) {
|
||||
boolean confirm_unfollow = sharedpreferences.getBoolean(context.getString(R.string.SET_UNFOLLOW_VALIDATION), true);
|
||||
if (confirm_unfollow) {
|
||||
AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
unfollowConfirm.setTitle(context.getString(R.string.unfollow_confirm));
|
||||
unfollowConfirm.setMessage(account.acct);
|
||||
unfollowConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ public class AnnouncementAdapter extends RecyclerView.Adapter<AnnouncementAdapte
|
|||
emojiPopup.toggle();
|
||||
});
|
||||
holder.binding.statusAddCustomEmoji.setOnClickListener(v -> {
|
||||
final AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
|
||||
final AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
int paddingPixel = 15;
|
||||
float density = context.getResources().getDisplayMetrics().density;
|
||||
int paddingDp = (int) (paddingPixel * density);
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ import app.fedilab.android.databinding.DrawerCacheBinding;
|
|||
import app.fedilab.android.mastodon.client.entities.app.CacheAccount;
|
||||
import app.fedilab.android.mastodon.helper.CacheHelper;
|
||||
import app.fedilab.android.mastodon.helper.MastodonHelper;
|
||||
import app.fedilab.android.peertube.helper.Helper;
|
||||
|
||||
|
||||
public class CacheAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
|
||||
|
|
@ -62,17 +61,9 @@ public class CacheAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
|
||||
CacheAccount cacheAccount = accountList.get(position);
|
||||
AccountCacheViewHolder holder = (AccountCacheViewHolder) viewHolder;
|
||||
|
||||
if (cacheAccount.account.mastodon_account != null) {
|
||||
MastodonHelper.loadPPMastodon(holder.binding.pp, cacheAccount.account.mastodon_account);
|
||||
holder.binding.acct.setText(String.format("@%s@%s", cacheAccount.account.mastodon_account.username, cacheAccount.account.instance));
|
||||
holder.binding.displayName.setText(cacheAccount.account.mastodon_account.display_name);
|
||||
} else if (cacheAccount.account.peertube_account != null) {
|
||||
Helper.loadAvatar(context, cacheAccount.account.peertube_account, holder.binding.pp);
|
||||
holder.binding.acct.setText(String.format("@%s@%s", cacheAccount.account.peertube_account.getUsername(), cacheAccount.account.instance));
|
||||
holder.binding.displayName.setText(cacheAccount.account.peertube_account.getDisplayName());
|
||||
}
|
||||
|
||||
MastodonHelper.loadPPMastodon(holder.binding.pp, cacheAccount.account.mastodon_account);
|
||||
holder.binding.acct.setText(String.format("@%s@%s", cacheAccount.account.mastodon_account.username, cacheAccount.account.instance));
|
||||
holder.binding.displayName.setText(cacheAccount.account.mastodon_account.display_name);
|
||||
CacheHelper.getTimelineValues(context, cacheAccount.account, countStatuses -> {
|
||||
if (countStatuses != null && countStatuses.size() == 3) {
|
||||
holder.binding.homeCount.setText(String.valueOf(countStatuses.get(0)));
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ import static app.fedilab.android.BaseMainActivity.currentAccount;
|
|||
import static app.fedilab.android.BaseMainActivity.emojis;
|
||||
import static app.fedilab.android.BaseMainActivity.instanceInfo;
|
||||
import static app.fedilab.android.mastodon.activities.ComposeActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE;
|
||||
import static de.timfreiheit.mathjax.android.MathJaxConfig.Input.TeX;
|
||||
|
||||
import android.Manifest;
|
||||
import android.annotation.SuppressLint;
|
||||
|
|
@ -128,8 +127,6 @@ import app.fedilab.android.mastodon.helper.ThemeHelper;
|
|||
import app.fedilab.android.mastodon.imageeditor.EditImageActivity;
|
||||
import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
|
||||
import app.fedilab.android.mastodon.viewmodel.mastodon.SearchVM;
|
||||
import de.timfreiheit.mathjax.android.MathJaxConfig;
|
||||
import de.timfreiheit.mathjax.android.MathJaxView;
|
||||
import es.dmoral.toasty.Toasty;
|
||||
|
||||
|
||||
|
|
@ -314,10 +311,8 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
}
|
||||
//Put other accounts mentioned at the bottom
|
||||
boolean capitalize = sharedpreferences.getBoolean(context.getString(R.string.SET_CAPITALIZE), true);
|
||||
boolean mentionsAtTop = sharedpreferences.getBoolean(context.getString(R.string.SET_MENTIONS_AT_TOP), false);
|
||||
|
||||
if (inReplyToUser != null) {
|
||||
if (capitalize && !mentionsAtTop) {
|
||||
if (capitalize) {
|
||||
statusDraft.text = inReplyToUser.acct.startsWith("@") ? inReplyToUser.acct + "\n" : "@" + inReplyToUser.acct + "\n";
|
||||
} else {
|
||||
statusDraft.text = inReplyToUser.acct.startsWith("@") ? inReplyToUser.acct + " " : "@" + inReplyToUser.acct + " ";
|
||||
|
|
@ -326,9 +321,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
holder.binding.content.setText(statusDraft.text);
|
||||
statusDraft.cursorPosition = statusDraft.text.length();
|
||||
if (statusDraft.mentions.size() > 1) {
|
||||
if (!mentionsAtTop) {
|
||||
statusDraft.text += "\n";
|
||||
}
|
||||
statusDraft.text += "\n";
|
||||
for (int i = 1; i < statusDraft.mentions.size(); i++) {
|
||||
String tootTemp = String.format("@%s ", statusDraft.mentions.get(i).acct);
|
||||
statusDraft.text = String.format("%s ", (statusDraft.text + tootTemp.trim()));
|
||||
|
|
@ -341,7 +334,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
holder.binding.content.setSelection(statusDraft.cursorPosition); //Put cursor at the end
|
||||
buttonVisibility(holder);
|
||||
});
|
||||
} else if (mentionedAccount != null && statusDraft.text == null) {
|
||||
} else if (mentionedAccount != null) {
|
||||
final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);
|
||||
boolean capitalize = sharedpreferences.getBoolean(context.getString(R.string.SET_CAPITALIZE), true);
|
||||
if (capitalize) {
|
||||
|
|
@ -399,7 +392,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
* @param position - int position of the media in the message
|
||||
*/
|
||||
private void pickupMedia(ComposeActivity.mediaType type, int position) {
|
||||
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
|
||||
if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE) !=
|
||||
PackageManager.PERMISSION_GRANTED) {
|
||||
ActivityCompat.requestPermissions((Activity) context,
|
||||
|
|
@ -544,7 +537,6 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
if (holder.binding.content.getSelectionStart() > 0 && holder.getLayoutPosition() >= 0) {
|
||||
statusList.get(holder.getLayoutPosition()).cursorPosition = holder.binding.content.getSelectionStart();
|
||||
}
|
||||
|
||||
//Copy/past
|
||||
int max_car = MastodonHelper.getInstanceMaxChars(context);
|
||||
if (currentLength > max_car) {
|
||||
|
|
@ -709,26 +701,19 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
}
|
||||
Matcher mathsPatterns = Helper.mathsComposePattern.matcher((s.toString()));
|
||||
if (mathsPatterns.find()) {
|
||||
if (holder.binding.laTexViewContainer.getChildCount() == 0) {
|
||||
MathJaxConfig mathJaxConfig = new MathJaxConfig();
|
||||
mathJaxConfig.setAutomaticLinebreaks(true);
|
||||
mathJaxConfig.setInput(TeX);
|
||||
if (holder.binding.laTexViewContainer.getVisibility() != View.VISIBLE) {
|
||||
holder.binding.laTexViewContainer.setVisibility(View.VISIBLE);
|
||||
|
||||
switch (context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) {
|
||||
case Configuration.UI_MODE_NIGHT_YES:
|
||||
mathJaxConfig.setTextColor("white");
|
||||
holder.binding.laTexView.setTextColor("white");
|
||||
break;
|
||||
case Configuration.UI_MODE_NIGHT_NO:
|
||||
mathJaxConfig.setTextColor("black");
|
||||
holder.binding.laTexView.setTextColor("black");
|
||||
break;
|
||||
}
|
||||
statusList.get(holder.getBindingAdapterPosition()).mathJaxView = new MathJaxView(context, mathJaxConfig);
|
||||
holder.binding.laTexViewContainer.addView(statusList.get(holder.getBindingAdapterPosition()).mathJaxView);
|
||||
holder.binding.laTexViewContainer.setVisibility(View.VISIBLE);
|
||||
}
|
||||
if (statusList.get(holder.getBindingAdapterPosition()).mathJaxView != null) {
|
||||
statusList.get(holder.getBindingAdapterPosition()).mathJaxView.setInputText(s.toString());
|
||||
}
|
||||
|
||||
holder.binding.laTexView.setInputText(s.toString());
|
||||
} else {
|
||||
holder.binding.laTexViewContainer.setVisibility(View.GONE);
|
||||
}
|
||||
|
|
@ -967,22 +952,22 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
int position = statusList.size() - 1;
|
||||
statusList.get(position).text = "";
|
||||
if (title != null && title.trim().length() > 0) {
|
||||
statusList.get(position).text += title + " ";
|
||||
statusList.get(position).text += title + "\n\n";
|
||||
} else if (subject != null && subject.trim().length() > 0) {
|
||||
statusList.get(position).text += subject + " ";
|
||||
statusList.get(position).text += subject + "\n\n";
|
||||
}
|
||||
if (description != null && description.trim().length() > 0) {
|
||||
if (url != null && !description.contains(url)) {
|
||||
statusList.get(position).text += url + "\n>";
|
||||
}
|
||||
statusList.get(position).text += description + "\n\n";
|
||||
} else if (content != null && content.trim().length() > 0) {
|
||||
if (!content.contains(url)) {
|
||||
statusList.get(position).text += url + "\n>";
|
||||
if (url != null && !description.contains(url)) {
|
||||
statusList.get(position).text += url;
|
||||
}
|
||||
} else if (content != null && content.trim().length() > 0) {
|
||||
statusList.get(position).text += content + "\n\n";
|
||||
if (!content.contains(url)) {
|
||||
statusList.get(position).text += url;
|
||||
}
|
||||
} else {
|
||||
statusList.get(position).text += url + "\n\n";
|
||||
statusList.get(position).text += url;
|
||||
}
|
||||
if (saveFilePath != null) {
|
||||
Attachment attachment = new Attachment();
|
||||
|
|
@ -1060,12 +1045,12 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
for (Attachment attachment : attachmentList) {
|
||||
ComposeAttachmentItemBinding composeAttachmentItemBinding = ComposeAttachmentItemBinding.inflate(LayoutInflater.from(context), holder.binding.attachmentsList, false);
|
||||
composeAttachmentItemBinding.buttonPlay.setVisibility(View.GONE);
|
||||
/* if (editMessageId != null && attachment.url != null) {
|
||||
if (editMessageId != null && attachment.url != null) {
|
||||
composeAttachmentItemBinding.editPreview.setVisibility(View.GONE);
|
||||
composeAttachmentItemBinding.buttonDescription.setVisibility(View.INVISIBLE);
|
||||
composeAttachmentItemBinding.buttonOrderDown.setVisibility(View.INVISIBLE);
|
||||
composeAttachmentItemBinding.buttonOrderUp.setVisibility(View.INVISIBLE);
|
||||
}*/
|
||||
}
|
||||
String attachmentPath = attachment.local_path != null && !attachment.local_path.trim().isEmpty() ? attachment.local_path : attachment.preview_url;
|
||||
if (attachment.type != null || attachment.mimeType != null) {
|
||||
if ((attachment.type != null && attachment.type.toLowerCase().startsWith("image")) || (attachment.mimeType != null && attachment.mimeType.toLowerCase().startsWith("image"))) {
|
||||
|
|
@ -1125,8 +1110,8 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
context.startActivity(intent);
|
||||
});
|
||||
composeAttachmentItemBinding.buttonDescription.setOnClickListener(v -> {
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context);
|
||||
// builderInner.setTitle(R.string.upload_form_description);
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builderInner.setTitle(R.string.upload_form_description);
|
||||
PopupMediaDescriptionBinding popupMediaDescriptionBinding = PopupMediaDescriptionBinding.inflate(LayoutInflater.from(context), null, false);
|
||||
builderInner.setView(popupMediaDescriptionBinding.getRoot());
|
||||
|
||||
|
|
@ -1187,7 +1172,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
}
|
||||
});
|
||||
composeAttachmentItemBinding.buttonRemove.setOnClickListener(v -> {
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builderInner.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
builderInner.setPositiveButton(R.string.delete, (dialog, which) -> {
|
||||
attachmentList.remove(attachment);
|
||||
|
|
@ -1311,14 +1296,12 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
ComposeViewHolder holder = (ComposeViewHolder) viewHolder;
|
||||
boolean extraFeatures = sharedpreferences.getBoolean(context.getString(R.string.SET_EXTAND_EXTRA_FEATURES) + MainActivity.currentUserID + MainActivity.currentInstance, false);
|
||||
boolean mathsComposer = sharedpreferences.getBoolean(context.getString(R.string.SET_MATHS_COMPOSER), true);
|
||||
boolean forwardTag = sharedpreferences.getBoolean(context.getString(R.string.SET_FORWARD_TAGS_IN_REPLY), true);
|
||||
|
||||
|
||||
if (mathsComposer) {
|
||||
holder.binding.buttonMathsComposer.setVisibility(View.VISIBLE);
|
||||
holder.binding.buttonMathsComposer.setOnClickListener(v -> {
|
||||
int cursorPosition = holder.binding.content.getSelectionStart();
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
Resources res = context.getResources();
|
||||
String[] formatArr = res.getStringArray(R.array.SET_MATHS_FORMAT);
|
||||
builder.setItems(formatArr, (dialogInterface, i) -> {
|
||||
|
|
@ -1349,7 +1332,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
holder.binding.buttonLocalOnly.setVisibility(View.VISIBLE);
|
||||
}
|
||||
holder.binding.buttonTextFormat.setOnClickListener(v -> {
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builder.setTitle(context.getString(R.string.post_format));
|
||||
Resources res = context.getResources();
|
||||
String[] formatArr = res.getStringArray(R.array.SET_POST_FORMAT);
|
||||
|
|
@ -1374,7 +1357,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
builder.create().show();
|
||||
});
|
||||
holder.binding.buttonLocalOnly.setOnClickListener(v -> {
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builder.setTitle(context.getString(R.string.local_only));
|
||||
Resources res = context.getResources();
|
||||
boolean[] valArr = new boolean[]{false, true};
|
||||
|
|
@ -1581,48 +1564,13 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
currentCursorPosition = holder.getLayoutPosition();
|
||||
}
|
||||
});
|
||||
boolean capitalize = sharedpreferences.getBoolean(context.getString(R.string.SET_CAPITALIZE), true);
|
||||
boolean mentionsAtTop = sharedpreferences.getBoolean(context.getString(R.string.SET_MENTIONS_AT_TOP), false);
|
||||
if (statusDraft.cursorPosition <= holder.binding.content.length()) {
|
||||
if (!mentionsAtTop) {
|
||||
holder.binding.content.setSelection(statusDraft.cursorPosition);
|
||||
} else {
|
||||
if (capitalize && !statusDraft.text.endsWith("\n")) {
|
||||
statusDraft.text += "\n";
|
||||
holder.binding.content.setText(statusDraft.text);
|
||||
}
|
||||
holder.binding.content.setSelection(holder.binding.content.getText().length());
|
||||
}
|
||||
holder.binding.content.setSelection(statusDraft.cursorPosition);
|
||||
}
|
||||
if (statusDraft.setCursorToEnd) {
|
||||
statusDraft.setCursorToEnd = false;
|
||||
holder.binding.content.setSelection(holder.binding.content.getText().length());
|
||||
}
|
||||
if (forwardTag && position > 0 && statusDraft.text != null && !statusDraft.text.contains("#")) {
|
||||
Status status = statusList.get(position - 1).reblog == null ? statusList.get(position - 1) : statusList.get(position - 1).reblog;
|
||||
if (status.tags != null && status.tags.size() > 0) {
|
||||
statusDraft.text += "\n\n";
|
||||
int lenght = 0;
|
||||
for (Tag tag : status.tags) {
|
||||
statusDraft.text += "#" + tag.name + " ";
|
||||
lenght += ("#" + tag.name + " ").length();
|
||||
}
|
||||
holder.binding.content.setText(statusDraft.text);
|
||||
statusDraft.cursorPosition = statusDraft.text.length() - lenght - 3;
|
||||
statusDraft.setCursorToEnd = false;
|
||||
holder.binding.content.setSelection(statusDraft.text.length() - lenght - 3);
|
||||
}
|
||||
} else if (forwardTag && position > 0 && statusDraft.text != null && statusDraft.text.contains("#")) {
|
||||
Status status = statusList.get(position - 1).reblog == null ? statusList.get(position - 1) : statusList.get(position - 1).reblog;
|
||||
int lenght = 0;
|
||||
for (Tag tag : status.tags) {
|
||||
lenght += ("#" + tag.name + " ").length();
|
||||
}
|
||||
statusDraft.cursorPosition = statusDraft.text.length() - lenght - 3;
|
||||
statusDraft.setCursorToEnd = false;
|
||||
holder.binding.content.setSelection(statusDraft.text.length() - lenght - 3);
|
||||
}
|
||||
|
||||
if (statusDraft.spoiler_text != null) {
|
||||
holder.binding.contentSpoiler.setText(statusDraft.spoiler_text);
|
||||
holder.binding.contentSpoiler.setSelection(holder.binding.contentSpoiler.getText().length());
|
||||
|
|
@ -1725,7 +1673,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
}
|
||||
|
||||
SharedPreferences.Editor editor = sharedpreferences.edit();
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builder.setTitle(context.getString(R.string.message_language));
|
||||
|
||||
builder.setSingleChoiceItems(languagesArr, selection, null);
|
||||
|
|
@ -1759,7 +1707,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
* @param position - int position
|
||||
*/
|
||||
private void displayPollPopup(ComposeViewHolder holder, Status statusDraft, int position) {
|
||||
AlertDialog.Builder alertPoll = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder alertPoll = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
alertPoll.setTitle(R.string.create_poll);
|
||||
ComposePollBinding composePollBinding = ComposePollBinding.inflate(LayoutInflater.from(context), new LinearLayout(context), false);
|
||||
alertPoll.setView(composePollBinding.getRoot());
|
||||
|
|
@ -2002,7 +1950,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
|
|||
*/
|
||||
private void displayEmojiPicker(ComposeViewHolder holder, String instance) throws DBException {
|
||||
|
||||
final AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
|
||||
final AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
int paddingPixel = 15;
|
||||
float density = context.getResources().getDisplayMetrics().density;
|
||||
int paddingDp = (int) (paddingPixel * density);
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ public class DomainBlockAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
|
|||
holder.binding.domainName.setText(domain);
|
||||
AccountsVM accountsVM = new ViewModelProvider((ViewModelStoreOwner) context).get(AccountsVM.class);
|
||||
holder.binding.unblockDomain.setOnClickListener(v -> {
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
alt_bld.setMessage(context.getString(R.string.unblock_domain_confirm, domain));
|
||||
alt_bld.setPositiveButton(R.string.yes, (dialog, id) -> {
|
||||
accountsVM.removeDomainBlocks(MainActivity.currentInstance, MainActivity.currentToken, domain);
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ import app.fedilab.android.R;
|
|||
import app.fedilab.android.databinding.DrawerFilterBinding;
|
||||
import app.fedilab.android.mastodon.activities.FilterActivity;
|
||||
import app.fedilab.android.mastodon.client.entities.api.Filter;
|
||||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
import app.fedilab.android.mastodon.viewmodel.mastodon.FiltersVM;
|
||||
|
||||
|
||||
|
|
@ -89,7 +90,7 @@ public class FilterAdapter extends RecyclerView.Adapter<FilterAdapter.FilterView
|
|||
}
|
||||
}));
|
||||
holder.binding.deleteFilter.setOnClickListener(v -> {
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builder.setTitle(R.string.action_filter_delete);
|
||||
builder.setMessage(R.string.action_lists_confirm_delete);
|
||||
builder.setIcon(android.R.drawable.ic_dialog_alert)
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ import app.fedilab.android.mastodon.client.entities.api.Reaction;
|
|||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
import app.fedilab.android.mastodon.helper.ThemeHelper;
|
||||
import app.fedilab.android.mastodon.viewmodel.mastodon.AnnouncementsVM;
|
||||
import app.fedilab.android.mastodon.viewmodel.mastodon.StatusesVM;
|
||||
import app.fedilab.android.mastodon.viewmodel.pleroma.ActionsVM;
|
||||
|
||||
|
||||
|
|
@ -47,29 +46,18 @@ public class ReactionAdapter extends RecyclerView.Adapter<ReactionAdapter.Reacti
|
|||
private final List<Reaction> reactions;
|
||||
private final String announcementId;
|
||||
private final boolean statusReaction;
|
||||
private final boolean isPleroma;
|
||||
private Context context;
|
||||
|
||||
|
||||
ReactionAdapter(String announcementId, List<Reaction> reactions, boolean statusReaction, boolean isPleroma) {
|
||||
this.reactions = reactions;
|
||||
this.announcementId = announcementId;
|
||||
this.statusReaction = statusReaction;
|
||||
this.isPleroma = isPleroma;
|
||||
}
|
||||
|
||||
ReactionAdapter(String announcementId, List<Reaction> reactions, boolean statusReaction) {
|
||||
this.reactions = reactions;
|
||||
this.announcementId = announcementId;
|
||||
this.statusReaction = statusReaction;
|
||||
this.isPleroma = true;
|
||||
}
|
||||
|
||||
ReactionAdapter(String announcementId, List<Reaction> reactions) {
|
||||
this.reactions = reactions;
|
||||
this.announcementId = announcementId;
|
||||
this.statusReaction = false;
|
||||
this.isPleroma = true;
|
||||
}
|
||||
|
||||
@NonNull
|
||||
|
|
@ -113,7 +101,7 @@ public class ReactionAdapter extends RecyclerView.Adapter<ReactionAdapter.Reacti
|
|||
}
|
||||
notifyItemChanged(position);
|
||||
});
|
||||
} else if (isPleroma) {
|
||||
} else {
|
||||
ActionsVM actionVM = new ViewModelProvider((ViewModelStoreOwner) context).get(ActionsVM.class);
|
||||
holder.binding.reactionContainer.setOnClickListener(v -> {
|
||||
if (reaction.me) {
|
||||
|
|
@ -127,20 +115,6 @@ public class ReactionAdapter extends RecyclerView.Adapter<ReactionAdapter.Reacti
|
|||
}
|
||||
notifyItemChanged(position);
|
||||
});
|
||||
} else {
|
||||
StatusesVM statusesVM = new ViewModelProvider((ViewModelStoreOwner) context).get(StatusesVM.class);
|
||||
holder.binding.reactionContainer.setOnClickListener(v -> {
|
||||
if (reaction.me) {
|
||||
statusesVM.removeReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, announcementId, reaction.name);
|
||||
reaction.me = false;
|
||||
reaction.count -= 1;
|
||||
} else {
|
||||
statusesVM.addReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, announcementId, reaction.name);
|
||||
reaction.me = true;
|
||||
reaction.count += 1;
|
||||
}
|
||||
notifyItemChanged(position);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ import org.jetbrains.annotations.NotNull;
|
|||
import java.util.Collections;
|
||||
|
||||
import app.fedilab.android.R;
|
||||
import app.fedilab.android.activities.MainActivity;
|
||||
import app.fedilab.android.databinding.DrawerReorderBinding;
|
||||
import app.fedilab.android.mastodon.activities.ReorderTimelinesActivity;
|
||||
import app.fedilab.android.mastodon.client.entities.app.BottomMenu;
|
||||
|
|
@ -101,8 +100,6 @@ public class ReorderBottomMenuAdapter extends RecyclerView.Adapter<RecyclerView.
|
|||
|
||||
holder.binding.hide.setOnClickListener(v -> {
|
||||
bottomMenu.bottom_menu.get(position).visible = !bottomMenu.bottom_menu.get(position).visible;
|
||||
bottomMenu.user_id = MainActivity.currentUserID;
|
||||
bottomMenu.instance = MainActivity.currentInstance;
|
||||
if (bottomMenu.bottom_menu.get(position).visible) {
|
||||
holder.binding.hide.setImageResource(R.drawable.ic_baseline_visibility_24);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ import app.fedilab.android.mastodon.client.entities.app.PinnedTimeline;
|
|||
import app.fedilab.android.mastodon.client.entities.app.RemoteInstance;
|
||||
import app.fedilab.android.mastodon.client.entities.app.Timeline;
|
||||
import app.fedilab.android.mastodon.exception.DBException;
|
||||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
import app.fedilab.android.mastodon.helper.itemtouchhelper.ItemTouchHelperAdapter;
|
||||
import app.fedilab.android.mastodon.helper.itemtouchhelper.ItemTouchHelperViewHolder;
|
||||
import app.fedilab.android.mastodon.helper.itemtouchhelper.OnStartDragListener;
|
||||
|
|
@ -184,7 +185,7 @@ public class ReorderTabAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
|
|||
}
|
||||
holder.binding.delete.setOnClickListener(v -> {
|
||||
if (item.type == Timeline.TimeLineEnum.TAG || item.type == Timeline.TimeLineEnum.REMOTE || item.type == Timeline.TimeLineEnum.LIST) {
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
String title = "";
|
||||
String message = "";
|
||||
alt_bld.setTitle(R.string.action_lists_delete);
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@ import android.os.Looper;
|
|||
import android.text.Html;
|
||||
import android.text.SpannableString;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
import android.util.TypedValue;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.MotionEvent;
|
||||
|
|
@ -415,8 +414,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
boolean compactButtons = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_COMPACT_ACTION_BUTTON), false);
|
||||
boolean originalDateForBoost = sharedpreferences.getBoolean(context.getString(R.string.SET_BOOST_ORIGINAL_DATE), true);
|
||||
boolean hideSingleMediaWithCard = sharedpreferences.getBoolean(context.getString(R.string.SET_HIDE_SINGLE_MEDIA_WITH_CARD), false);
|
||||
boolean autofetch = sharedpreferences.getBoolean(context.getString(R.string.SET_AUTO_FETCH_MISSING_MESSAGES), false);
|
||||
|
||||
|
||||
if (compactButtons) {
|
||||
ConstraintSet set = new ConstraintSet();
|
||||
|
|
@ -520,7 +517,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
holder.binding.quotedMessage.cardviewContainer.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
if (currentAccount != null && currentAccount.api == Account.API.PLEROMA || status.reactions != null) {
|
||||
if (currentAccount != null && currentAccount.api == Account.API.PLEROMA) {
|
||||
if (status.pleroma != null && status.pleroma.emoji_reactions != null && status.pleroma.emoji_reactions.size() > 0) {
|
||||
holder.binding.layoutReactions.getRoot().setVisibility(View.VISIBLE);
|
||||
ReactionAdapter reactionAdapter = new ReactionAdapter(status.id, status.pleroma.emoji_reactions, true);
|
||||
|
|
@ -528,13 +525,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
LinearLayoutManager layoutManager
|
||||
= new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false);
|
||||
holder.binding.layoutReactions.reactionsView.setLayoutManager(layoutManager);
|
||||
} else if (status.reactions != null && status.reactions.size() > 0) {
|
||||
holder.binding.layoutReactions.getRoot().setVisibility(View.VISIBLE);
|
||||
ReactionAdapter reactionAdapter = new ReactionAdapter(status.id, status.reactions, true, false);
|
||||
holder.binding.layoutReactions.reactionsView.setAdapter(reactionAdapter);
|
||||
LinearLayoutManager layoutManager
|
||||
= new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false);
|
||||
holder.binding.layoutReactions.reactionsView.setLayoutManager(layoutManager);
|
||||
} else {
|
||||
holder.binding.layoutReactions.getRoot().setVisibility(View.GONE);
|
||||
holder.binding.layoutReactions.reactionsView.setAdapter(null);
|
||||
|
|
@ -547,57 +537,33 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
}).setOnEmojiClickListener((emoji, imageView) -> {
|
||||
String emojiStr = imageView.getUnicode();
|
||||
boolean alreadyAdded = false;
|
||||
if (status.pleroma != null && status.pleroma.emoji_reactions != null) {
|
||||
for (Reaction reaction : status.pleroma.emoji_reactions) {
|
||||
if (reaction.name.compareTo(emojiStr) == 0 && reaction.me) {
|
||||
alreadyAdded = true;
|
||||
reaction.count = (reaction.count - 1);
|
||||
if (reaction.count == 0) {
|
||||
status.pleroma.emoji_reactions.remove(reaction);
|
||||
}
|
||||
adapter.notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
break;
|
||||
if (status.pleroma == null || status.pleroma.emoji_reactions == null) {
|
||||
return;
|
||||
}
|
||||
for (Reaction reaction : status.pleroma.emoji_reactions) {
|
||||
if (reaction.name.compareTo(emojiStr) == 0 && reaction.me) {
|
||||
alreadyAdded = true;
|
||||
reaction.count = (reaction.count - 1);
|
||||
if (reaction.count == 0) {
|
||||
status.pleroma.emoji_reactions.remove(reaction);
|
||||
}
|
||||
}
|
||||
if (!alreadyAdded) {
|
||||
Reaction reaction = new Reaction();
|
||||
reaction.me = true;
|
||||
reaction.count = 1;
|
||||
reaction.name = emojiStr;
|
||||
status.pleroma.emoji_reactions.add(0, reaction);
|
||||
adapter.notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
break;
|
||||
}
|
||||
ActionsVM actionVM = new ViewModelProvider((ViewModelStoreOwner) context).get(ActionsVM.class);
|
||||
if (alreadyAdded) {
|
||||
actionVM.removeReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id, emojiStr);
|
||||
} else {
|
||||
actionVM.addReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id, emojiStr);
|
||||
}
|
||||
} else if (status.reactions != null) {
|
||||
for (Reaction reaction : status.reactions) {
|
||||
if (reaction.name.compareTo(emojiStr) == 0 && reaction.me) {
|
||||
alreadyAdded = true;
|
||||
reaction.count = (reaction.count - 1);
|
||||
if (reaction.count == 0) {
|
||||
status.reactions.remove(reaction);
|
||||
}
|
||||
adapter.notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!alreadyAdded) {
|
||||
Reaction reaction = new Reaction();
|
||||
reaction.me = true;
|
||||
reaction.count = 1;
|
||||
reaction.name = emojiStr;
|
||||
status.reactions.add(0, reaction);
|
||||
adapter.notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
}
|
||||
if (alreadyAdded) {
|
||||
statusesVM.removeReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id, emojiStr);
|
||||
} else {
|
||||
statusesVM.addReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id, emojiStr);
|
||||
}
|
||||
}
|
||||
if (!alreadyAdded) {
|
||||
Reaction reaction = new Reaction();
|
||||
reaction.me = true;
|
||||
reaction.count = 1;
|
||||
reaction.name = emojiStr;
|
||||
status.pleroma.emoji_reactions.add(0, reaction);
|
||||
adapter.notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
}
|
||||
ActionsVM actionVM = new ViewModelProvider((ViewModelStoreOwner) context).get(ActionsVM.class);
|
||||
if (alreadyAdded) {
|
||||
actionVM.removeReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id, emojiStr);
|
||||
} else {
|
||||
actionVM.addReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id, emojiStr);
|
||||
}
|
||||
})
|
||||
.build(holder.binding.layoutReactions.fakeEdittext);
|
||||
|
|
@ -605,7 +571,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
});
|
||||
holder.binding.statusAddCustomEmoji.setOnClickListener(v -> {
|
||||
|
||||
final AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
|
||||
final AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
int paddingPixel = 15;
|
||||
float density = context.getResources().getDisplayMetrics().density;
|
||||
int paddingDp = (int) (paddingPixel * density);
|
||||
|
|
@ -623,61 +589,32 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
String url = emojis.get(BaseMainActivity.currentInstance).get(index).url;
|
||||
String static_url = emojis.get(BaseMainActivity.currentInstance).get(index).static_url;
|
||||
boolean alreadyAdded = false;
|
||||
if (status.pleroma != null && status.pleroma.emoji_reactions != null) {
|
||||
for (Reaction reaction : status.pleroma.emoji_reactions) {
|
||||
if (reaction.name.compareTo(emojiStr) == 0 && reaction.me) {
|
||||
alreadyAdded = true;
|
||||
reaction.count = (reaction.count - 1);
|
||||
if (reaction.count == 0) {
|
||||
status.pleroma.emoji_reactions.remove(reaction);
|
||||
}
|
||||
adapter.notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
break;
|
||||
for (Reaction reaction : status.pleroma.emoji_reactions) {
|
||||
if (reaction.name.compareTo(emojiStr) == 0 && reaction.me) {
|
||||
alreadyAdded = true;
|
||||
reaction.count = (reaction.count - 1);
|
||||
if (reaction.count == 0) {
|
||||
status.pleroma.emoji_reactions.remove(reaction);
|
||||
}
|
||||
}
|
||||
if (!alreadyAdded) {
|
||||
Reaction reaction = new Reaction();
|
||||
reaction.me = true;
|
||||
reaction.count = 1;
|
||||
reaction.name = emojiStr;
|
||||
reaction.url = url;
|
||||
reaction.static_url = static_url;
|
||||
status.pleroma.emoji_reactions.add(0, reaction);
|
||||
adapter.notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
break;
|
||||
}
|
||||
ActionsVM actionsVM = new ViewModelProvider((ViewModelStoreOwner) context).get(ActionsVM.class);
|
||||
if (alreadyAdded) {
|
||||
actionsVM.removeReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id, emojiStr);
|
||||
} else {
|
||||
actionsVM.addReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id, emojiStr);
|
||||
}
|
||||
} else if (status.reactions != null) {
|
||||
for (Reaction reaction : status.reactions) {
|
||||
if (reaction.name.compareTo(emojiStr) == 0 && reaction.me) {
|
||||
alreadyAdded = true;
|
||||
reaction.count = (reaction.count - 1);
|
||||
if (reaction.count == 0) {
|
||||
status.reactions.remove(reaction);
|
||||
}
|
||||
adapter.notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!alreadyAdded) {
|
||||
Reaction reaction = new Reaction();
|
||||
reaction.me = true;
|
||||
reaction.count = 1;
|
||||
reaction.name = emojiStr;
|
||||
reaction.url = url;
|
||||
reaction.static_url = static_url;
|
||||
status.reactions.add(0, reaction);
|
||||
adapter.notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
}
|
||||
if (alreadyAdded) {
|
||||
statusesVM.removeReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id, emojiStr);
|
||||
} else {
|
||||
statusesVM.addReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id, emojiStr);
|
||||
}
|
||||
}
|
||||
if (!alreadyAdded) {
|
||||
Reaction reaction = new Reaction();
|
||||
reaction.me = true;
|
||||
reaction.count = 1;
|
||||
reaction.name = emojiStr;
|
||||
reaction.url = url;
|
||||
reaction.static_url = static_url;
|
||||
status.pleroma.emoji_reactions.add(0, reaction);
|
||||
adapter.notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
}
|
||||
ActionsVM actionsVM = new ViewModelProvider((ViewModelStoreOwner) context).get(ActionsVM.class);
|
||||
if (alreadyAdded) {
|
||||
actionsVM.removeReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id, emojiStr);
|
||||
} else {
|
||||
actionsVM.addReaction(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id, emojiStr);
|
||||
}
|
||||
});
|
||||
gridView.setPadding(paddingDp, paddingDp, paddingDp, paddingDp);
|
||||
|
|
@ -743,10 +680,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
MathJaxView mathview = new MathJaxView(context, mathJaxConfig);
|
||||
holder.binding.statusContentMaths.addView(mathview);
|
||||
if (status.contentSpan != null) {
|
||||
String input = status.contentSpan.toString();
|
||||
input = input.replaceAll("'", "'");
|
||||
input = input.replaceAll("\"", """);
|
||||
mathview.setInputText(input);
|
||||
mathview.setInputText(status.contentSpan.toString());
|
||||
} else {
|
||||
status.mathsShown = false;
|
||||
holder.binding.statusContentMaths.setVisibility(View.GONE);
|
||||
|
|
@ -907,7 +841,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
}
|
||||
});
|
||||
holder.binding.actionButtonFavorite.setChecked(statusToDeal.favourited);
|
||||
holder.binding.avatar.setOnClickListener(v -> {
|
||||
holder.binding.statusUserInfo.setOnClickListener(v -> {
|
||||
if (remote) {
|
||||
Toasty.info(context, context.getString(R.string.retrieve_remote_status), Toasty.LENGTH_SHORT).show();
|
||||
searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.uri, null, "statuses", false, true, false, 0, null, null, 1)
|
||||
|
|
@ -977,7 +911,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
});
|
||||
holder.binding.actionButtonBoost.setOnClickListener(v -> {
|
||||
if (confirmBoost) {
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
if (statusToDeal.reblogged) {
|
||||
alt_bld.setMessage(context.getString(R.string.reblog_remove));
|
||||
} else {
|
||||
|
|
@ -1047,7 +981,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
});
|
||||
holder.binding.actionButtonFavorite.setOnClickListener(v -> {
|
||||
if (confirmFav) {
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
if (status.favourited) {
|
||||
alt_bld.setMessage(context.getString(R.string.favourite_remove));
|
||||
} else {
|
||||
|
|
@ -1130,6 +1064,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
}
|
||||
//Button sizes depending of the defined scale
|
||||
float normalSize = Helper.convertDpToPixel(28, context);
|
||||
|
||||
holder.binding.actionButtonReply.getLayoutParams().width = (int) (normalSize * scaleIcon);
|
||||
holder.binding.actionButtonReply.getLayoutParams().height = (int) (normalSize * scaleIcon);
|
||||
holder.binding.actionButtonReply.requestLayout();
|
||||
|
|
@ -1142,7 +1077,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
holder.binding.actionButtonFavorite.setImageSize((int) (normalSize * scaleIcon));
|
||||
holder.binding.actionButtonBookmark.setImageSize((int) (normalSize * scaleIcon));
|
||||
|
||||
|
||||
holder.binding.statusAddCustomEmoji.getLayoutParams().width = (int) (normalSize * scaleIcon);
|
||||
holder.binding.statusAddCustomEmoji.getLayoutParams().height = (int) (normalSize * scaleIcon);
|
||||
holder.binding.statusAddCustomEmoji.requestLayout();
|
||||
|
|
@ -1723,9 +1657,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
});
|
||||
if (!minified && canBeFederated) {
|
||||
holder.binding.mainContainer.setOnClickListener(v -> holder.binding.statusContent.callOnClick());
|
||||
holder.binding.statusUserInfo.setOnClickListener(v -> {
|
||||
holder.binding.statusContent.callOnClick();
|
||||
});
|
||||
holder.binding.statusContent.setOnClickListener(v -> {
|
||||
if (status.isFocused || v.getTag() == SpannableHelper.CLICKABLE_SPAN) {
|
||||
if (v.getTag() == SpannableHelper.CLICKABLE_SPAN) {
|
||||
|
|
@ -1822,7 +1753,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
popup.setOnMenuItemClickListener(item -> {
|
||||
int itemId = item.getItemId();
|
||||
if (itemId == R.id.action_redraft) {
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builderInner.setTitle(stringArrayConf[1]);
|
||||
builderInner.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
builderInner.setPositiveButton(R.string.yes, (dialog, which) -> {
|
||||
|
|
@ -1881,7 +1812,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
} else if (itemId == R.id.action_open_browser) {
|
||||
Helper.openBrowser(context, statusToDeal.url);
|
||||
} else if (itemId == R.id.action_remove) {
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builderInner.setTitle(stringArrayConf[0]);
|
||||
builderInner.setMessage(statusToDeal.content);
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
|
||||
|
|
@ -1898,7 +1829,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
}));
|
||||
builderInner.show();
|
||||
} else if (itemId == R.id.action_block_domain) {
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builderInner.setTitle(stringArrayConf[3]);
|
||||
String domain = statusToDeal.account.acct.split("@")[1];
|
||||
builderInner.setMessage(context.getString(R.string.block_domain_confirm_message, domain));
|
||||
|
|
@ -1909,7 +1840,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
});
|
||||
builderInner.show();
|
||||
} else if (itemId == R.id.action_mute) {
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builderInner.setTitle(stringArrayConf[0]);
|
||||
builderInner.setMessage(statusToDeal.account.acct);
|
||||
builderInner.setNeutralButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
|
|
@ -1925,7 +1856,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
}));
|
||||
builderInner.show();
|
||||
} else if (itemId == R.id.action_mute_home) {
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builderInner.setTitle(R.string.mute_home);
|
||||
builderInner.setMessage(statusToDeal.account.acct);
|
||||
builderInner.setNeutralButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
|
|
@ -1956,7 +1887,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
MastodonHelper.scheduleBoost(context, MastodonHelper.ScheduleType.TIMED_MUTED, statusToDeal, null, null);
|
||||
return true;
|
||||
} else if (itemId == R.id.action_block) {
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builderInner = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builderInner.setTitle(stringArrayConf[1]);
|
||||
builderInner.setMessage(statusToDeal.account.acct);
|
||||
builderInner.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
|
|
@ -2045,7 +1976,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
}
|
||||
Handler mainHandler = new Handler(Looper.getMainLooper());
|
||||
Runnable myRunnable = () -> {
|
||||
AlertDialog.Builder builderSingle = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builderSingle = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
builderSingle.setTitle(context.getString(R.string.choose_accounts));
|
||||
final AccountsSearchAdapter accountsSearchAdapter = new AccountsSearchAdapter(context, accountList);
|
||||
final BaseAccount[] accountArray = new BaseAccount[accounts.size()];
|
||||
|
|
@ -2158,65 +2089,44 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
}
|
||||
|
||||
if (status.isFetchMore && fetchMoreCallBack != null) {
|
||||
if (!autofetch) {
|
||||
DrawerFetchMoreBinding drawerFetchMoreBinding = DrawerFetchMoreBinding.inflate(LayoutInflater.from(context));
|
||||
if (status.positionFetchMore == Status.PositionFetchMore.BOTTOM) {
|
||||
holder.binding.fetchMoreContainerBottom.setVisibility(View.GONE);
|
||||
holder.binding.fetchMoreContainerTop.setVisibility(View.VISIBLE);
|
||||
holder.binding.fetchMoreContainerTop.removeAllViews();
|
||||
holder.binding.fetchMoreContainerTop.addView(drawerFetchMoreBinding.getRoot());
|
||||
} else {
|
||||
holder.binding.fetchMoreContainerBottom.setVisibility(View.VISIBLE);
|
||||
holder.binding.fetchMoreContainerTop.setVisibility(View.GONE);
|
||||
holder.binding.fetchMoreContainerBottom.removeAllViews();
|
||||
holder.binding.fetchMoreContainerBottom.addView(drawerFetchMoreBinding.getRoot());
|
||||
}
|
||||
drawerFetchMoreBinding.fetchMoreMin.setOnClickListener(v -> {
|
||||
status.isFetchMore = false;
|
||||
int position = holder.getBindingAdapterPosition();
|
||||
adapter.notifyItemChanged(position);
|
||||
if (position < statusList.size() - 1) {
|
||||
String fromId;
|
||||
if (status.positionFetchMore == Status.PositionFetchMore.TOP) {
|
||||
fromId = statusList.get(position + 1).id;
|
||||
} else {
|
||||
fromId = status.id;
|
||||
}
|
||||
fetchMoreCallBack.onClickMinId(fromId, status);
|
||||
}
|
||||
});
|
||||
drawerFetchMoreBinding.fetchMoreMax.setOnClickListener(v -> {
|
||||
//We hide the button
|
||||
status.isFetchMore = false;
|
||||
String fromId;
|
||||
if (status.positionFetchMore == Status.PositionFetchMore.TOP) {
|
||||
fromId = statusList.get(holder.getBindingAdapterPosition()).id;
|
||||
} else {
|
||||
fromId = statusList.get(holder.getBindingAdapterPosition() - 1).id;
|
||||
}
|
||||
fetchMoreCallBack.onClickMaxId(fromId, status);
|
||||
adapter.notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
});
|
||||
} else {
|
||||
DrawerFetchMoreBinding drawerFetchMoreBinding = DrawerFetchMoreBinding.inflate(LayoutInflater.from(context));
|
||||
if (status.positionFetchMore == Status.PositionFetchMore.BOTTOM) {
|
||||
holder.binding.fetchMoreContainerBottom.setVisibility(View.GONE);
|
||||
holder.binding.fetchMoreContainerTop.setVisibility(View.VISIBLE);
|
||||
holder.binding.fetchMoreContainerTop.removeAllViews();
|
||||
holder.binding.fetchMoreContainerTop.addView(drawerFetchMoreBinding.getRoot());
|
||||
} else {
|
||||
holder.binding.fetchMoreContainerBottom.setVisibility(View.VISIBLE);
|
||||
holder.binding.fetchMoreContainerTop.setVisibility(View.GONE);
|
||||
holder.binding.fetchMoreContainerBottom.removeAllViews();
|
||||
holder.binding.fetchMoreContainerBottom.addView(drawerFetchMoreBinding.getRoot());
|
||||
}
|
||||
drawerFetchMoreBinding.fetchMoreMin.setOnClickListener(v -> {
|
||||
status.isFetchMore = false;
|
||||
int position = holder.getBindingAdapterPosition();
|
||||
String statusIdMin = null, statusIdMax;
|
||||
adapter.notifyItemChanged(position);
|
||||
if (position < statusList.size() - 1) {
|
||||
String fromId;
|
||||
if (status.positionFetchMore == Status.PositionFetchMore.TOP) {
|
||||
statusIdMin = statusList.get(position + 1).id;
|
||||
fromId = statusList.get(position + 1).id;
|
||||
} else {
|
||||
statusIdMin = status.id;
|
||||
fromId = status.id;
|
||||
}
|
||||
fetchMoreCallBack.onClickMinId(fromId, status);
|
||||
}
|
||||
});
|
||||
drawerFetchMoreBinding.fetchMoreMax.setOnClickListener(v -> {
|
||||
//We hide the button
|
||||
status.isFetchMore = false;
|
||||
String fromId;
|
||||
if (status.positionFetchMore == Status.PositionFetchMore.TOP) {
|
||||
statusIdMax = statusList.get(holder.getBindingAdapterPosition()).id;
|
||||
fromId = statusList.get(holder.getBindingAdapterPosition()).id;
|
||||
} else {
|
||||
statusIdMax = statusList.get(holder.getBindingAdapterPosition() - 1).id;
|
||||
fromId = statusList.get(holder.getBindingAdapterPosition() - 1).id;
|
||||
}
|
||||
fetchMoreCallBack.autoFetch(statusIdMin, statusIdMax, status);
|
||||
}
|
||||
fetchMoreCallBack.onClickMaxId(fromId, status);
|
||||
adapter.notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
});
|
||||
} else {
|
||||
holder.binding.fetchMoreContainerBottom.setVisibility(View.GONE);
|
||||
holder.binding.fetchMoreContainerTop.setVisibility(View.GONE);
|
||||
|
|
@ -2320,9 +2230,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
if ((!fullAttachement || statusToDeal.sensitive) && !singleImage) {
|
||||
layoutMediaBinding.count.setText(String.format(Locale.getDefault(), "%d/%d", mediaPosition, statusToDeal.media_attachments.size()));
|
||||
}
|
||||
if (attachment.description != null && attachment.description.trim().length() > 0) {
|
||||
layoutMediaBinding.media.setContentDescription(attachment.description.trim());
|
||||
}
|
||||
String finalUrl;
|
||||
if (attachment.url == null) {
|
||||
finalUrl = attachment.remote_url;
|
||||
|
|
@ -2521,17 +2428,26 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
@Override
|
||||
public List<Attachment> getPreloadItems(int position) {
|
||||
List<Attachment> attachments = new ArrayList<>();
|
||||
int max_size = statusList.size();
|
||||
int siblings = 3;
|
||||
int from = Math.max((position - siblings), 0);
|
||||
if (from > max_size - 1) {
|
||||
from = max_size - 1;
|
||||
}
|
||||
int to = Math.min(position + siblings, max_size - 1);
|
||||
for (Status status : statusList.subList(from, to)) {
|
||||
Status statusToDeal = status.reblog != null ? status.reblog : status;
|
||||
if (statusToDeal.media_attachments != null && statusToDeal.media_attachments.size() > 0) {
|
||||
attachments.addAll(statusToDeal.media_attachments);
|
||||
if (position == 0 && statusList.size() > 0) {
|
||||
for (Status status : statusList.subList(0, 1)) {
|
||||
Status statusToDeal = status.reblog != null ? status.reblog : status;
|
||||
if (statusToDeal.media_attachments != null && statusToDeal.media_attachments.size() > 0) {
|
||||
attachments.addAll(statusToDeal.media_attachments);
|
||||
}
|
||||
}
|
||||
} else if (position > 0 && position < (statusList.size() - 1)) {
|
||||
for (Status status : statusList.subList(position - 1, position + 1)) {
|
||||
Status statusToDeal = status.reblog != null ? status.reblog : status;
|
||||
if (statusToDeal.media_attachments != null && statusToDeal.media_attachments.size() > 0) {
|
||||
attachments.addAll(statusToDeal.media_attachments);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (Status status : statusList.subList(position, position)) {
|
||||
Status statusToDeal = status.reblog != null ? status.reblog : status;
|
||||
if (statusToDeal.media_attachments != null && statusToDeal.media_attachments.size() > 0) {
|
||||
attachments.addAll(statusToDeal.media_attachments);
|
||||
}
|
||||
}
|
||||
}
|
||||
return attachments;
|
||||
|
|
@ -2677,53 +2593,32 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
holder.bindingFilteredHide.dividerCard.setVisibility(View.GONE);
|
||||
}
|
||||
if (status.isFetchMore && fetchMoreCallBack != null) {
|
||||
boolean autofetch = sharedpreferences.getBoolean(context.getString(R.string.SET_AUTO_FETCH_MISSING_MESSAGES), false);
|
||||
if (!autofetch) {
|
||||
holder.bindingFilteredHide.layoutFetchMore.fetchMoreContainer.setVisibility(View.VISIBLE);
|
||||
holder.bindingFilteredHide.layoutFetchMore.fetchMoreMin.setOnClickListener(v -> {
|
||||
status.isFetchMore = false;
|
||||
notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
if (holder.getBindingAdapterPosition() < statusList.size() - 1) {
|
||||
String fromId;
|
||||
if (status.positionFetchMore == Status.PositionFetchMore.TOP) {
|
||||
fromId = statusList.get(holder.getBindingAdapterPosition() + 1).id;
|
||||
} else {
|
||||
fromId = status.id;
|
||||
}
|
||||
fetchMoreCallBack.onClickMinId(fromId, status);
|
||||
}
|
||||
});
|
||||
holder.bindingFilteredHide.layoutFetchMore.fetchMoreMax.setOnClickListener(v -> {
|
||||
//We hide the button
|
||||
status.isFetchMore = false;
|
||||
notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
holder.bindingFilteredHide.layoutFetchMore.fetchMoreContainer.setVisibility(View.VISIBLE);
|
||||
holder.bindingFilteredHide.layoutFetchMore.fetchMoreMin.setOnClickListener(v -> {
|
||||
status.isFetchMore = false;
|
||||
notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
if (holder.getBindingAdapterPosition() < statusList.size() - 1) {
|
||||
String fromId;
|
||||
if (status.positionFetchMore == Status.PositionFetchMore.TOP) {
|
||||
fromId = statusList.get(holder.getBindingAdapterPosition()).id;
|
||||
fromId = statusList.get(holder.getBindingAdapterPosition() + 1).id;
|
||||
} else {
|
||||
fromId = statusList.get(holder.getBindingAdapterPosition() - 1).id;
|
||||
fromId = status.id;
|
||||
}
|
||||
fetchMoreCallBack.onClickMaxId(fromId, status);
|
||||
|
||||
});
|
||||
} else {
|
||||
fetchMoreCallBack.onClickMinId(fromId, status);
|
||||
}
|
||||
});
|
||||
holder.bindingFilteredHide.layoutFetchMore.fetchMoreMax.setOnClickListener(v -> {
|
||||
//We hide the button
|
||||
status.isFetchMore = false;
|
||||
String minId = null, maxId;
|
||||
if (holder.getBindingAdapterPosition() < statusList.size() - 1) {
|
||||
if (status.positionFetchMore == Status.PositionFetchMore.TOP) {
|
||||
minId = statusList.get(holder.getBindingAdapterPosition() + 1).id;
|
||||
} else {
|
||||
minId = status.id;
|
||||
}
|
||||
}
|
||||
String fromId;
|
||||
if (status.positionFetchMore == Status.PositionFetchMore.TOP) {
|
||||
maxId = statusList.get(holder.getBindingAdapterPosition()).id;
|
||||
fromId = statusList.get(holder.getBindingAdapterPosition()).id;
|
||||
} else {
|
||||
maxId = statusList.get(holder.getBindingAdapterPosition() - 1).id;
|
||||
fromId = statusList.get(holder.getBindingAdapterPosition() - 1).id;
|
||||
}
|
||||
fetchMoreCallBack.autoFetch(minId, maxId, status);
|
||||
}
|
||||
|
||||
fetchMoreCallBack.onClickMaxId(fromId, status);
|
||||
notifyItemChanged(holder.getBindingAdapterPosition());
|
||||
});
|
||||
} else {
|
||||
holder.bindingFilteredHide.layoutFetchMore.fetchMoreContainer.setVisibility(View.GONE);
|
||||
}
|
||||
|
|
@ -2879,8 +2774,6 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
void onClickMinId(String min_id, Status statusToUpdate);
|
||||
|
||||
void onClickMaxId(String max_id, Status statusToUpdate);
|
||||
|
||||
void autoFetch(String min_id, String max_id, Status status);
|
||||
}
|
||||
|
||||
public static class StatusViewHolder extends RecyclerView.ViewHolder {
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ public class StatusDraftAdapter extends RecyclerView.Adapter<StatusDraftAdapter.
|
|||
|
||||
|
||||
holder.binding.delete.setOnClickListener(v -> {
|
||||
AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
unfollowConfirm.setMessage(context.getString(R.string.remove_draft));
|
||||
unfollowConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
unfollowConfirm.setPositiveButton(R.string.delete, (dialog, which) -> {
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ public class StatusScheduledAdapter extends RecyclerView.Adapter<StatusScheduled
|
|||
|
||||
});
|
||||
holder.binding.delete.setOnClickListener(v -> {
|
||||
AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(context, Helper.dialogStyle());
|
||||
unfollowConfirm.setMessage(context.getString(R.string.remove_scheduled));
|
||||
unfollowConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
unfollowConfirm.setPositiveButton(R.string.delete, (dialog, which) -> {
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ public class FragmentMedia extends Fragment {
|
|||
return;
|
||||
}
|
||||
canSwipe = (binding.mediaPicture.getScale() == 1);
|
||||
if (!canSwipe && isAdded() && !requireActivity().isFinishing()) {
|
||||
if (!canSwipe && !requireActivity().isFinishing() && isAdded()) {
|
||||
if (!((MediaActivity) requireActivity()).getFullScreen()) {
|
||||
((MediaActivity) requireActivity()).setFullscreen(true);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ public class FragmentMediaProfile extends Fragment {
|
|||
|
||||
@Override
|
||||
public void federatedAccount(Account account) {
|
||||
if (account != null && isAdded() && !requireActivity().isFinishing()) {
|
||||
if (account != null && !requireActivity().isFinishing() && isAdded()) {
|
||||
accountId = account.id;
|
||||
accountsVM.getAccountStatuses(tempInstance, null, accountId, null, null, null, null, null, true, false, MastodonHelper.statusesPerCall(requireActivity()))
|
||||
.observe(getViewLifecycleOwner(), statuses -> initializeStatusesCommonView(statuses));
|
||||
|
|
|
|||
|
|
@ -18,11 +18,14 @@ import android.content.SharedPreferences;
|
|||
import android.os.Bundle;
|
||||
|
||||
import androidx.preference.EditTextPreference;
|
||||
import androidx.preference.MultiSelectListPreference;
|
||||
import androidx.preference.PreferenceFragmentCompat;
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.preference.SwitchPreferenceCompat;
|
||||
|
||||
import app.fedilab.android.BaseMainActivity;
|
||||
import app.fedilab.android.R;
|
||||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
|
||||
public class FragmentComposeSettings extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
|
||||
|
||||
|
|
@ -33,13 +36,20 @@ public class FragmentComposeSettings extends PreferenceFragmentCompat implements
|
|||
}
|
||||
|
||||
private void createPref() {
|
||||
|
||||
SwitchPreferenceCompat SET_WATERMARK = findPreference(getString(R.string.SET_WATERMARK));
|
||||
if (SET_WATERMARK != null) {
|
||||
SET_WATERMARK.getContext().setTheme(Helper.dialogStyle());
|
||||
}
|
||||
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());
|
||||
EditTextPreference SET_WATERMARK_TEXT = findPreference(getString(R.string.SET_WATERMARK_TEXT));
|
||||
if (SET_WATERMARK_TEXT != null) {
|
||||
String val = sharedPreferences.getString(getString(R.string.SET_WATERMARK_TEXT) + BaseMainActivity.currentUserID + BaseMainActivity.currentInstance, sharedPreferences.getString(getString(R.string.SET_WATERMARK_TEXT), null));
|
||||
SET_WATERMARK_TEXT.setText(val);
|
||||
}
|
||||
MultiSelectListPreference SET_SELECTED_LANGUAGE = findPreference(getString(R.string.SET_SELECTED_LANGUAGE));
|
||||
if (SET_SELECTED_LANGUAGE != null) {
|
||||
SET_SELECTED_LANGUAGE.getContext().setTheme(Helper.dialogStyle());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ import androidx.preference.SwitchPreferenceCompat;
|
|||
|
||||
import app.fedilab.android.R;
|
||||
import app.fedilab.android.activities.MainActivity;
|
||||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
|
||||
public class FragmentExtraFeaturesSettings extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
|
||||
|
||||
|
|
@ -71,12 +72,14 @@ public class FragmentExtraFeaturesSettings extends PreferenceFragmentCompat impl
|
|||
|
||||
ListPreference SET_POST_FORMAT = findPreference(getString(R.string.SET_POST_FORMAT));
|
||||
if (SET_POST_FORMAT != null) {
|
||||
SET_POST_FORMAT.getContext().setTheme(Helper.dialogStyle());
|
||||
String format = sharedpreferences.getString(getString(R.string.SET_POST_FORMAT) + MainActivity.currentUserID + MainActivity.currentInstance, "text/plain");
|
||||
SET_POST_FORMAT.setValue(format);
|
||||
}
|
||||
|
||||
ListPreference SET_COMPOSE_LOCAL_ONLY = findPreference(getString(R.string.SET_COMPOSE_LOCAL_ONLY));
|
||||
if (SET_COMPOSE_LOCAL_ONLY != null) {
|
||||
SET_COMPOSE_LOCAL_ONLY.getContext().setTheme(Helper.dialogStyle());
|
||||
int localOnly = sharedpreferences.getInt(getString(R.string.SET_COMPOSE_LOCAL_ONLY) + MainActivity.currentUserID + MainActivity.currentInstance, 0);
|
||||
SET_COMPOSE_LOCAL_ONLY.setValue(String.valueOf(localOnly));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,120 +0,0 @@
|
|||
package app.fedilab.android.mastodon.ui.fragment.settings;
|
||||
/* Copyright 2023 Thomas Schneider
|
||||
*
|
||||
* This file is a part of Fedilab
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it under the terms of the
|
||||
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
||||
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
||||
* Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with Fedilab; if not,
|
||||
* see <http://www.gnu.org/licenses>. */
|
||||
|
||||
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.preference.ListPreference;
|
||||
import androidx.preference.PreferenceFragmentCompat;
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
import androidx.work.Data;
|
||||
import androidx.work.WorkManager;
|
||||
|
||||
import app.fedilab.android.BaseMainActivity;
|
||||
import app.fedilab.android.R;
|
||||
import app.fedilab.android.activities.MainActivity;
|
||||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
import app.fedilab.android.mastodon.jobs.FetchHomeWorker;
|
||||
import es.dmoral.toasty.Toasty;
|
||||
|
||||
|
||||
public class FragmentHomeCacheSettings extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
|
||||
|
||||
|
||||
@Override
|
||||
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
|
||||
addPreferencesFromResource(R.xml.pref_home_cache);
|
||||
createPref();
|
||||
}
|
||||
|
||||
|
||||
private void createPref() {
|
||||
|
||||
getPreferenceScreen().removeAll();
|
||||
addPreferencesFromResource(R.xml.pref_home_cache);
|
||||
PreferenceScreen preferenceScreen = getPreferenceScreen();
|
||||
if (preferenceScreen == null) {
|
||||
Toasty.error(requireActivity(), getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
|
||||
return;
|
||||
}
|
||||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());
|
||||
SwitchPreference SET_FETCH_HOME = findPreference(getString(R.string.SET_FETCH_HOME));
|
||||
if (SET_FETCH_HOME != null) {
|
||||
boolean checked = sharedpreferences.getBoolean(getString(R.string.SET_FETCH_HOME) + MainActivity.currentUserID + MainActivity.currentInstance, false);
|
||||
SET_FETCH_HOME.setChecked(checked);
|
||||
}
|
||||
|
||||
ListPreference SET_FETCH_HOME_DELAY_VALUE = findPreference(getString(R.string.SET_FETCH_HOME_DELAY_VALUE));
|
||||
if (SET_FETCH_HOME_DELAY_VALUE != null) {
|
||||
String timeRefresh = sharedpreferences.getString(getString(R.string.SET_FETCH_HOME_DELAY_VALUE) + MainActivity.currentUserID + MainActivity.currentInstance, "60");
|
||||
SET_FETCH_HOME_DELAY_VALUE.setValue(timeRefresh);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
|
||||
if (getActivity() != null) {
|
||||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());
|
||||
Data inputData = new Data.Builder()
|
||||
.putString(Helper.ARG_INSTANCE, BaseMainActivity.currentInstance)
|
||||
.putString(Helper.ARG_USER_ID, BaseMainActivity.currentUserID)
|
||||
.build();
|
||||
if (key.compareToIgnoreCase(getString(R.string.SET_FETCH_HOME)) == 0) {
|
||||
SharedPreferences.Editor editor = sharedpreferences.edit();
|
||||
SwitchPreference SET_FETCH_HOME = findPreference(getString(R.string.SET_FETCH_HOME));
|
||||
if (SET_FETCH_HOME != null) {
|
||||
editor.putBoolean(getString(R.string.SET_FETCH_HOME) + MainActivity.currentUserID + MainActivity.currentInstance, SET_FETCH_HOME.isChecked());
|
||||
editor.commit();
|
||||
if (SET_FETCH_HOME.isChecked()) {
|
||||
FetchHomeWorker.setRepeatHome(requireActivity(), MainActivity.currentAccount, inputData);
|
||||
} else {
|
||||
WorkManager.getInstance(requireActivity()).cancelAllWorkByTag(Helper.WORKER_REFRESH_HOME + MainActivity.currentUserID + MainActivity.currentInstance);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (key.compareToIgnoreCase(getString(R.string.SET_FETCH_HOME_DELAY_VALUE)) == 0) {
|
||||
ListPreference SET_FETCH_HOME_DELAY_VALUE = findPreference(getString(R.string.SET_FETCH_HOME_DELAY_VALUE));
|
||||
if (SET_FETCH_HOME_DELAY_VALUE != null) {
|
||||
SharedPreferences.Editor editor = sharedpreferences.edit();
|
||||
editor.putString(getString(R.string.SET_FETCH_HOME_DELAY_VALUE) + MainActivity.currentUserID + MainActivity.currentInstance, SET_FETCH_HOME_DELAY_VALUE.getValue());
|
||||
editor.commit();
|
||||
FetchHomeWorker.setRepeatHome(requireActivity(), MainActivity.currentAccount, inputData);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
|
||||
getPreferenceScreen().getSharedPreferences()
|
||||
.registerOnSharedPreferenceChangeListener(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPause() {
|
||||
super.onPause();
|
||||
getPreferenceScreen().getSharedPreferences()
|
||||
.unregisterOnSharedPreferenceChangeListener(this);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -66,6 +66,7 @@ public class FragmentInterfaceSettings extends PreferenceFragmentCompat implemen
|
|||
}
|
||||
ListPreference SET_LOGO_LAUNCHER = findPreference(getString(R.string.SET_LOGO_LAUNCHER));
|
||||
if (SET_LOGO_LAUNCHER != null) {
|
||||
SET_LOGO_LAUNCHER.getContext().setTheme(Helper.dialogStyle());
|
||||
SET_LOGO_LAUNCHER.setIcon(LogoHelper.getDrawable(SET_LOGO_LAUNCHER.getValue()));
|
||||
}
|
||||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ import android.annotation.SuppressLint;
|
|||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.preference.ListPreference;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceFragmentCompat;
|
||||
import androidx.preference.PreferenceManager;
|
||||
|
|
@ -35,6 +36,10 @@ public class FragmentLanguageSettings extends PreferenceFragmentCompat implement
|
|||
|
||||
@SuppressLint("ApplySharedPref")
|
||||
private void createPref() {
|
||||
ListPreference SET_DEFAULT_LOCALE_NEW = findPreference(getString(R.string.SET_DEFAULT_LOCALE_NEW));
|
||||
if (SET_DEFAULT_LOCALE_NEW != null) {
|
||||
SET_DEFAULT_LOCALE_NEW.getContext().setTheme(Helper.dialogStyle());
|
||||
}
|
||||
Preference SET_TRANSLATE_VALUES_RESET = findPreference(getString(R.string.SET_TRANSLATE_VALUES_RESET));
|
||||
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());
|
||||
if (SET_TRANSLATE_VALUES_RESET != null) {
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ import java.util.ArrayList;
|
|||
import java.util.List;
|
||||
|
||||
import app.fedilab.android.R;
|
||||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
import app.fedilab.android.mastodon.helper.PushHelper;
|
||||
import app.fedilab.android.mastodon.helper.settings.TimePreference;
|
||||
import app.fedilab.android.mastodon.helper.settings.TimePreferenceDialogFragment;
|
||||
|
|
@ -79,6 +80,9 @@ public class FragmentNotificationsSettings extends PreferenceFragmentCompat impl
|
|||
|
||||
|
||||
ListPreference SET_NOTIFICATION_TYPE = findPreference(getString(R.string.SET_NOTIFICATION_TYPE));
|
||||
if (SET_NOTIFICATION_TYPE != null) {
|
||||
SET_NOTIFICATION_TYPE.getContext().setTheme(Helper.dialogStyle());
|
||||
}
|
||||
String[] notificationValues = getResources().getStringArray(R.array.SET_NOTIFICATION_TYPE_VALUE);
|
||||
if (SET_NOTIFICATION_TYPE != null && SET_NOTIFICATION_TYPE.getValue().equals(notificationValues[2])) {
|
||||
PreferenceCategory notification_sounds = findPreference("notification_sounds");
|
||||
|
|
@ -103,6 +107,10 @@ public class FragmentNotificationsSettings extends PreferenceFragmentCompat impl
|
|||
}
|
||||
return;
|
||||
} else if (SET_NOTIFICATION_TYPE != null && SET_NOTIFICATION_TYPE.getValue().equals(notificationValues[1])) {
|
||||
ListPreference SET_NOTIFICATION_DELAY_VALUE = findPreference(getString(R.string.SET_NOTIFICATION_DELAY_VALUE));
|
||||
if (SET_NOTIFICATION_DELAY_VALUE != null) {
|
||||
SET_NOTIFICATION_DELAY_VALUE.getContext().setTheme(Helper.dialogStyle());
|
||||
}
|
||||
ListPreference SET_PUSH_DISTRIBUTOR = findPreference("SET_PUSH_DISTRIBUTOR");
|
||||
if (SET_PUSH_DISTRIBUTOR != null) {
|
||||
preferenceScreen.removePreferenceRecursively("SET_PUSH_DISTRIBUTOR");
|
||||
|
|
@ -114,6 +122,7 @@ public class FragmentNotificationsSettings extends PreferenceFragmentCompat impl
|
|||
}
|
||||
ListPreference SET_PUSH_DISTRIBUTOR = findPreference(getString(R.string.SET_PUSH_DISTRIBUTOR));
|
||||
if (SET_PUSH_DISTRIBUTOR != null) {
|
||||
SET_PUSH_DISTRIBUTOR.getContext().setTheme(Helper.dialogStyle());
|
||||
List<String> distributors = UnifiedPush.getDistributors(requireActivity(), new ArrayList<>());
|
||||
SET_PUSH_DISTRIBUTOR.setValue(UnifiedPush.getDistributor(requireActivity()));
|
||||
SET_PUSH_DISTRIBUTOR.setEntries(distributors.toArray(new String[0]));
|
||||
|
|
|
|||
|
|
@ -18,9 +18,11 @@ package app.fedilab.android.mastodon.ui.fragment.settings;
|
|||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
|
||||
import androidx.preference.EditTextPreference;
|
||||
import androidx.preference.PreferenceFragmentCompat;
|
||||
|
||||
import app.fedilab.android.R;
|
||||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
|
||||
public class FragmentPrivacySettings extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
|
||||
|
||||
|
|
@ -31,6 +33,10 @@ public class FragmentPrivacySettings extends PreferenceFragmentCompat implements
|
|||
}
|
||||
|
||||
private void createPref() {
|
||||
EditTextPreference SET_INVIDIOUS_HOST = findPreference(getString(R.string.SET_INVIDIOUS_HOST));
|
||||
if (SET_INVIDIOUS_HOST != null) {
|
||||
SET_INVIDIOUS_HOST.getContext().setTheme(Helper.dialogStyle());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -112,15 +112,6 @@ public class FragmentSettingsCategories extends PreferenceFragmentCompat {
|
|||
});
|
||||
}
|
||||
|
||||
Preference pref_category_key_home_cache = findPreference(getString(R.string.pref_category_key_home_cache));
|
||||
if (pref_category_key_home_cache != null) {
|
||||
pref_category_key_home_cache.setOnPreferenceClickListener(preference -> {
|
||||
NavController navController = Navigation.findNavController(requireActivity(), R.id.fragment_container);
|
||||
navController.navigate(FragmentSettingsCategoriesDirections.Companion.categoriesToHomeCache());
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
||||
Preference pref_category_key_theming = findPreference(getString(R.string.pref_category_key_theming));
|
||||
if (pref_category_key_theming != null) {
|
||||
pref_category_key_theming.setOnPreferenceClickListener(preference -> {
|
||||
|
|
@ -154,7 +145,7 @@ public class FragmentSettingsCategories extends PreferenceFragmentCompat {
|
|||
Preference pref_export_settings = findPreference(getString(R.string.pref_export_settings));
|
||||
if (pref_export_settings != null) {
|
||||
pref_export_settings.setOnPreferenceClickListener(preference -> {
|
||||
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
|
||||
permissionLauncher.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE);
|
||||
} else {
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -82,7 +82,18 @@ public class FragmentThemingSettings extends PreferenceFragmentCompat implements
|
|||
if (getPreferenceScreen() == null) {
|
||||
Toasty.error(requireActivity(), getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
ListPreference SET_THEME_BASE = findPreference(getString(R.string.SET_THEME_BASE));
|
||||
if (SET_THEME_BASE != null) {
|
||||
SET_THEME_BASE.getContext().setTheme(Helper.dialogStyle());
|
||||
}
|
||||
ListPreference SET_THEME_DEFAULT_LIGHT = findPreference(getString(R.string.SET_THEME_DEFAULT_LIGHT));
|
||||
if (SET_THEME_DEFAULT_LIGHT != null) {
|
||||
SET_THEME_DEFAULT_LIGHT.getContext().setTheme(Helper.dialogStyle());
|
||||
}
|
||||
ListPreference SET_THEME_DEFAULT_DARK = findPreference(getString(R.string.SET_THEME_DEFAULT_DARK));
|
||||
if (SET_THEME_DEFAULT_DARK != null) {
|
||||
SET_THEME_DEFAULT_DARK.getContext().setTheme(Helper.dialogStyle());
|
||||
}
|
||||
|
||||
Preference SET_CUSTOMIZE_LIGHT_COLORS_ACTION = findPreference(getString(R.string.SET_CUSTOMIZE_LIGHT_COLORS_ACTION));
|
||||
if (SET_CUSTOMIZE_LIGHT_COLORS_ACTION != null) {
|
||||
|
|
@ -107,8 +118,9 @@ public class FragmentThemingSettings extends PreferenceFragmentCompat implements
|
|||
|
||||
Preference SET_RESET_CUSTOM_COLOR = findPreference(getString(R.string.SET_RESET_CUSTOM_COLOR));
|
||||
if (SET_RESET_CUSTOM_COLOR != null) {
|
||||
SET_RESET_CUSTOM_COLOR.getContext().setTheme(Helper.dialogStyle());
|
||||
SET_RESET_CUSTOM_COLOR.setOnPreferenceClickListener(preference -> {
|
||||
AlertDialog.Builder resetConfirm = new MaterialAlertDialogBuilder(requireActivity());
|
||||
AlertDialog.Builder resetConfirm = new MaterialAlertDialogBuilder(requireActivity(), Helper.dialogStyle());
|
||||
resetConfirm.setMessage(getString(R.string.reset_color));
|
||||
resetConfirm.setNegativeButton(R.string.no, (dialog, which) -> dialog.dismiss());
|
||||
resetConfirm.setPositiveButton(R.string.reset, (dialog, which) -> {
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ import androidx.preference.SwitchPreferenceCompat;
|
|||
|
||||
import app.fedilab.android.R;
|
||||
import app.fedilab.android.activities.MainActivity;
|
||||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
|
||||
public class FragmentTimelinesSettings extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
|
||||
|
||||
|
|
@ -41,11 +42,18 @@ public class FragmentTimelinesSettings extends PreferenceFragmentCompat implemen
|
|||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());
|
||||
addPreferencesFromResource(R.xml.pref_timelines);
|
||||
PreferenceScreen preferenceScreen = getPreferenceScreen();
|
||||
|
||||
ListPreference SET_LOAD_MEDIA_TYPE = findPreference(getString(R.string.SET_LOAD_MEDIA_TYPE));
|
||||
if (SET_LOAD_MEDIA_TYPE != null) {
|
||||
SET_LOAD_MEDIA_TYPE.getContext().setTheme(Helper.dialogStyle());
|
||||
}
|
||||
ListPreference SET_TRANSLATOR = findPreference(getString(R.string.SET_TRANSLATOR));
|
||||
|
||||
if (SET_TRANSLATOR != null) {
|
||||
SET_TRANSLATOR.getContext().setTheme(Helper.dialogStyle());
|
||||
}
|
||||
ListPreference SET_TRANSLATOR_VERSION = findPreference(getString(R.string.SET_TRANSLATOR_VERSION));
|
||||
|
||||
if (SET_TRANSLATOR_VERSION != null) {
|
||||
SET_TRANSLATOR_VERSION.getContext().setTheme(Helper.dialogStyle());
|
||||
}
|
||||
EditTextPreference SET_TRANSLATOR_API_KEY = findPreference(getString(R.string.SET_TRANSLATOR_API_KEY));
|
||||
if (SET_TRANSLATOR != null && SET_TRANSLATOR.getValue().equals("FEDILAB")) {
|
||||
if (SET_TRANSLATOR_API_KEY != null) {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ import app.fedilab.android.BaseMainActivity;
|
|||
import app.fedilab.android.R;
|
||||
import app.fedilab.android.activities.MainActivity;
|
||||
import app.fedilab.android.databinding.FragmentPaginationBinding;
|
||||
import app.fedilab.android.mastodon.activities.SearchResultTabActivity;
|
||||
import app.fedilab.android.mastodon.client.entities.api.Account;
|
||||
import app.fedilab.android.mastodon.client.entities.api.Accounts;
|
||||
import app.fedilab.android.mastodon.client.entities.api.Pagination;
|
||||
|
|
@ -224,25 +223,10 @@ public class FragmentMastodonAccount extends Fragment {
|
|||
router(true);
|
||||
});
|
||||
if (accounts == null || accounts.accounts == null || accounts.accounts.size() == 0) {
|
||||
if (requireActivity() instanceof SearchResultTabActivity) {
|
||||
((SearchResultTabActivity) requireActivity()).accountEmpty = true;
|
||||
if (((SearchResultTabActivity) requireActivity()).tagEmpty != null) {
|
||||
if (((SearchResultTabActivity) requireActivity()).tagEmpty) {
|
||||
((SearchResultTabActivity) requireActivity()).moveToMessage();
|
||||
}
|
||||
}
|
||||
}
|
||||
binding.noAction.setVisibility(View.VISIBLE);
|
||||
binding.noActionText.setText(R.string.no_accounts);
|
||||
return;
|
||||
}
|
||||
if (requireActivity() instanceof SearchResultTabActivity) {
|
||||
if (((SearchResultTabActivity) requireActivity()).tagEmpty != null) {
|
||||
if (((SearchResultTabActivity) requireActivity()).tagEmpty) {
|
||||
((SearchResultTabActivity) requireActivity()).moveToAccount();
|
||||
}
|
||||
}
|
||||
}
|
||||
binding.recyclerView.setVisibility(View.VISIBLE);
|
||||
if (accountAdapter != null && this.accounts != null) {
|
||||
int size = this.accounts.size();
|
||||
|
|
|
|||
|
|
@ -146,15 +146,7 @@ public class FragmentMastodonTag extends Fragment {
|
|||
});
|
||||
if (tags == null || tags.size() == 0) {
|
||||
if (requireActivity() instanceof SearchResultTabActivity) {
|
||||
((SearchResultTabActivity) requireActivity()).tagEmpty = true;
|
||||
if (((SearchResultTabActivity) requireActivity()).accountEmpty != null) {
|
||||
if (((SearchResultTabActivity) requireActivity()).accountEmpty) {
|
||||
((SearchResultTabActivity) requireActivity()).moveToMessage();
|
||||
} else {
|
||||
((SearchResultTabActivity) requireActivity()).moveToAccount();
|
||||
}
|
||||
}
|
||||
|
||||
((SearchResultTabActivity) requireActivity()).moveToAccount();
|
||||
}
|
||||
binding.recyclerView.setVisibility(View.GONE);
|
||||
binding.noAction.setVisibility(View.VISIBLE);
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ import es.dmoral.toasty.Toasty;
|
|||
|
||||
public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.FetchMoreCallBack {
|
||||
|
||||
private boolean scrollingUp;
|
||||
|
||||
private static final int PRELOAD_AHEAD_ITEMS = 10;
|
||||
public UpdateCounters update;
|
||||
private FragmentPaginationBinding binding;
|
||||
|
|
@ -506,9 +506,9 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
|
|||
} else if (update != null && insertedStatus == 0 && direction == DIRECTION.REFRESH) {
|
||||
update.onUpdate(0, timelineType, slug);
|
||||
}
|
||||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());
|
||||
if (direction == DIRECTION.TOP && fetchingMissing) {
|
||||
int position = getAbsolutePosition(fetched_statuses.statuses.get(fetched_statuses.statuses.size() - 1));
|
||||
|
||||
if (position != -1) {
|
||||
binding.recyclerView.scrollToPosition(position + 1);
|
||||
}
|
||||
|
|
@ -656,7 +656,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
|
|||
binding.recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
|
||||
@Override
|
||||
public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
|
||||
scrollingUp = dy < 0;
|
||||
|
||||
if (requireActivity() instanceof BaseMainActivity) {
|
||||
if (dy < 0 && !((BaseMainActivity) requireActivity()).getFloatingVisibility())
|
||||
((BaseMainActivity) requireActivity()).manageFloatingButton(true);
|
||||
|
|
@ -1067,7 +1067,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
|
|||
|
||||
@Override
|
||||
public void federatedAccount(Account account) {
|
||||
if (account != null && isAdded() && !requireActivity().isFinishing()) {
|
||||
if (account != null && !requireActivity().isFinishing() && isAdded()) {
|
||||
accountIDInRemoteInstance = account.id;
|
||||
accountsVM.getAccountStatuses(tempInstance, null, accountIDInRemoteInstance, null, null, null, null, null, false, true, MastodonHelper.statusesPerCall(requireActivity()))
|
||||
.observe(getViewLifecycleOwner(), pinnedStatuses -> accountsVM.getAccountStatuses(tempInstance, null, accountIDInRemoteInstance, null, null, null, exclude_replies, exclude_reblogs, media_only, false, MastodonHelper.statusesPerCall(requireActivity()))
|
||||
|
|
@ -1228,17 +1228,6 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
|
|||
route(DIRECTION.BOTTOM, true, statusToUpdate);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void autoFetch(String min_id, String max_id, Status statusToUpdate) {
|
||||
if (scrollingUp) {
|
||||
min_id_fetch_more = min_id;
|
||||
route(DIRECTION.TOP, true, statusToUpdate);
|
||||
} else {
|
||||
max_id_fetch_more = max_id;
|
||||
route(DIRECTION.BOTTOM, true, statusToUpdate);
|
||||
}
|
||||
}
|
||||
|
||||
public enum DIRECTION {
|
||||
TOP,
|
||||
BOTTOM,
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ import app.fedilab.android.BaseMainActivity;
|
|||
import app.fedilab.android.R;
|
||||
import app.fedilab.android.databinding.FragmentNotificationContainerBinding;
|
||||
import app.fedilab.android.databinding.PopupNotificationSettingsBinding;
|
||||
import app.fedilab.android.mastodon.helper.Helper;
|
||||
import app.fedilab.android.mastodon.ui.pageadapter.FedilabNotificationPageAdapter;
|
||||
import app.fedilab.android.mastodon.viewmodel.mastodon.NotificationsVM;
|
||||
import es.dmoral.toasty.Toasty;
|
||||
|
|
@ -88,13 +89,13 @@ public class FragmentNotificationContainer extends Fragment {
|
|||
}
|
||||
AtomicBoolean changes = new AtomicBoolean(false);
|
||||
binding.settings.setOnClickListener(v -> {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(requireActivity());
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(requireActivity(), Helper.dialogStyle());
|
||||
PopupNotificationSettingsBinding dialogView = PopupNotificationSettingsBinding.inflate(getLayoutInflater());
|
||||
dialogBuilder.setView(dialogView.getRoot());
|
||||
|
||||
|
||||
dialogView.clearAllNotif.setOnClickListener(v1 -> {
|
||||
AlertDialog.Builder db = new MaterialAlertDialogBuilder(requireActivity());
|
||||
AlertDialog.Builder db = new MaterialAlertDialogBuilder(requireActivity(), Helper.dialogStyle());
|
||||
db.setTitle(R.string.delete_notification_ask_all);
|
||||
db.setMessage(R.string.delete_notification_all_warning);
|
||||
db.setPositiveButton(R.string.delete_all, (dialog, id) -> {
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ import java.util.List;
|
|||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import app.fedilab.android.R;
|
||||
import app.fedilab.android.mastodon.client.endpoints.MastodonAnnouncementsService;
|
||||
import app.fedilab.android.mastodon.client.endpoints.MastodonStatusesService;
|
||||
import app.fedilab.android.mastodon.client.entities.api.Account;
|
||||
import app.fedilab.android.mastodon.client.entities.api.Accounts;
|
||||
|
|
@ -1293,48 +1292,4 @@ public class StatusesVM extends AndroidViewModel {
|
|||
}).start();
|
||||
return voidMutableLiveData;
|
||||
}
|
||||
|
||||
/**
|
||||
* React to a status with an emoji.
|
||||
*
|
||||
* @param instance Instance domain of the active account
|
||||
* @param token Access token of the active account
|
||||
* @param id Local ID of an announcement
|
||||
* @param name Unicode emoji, or shortcode of custom emoji
|
||||
*/
|
||||
public void addReaction(@NonNull String instance, String token, @NonNull String id, @NonNull String name) {
|
||||
MastodonStatusesService mastodonStatusesService = init(instance);
|
||||
new Thread(() -> {
|
||||
Call<Void> addReactionCall = mastodonStatusesService.addReaction(token, id, name);
|
||||
if (addReactionCall != null) {
|
||||
try {
|
||||
addReactionCall.execute();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}).start();
|
||||
}
|
||||
|
||||
/**
|
||||
* Undo a react emoji to a status.
|
||||
*
|
||||
* @param instance Instance domain of the active account
|
||||
* @param token Access token of the active account
|
||||
* @param id Local ID of an announcement
|
||||
* @param name Unicode emoji, or shortcode of custom emoji
|
||||
*/
|
||||
public void removeReaction(@NonNull String instance, String token, @NonNull String id, @NonNull String name) {
|
||||
MastodonStatusesService mastodonStatusesService = init(instance);
|
||||
new Thread(() -> {
|
||||
Call<Void> removeReactionCall = mastodonStatusesService.removeReaction(token, id, name);
|
||||
if (removeReactionCall != null) {
|
||||
try {
|
||||
removeReactionCall.execute();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}).start();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ public class AllPlaylistsActivity extends BaseBarActivity implements PlaylistAda
|
|||
public void manageAlert(Playlist playlistParam) {
|
||||
|
||||
playlistToEdit = playlistParam;
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(AllPlaylistsActivity.this);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(AllPlaylistsActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
bindingDialog = AddPlaylistPeertubeBinding.inflate(LayoutInflater.from(AllPlaylistsActivity.this), null, false);
|
||||
dialogBuilder.setView(bindingDialog.getRoot());
|
||||
|
||||
|
|
|
|||
|
|
@ -17,12 +17,18 @@ package app.fedilab.android.peertube.activities;
|
|||
import static app.fedilab.android.peertube.client.RetrofitPeertubeAPI.updateCredential;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
import android.text.SpannableString;
|
||||
import android.text.Spanned;
|
||||
import android.text.style.ForegroundColorSpan;
|
||||
import android.text.style.UnderlineSpan;
|
||||
import android.util.Patterns;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.preference.PreferenceManager;
|
||||
|
|
@ -154,7 +160,6 @@ public class LoginActivity extends BaseBarActivity {
|
|||
oauthParams.setClient_secret(client_secret);
|
||||
oauthParams.setGrant_type("password");
|
||||
oauthParams.setScope("user");
|
||||
oauthParams.x_peertube_otp = binding.loginOtp.getText().toString().isEmpty() ? null : binding.loginOtp.getText().toString();
|
||||
if (binding.loginUid.getText() != null) {
|
||||
oauthParams.setUsername(binding.loginUid.getText().toString().trim());
|
||||
}
|
||||
|
|
@ -164,21 +169,22 @@ public class LoginActivity extends BaseBarActivity {
|
|||
try {
|
||||
Token token = new RetrofitPeertubeAPI(LoginActivity.this, finalInstance, null).manageToken(oauthParams);
|
||||
proceedLogin(token, finalInstance);
|
||||
} catch (Error e) {
|
||||
if (e.getError() != null && e.getError().contains("missing_two_factor")) {
|
||||
runOnUiThread(() -> {
|
||||
binding.loginOtpContainer.setVisibility(View.VISIBLE);
|
||||
binding.loginOtp.setFocusable(true);
|
||||
binding.loginOtp.requestFocus();
|
||||
binding.loginButton.setEnabled(true);
|
||||
});
|
||||
} else {
|
||||
runOnUiThread(() -> {
|
||||
Toasty.error(LoginActivity.this, e.getError() != null && !e.getError().isEmpty() ? e.getError() : getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
|
||||
binding.loginButton.setEnabled(true);
|
||||
});
|
||||
e.printStackTrace();
|
||||
} catch (final Exception e) {
|
||||
oauthParams.setUsername(binding.loginUid.getText().toString().toLowerCase().trim());
|
||||
Token token = null;
|
||||
try {
|
||||
token = new RetrofitPeertubeAPI(LoginActivity.this, finalInstance, null).manageToken(oauthParams);
|
||||
} catch (Error ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
proceedLogin(token, finalInstance);
|
||||
} catch (Error e) {
|
||||
runOnUiThread(() -> {
|
||||
Toasty.error(LoginActivity.this, e.getError() != null && !e.getError().isEmpty() ? e.getError() : getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
|
||||
binding.loginButton.setEnabled(true);
|
||||
});
|
||||
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ public class ManageInstancesActivity extends BaseBarActivity implements AboutIns
|
|||
@SuppressLint("ApplySharedPref")
|
||||
private void showRadioButtonDialogFullInstances(Activity activity) {
|
||||
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(activity);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(activity);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(activity, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
alt_bld.setTitle(R.string.instance_choice);
|
||||
String instance = HelperInstance.getLiveInstance(activity);
|
||||
final EditText input = new EditText(activity);
|
||||
|
|
|
|||
|
|
@ -679,7 +679,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
|
|||
}
|
||||
|
||||
private void reportAlert(RetrofitPeertubeAPI.ActionType type, AlertDialog alertDialog) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(PeertubeActivity.this);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(PeertubeActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
LayoutInflater inflater1 = getLayoutInflater();
|
||||
View dialogView = inflater1.inflate(R.layout.popup_report_peertube, new LinearLayout(PeertubeActivity.this), false);
|
||||
dialogBuilder.setView(dialogView);
|
||||
|
|
@ -879,7 +879,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
|
|||
});
|
||||
|
||||
binding.videoInformation.setOnClickListener(v -> {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(PeertubeActivity.this);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(PeertubeActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
|
||||
PopupVideoInfoPeertubeBinding videoInfo = PopupVideoInfoPeertubeBinding.inflate(getLayoutInflater());
|
||||
|
||||
|
|
@ -1109,7 +1109,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
|
|||
} else if (itemId == R.id.action_report) {
|
||||
AlertDialog alertDialog;
|
||||
AlertDialog.Builder dialogBuilder;
|
||||
dialogBuilder = new MaterialAlertDialogBuilder(PeertubeActivity.this);
|
||||
dialogBuilder = new MaterialAlertDialogBuilder(PeertubeActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
LayoutInflater inflater1 = getLayoutInflater();
|
||||
View dialogView = inflater1.inflate(R.layout.popup_report_choice, new LinearLayout(PeertubeActivity.this), false);
|
||||
dialogBuilder.setView(dialogView);
|
||||
|
|
@ -1241,7 +1241,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
|
|||
if (promptNSFW && peertube != null && peertube.isNsfw() && (nsfwAction.compareTo(Helper.BLUR) == 0 || nsfwAction.compareTo(Helper.DO_NOT_LIST) == 0)) {
|
||||
AlertDialog alertDialog;
|
||||
AlertDialog.Builder dialogBuilder;
|
||||
dialogBuilder = new MaterialAlertDialogBuilder(PeertubeActivity.this);
|
||||
dialogBuilder = new MaterialAlertDialogBuilder(PeertubeActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
dialogBuilder.setTitle(R.string.nsfw_title_warning);
|
||||
dialogBuilder.setCancelable(false);
|
||||
dialogBuilder.setMessage(R.string.nsfw_message_warning);
|
||||
|
|
@ -2033,7 +2033,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis
|
|||
return;
|
||||
}
|
||||
if (apiResponse.getPlaylists() != null && apiResponse.getPlaylists().size() > 0) {
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(PeertubeActivity.this);
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(PeertubeActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
builder.setTitle(R.string.modify_playlists);
|
||||
|
||||
List<PlaylistData.Playlist> ownerPlaylists = apiResponse.getPlaylists();
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ public class PeertubeEditUploadActivity extends BaseBarActivity {
|
|||
|
||||
binding.setUploadDelete.setOnClickListener(v -> {
|
||||
AlertDialog.Builder builderInner;
|
||||
builderInner = new MaterialAlertDialogBuilder(PeertubeEditUploadActivity.this);
|
||||
builderInner = new MaterialAlertDialogBuilder(PeertubeEditUploadActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
builderInner.setMessage(getString(R.string.delete_video_confirmation));
|
||||
builderInner.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
builderInner.setPositiveButton(R.string.yes, (dialog, which) -> {
|
||||
|
|
|
|||
|
|
@ -17,11 +17,9 @@ package app.fedilab.android.peertube.activities;
|
|||
import static app.fedilab.android.BaseMainActivity.currentAccount;
|
||||
import static app.fedilab.android.BaseMainActivity.currentInstance;
|
||||
import static app.fedilab.android.BaseMainActivity.currentToken;
|
||||
import static app.fedilab.android.BaseMainActivity.currentUserID;
|
||||
import static app.fedilab.android.BaseMainActivity.fetchRecentAccounts;
|
||||
import static app.fedilab.android.BaseMainActivity.headerMenuOpen;
|
||||
import static app.fedilab.android.BaseMainActivity.headerOptionInfoClick;
|
||||
import static app.fedilab.android.BaseMainActivity.mamageNewIntent;
|
||||
import static app.fedilab.android.BaseMainActivity.manageDrawerMenu;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_ID;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_INSTANCE;
|
||||
|
|
@ -74,7 +72,6 @@ import java.util.regex.Pattern;
|
|||
import app.fedilab.android.BuildConfig;
|
||||
import app.fedilab.android.R;
|
||||
import app.fedilab.android.activities.AboutActivity;
|
||||
import app.fedilab.android.activities.MainActivity;
|
||||
import app.fedilab.android.activities.PeertubeBaseMainActivity;
|
||||
import app.fedilab.android.databinding.ActivityMainPeertubeBinding;
|
||||
import app.fedilab.android.databinding.NavHeaderMainBinding;
|
||||
|
|
@ -203,27 +200,12 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
|
|||
currentToken = sharedpreferences.getString(app.fedilab.android.mastodon.helper.Helper.PREF_USER_TOKEN, null);
|
||||
}
|
||||
currentAccount = new Account(PeertubeMainActivity.this).getConnectedAccount();
|
||||
if (currentAccount == null) {
|
||||
if (currentUserID == null) {
|
||||
currentUserID = sharedpreferences.getString(PREF_USER_ID, null);
|
||||
}
|
||||
if (currentInstance == null) {
|
||||
currentInstance = sharedpreferences.getString(PREF_USER_INSTANCE, null);
|
||||
}
|
||||
currentAccount = new Account(PeertubeMainActivity.this).getUniqAccount(currentUserID, currentInstance);
|
||||
}
|
||||
} catch (DBException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
if (currentAccount != null && currentAccount.mastodon_account != null) {
|
||||
//It is a Mastodon User
|
||||
Intent myIntent = new Intent(PeertubeMainActivity.this, MainActivity.class);
|
||||
startActivity(myIntent);
|
||||
finish();
|
||||
return;
|
||||
}
|
||||
|
||||
//If the attached account is null, the app will fetch remote instance to get up-to-date values
|
||||
if (currentAccount != null && currentAccount.peertube_account == null) {
|
||||
if (currentAccount != null && currentAccount.mastodon_account == null && currentAccount.peertube_account == null) {
|
||||
try {
|
||||
userMe = new RetrofitPeertubeAPI(PeertubeMainActivity.this, currentInstance, currentToken).verifyCredentials();
|
||||
currentAccount.peertube_account = userMe.getAccount();
|
||||
|
|
@ -249,13 +231,6 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
|
|||
headerMenuOpen = !headerMenuOpen;
|
||||
manageDrawerMenu(PeertubeMainActivity.this, binding.drawerNavView, headerMainBinding);
|
||||
});
|
||||
if (Helper.isLoggedIn()) {
|
||||
binding.navView.inflateMenu(R.menu.bottom_nav_menu_connected_peertube);
|
||||
refreshToken();
|
||||
|
||||
} else {
|
||||
binding.navView.inflateMenu(R.menu.bottom_nav_menu);
|
||||
}
|
||||
};
|
||||
mainHandler.post(myRunnable);
|
||||
}).start();
|
||||
|
|
@ -369,7 +344,13 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
|
|||
|
||||
setTitleCustom(R.string.title_home);
|
||||
|
||||
if (Helper.isLoggedIn()) {
|
||||
binding.navView.inflateMenu(R.menu.bottom_nav_menu_connected_peertube);
|
||||
refreshToken();
|
||||
|
||||
} else {
|
||||
binding.navView.inflateMenu(R.menu.bottom_nav_menu);
|
||||
}
|
||||
peertubeInformation = new PeertubeInformation();
|
||||
peertubeInformation.setCategories(new LinkedHashMap<>());
|
||||
peertubeInformation.setLanguages(new LinkedHashMap<>());
|
||||
|
|
@ -406,9 +387,8 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
|
|||
getSupportFragmentManager(), android.R.id.content, new FragmentLoginPickInstancePeertube(),
|
||||
null, null, FragmentLoginPickInstancePeertube.class.getName());
|
||||
}
|
||||
mamageNewIntent(PeertubeMainActivity.this, getIntent());
|
||||
fetchRecentAccounts(PeertubeMainActivity.this, headerMainBinding);
|
||||
|
||||
fetchRecentAccounts(PeertubeMainActivity.this, headerMainBinding);
|
||||
}
|
||||
|
||||
public DisplayVideosFragment getSubscriptionFragment() {
|
||||
|
|
@ -540,7 +520,7 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
|
|||
instanceConfig = new RetrofitPeertubeAPI(PeertubeMainActivity.this).getConfigInstance();
|
||||
} catch (Error error) {
|
||||
runOnUiThread(() -> {
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(this);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
alt_bld.setTitle(R.string.refresh_token_failed);
|
||||
alt_bld.setMessage(R.string.refresh_token_failed_message);
|
||||
alt_bld.setNegativeButton(R.string.action_logout, (dialog, id) -> {
|
||||
|
|
@ -667,23 +647,13 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
|
|||
recreate();
|
||||
}
|
||||
}
|
||||
mamageNewIntent(PeertubeMainActivity.this, intent);
|
||||
}
|
||||
|
||||
/*public static void mamageNewIntent(Activity activity,
|
||||
Intent intent) {
|
||||
if (intent == null)
|
||||
return;
|
||||
String action = intent.getAction();
|
||||
if (action != null && action.equalsIgnoreCase("app.fedilab.android.shorcut.compose")) {
|
||||
CrossActionHelper.doCrossAction(activity, CrossActionHelper.TypeOfCrossAction.COMPOSE, null, null);
|
||||
}
|
||||
}*/
|
||||
|
||||
@SuppressLint("ApplySharedPref")
|
||||
private void showRadioButtonDialog() {
|
||||
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(this);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
alt_bld.setTitle(R.string.instance_choice);
|
||||
final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(PeertubeMainActivity.this);
|
||||
String acad = HelperInstance.getLiveInstance(PeertubeMainActivity.this);
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ public class ShowAccountActivity extends BaseBarActivity {
|
|||
PostActionsVM viewModel = new ViewModelProvider(ShowAccountActivity.this).get(PostActionsVM.class);
|
||||
viewModel.post(MUTE, accountAcct == null ? account.getUsername() + "@" + account.getHost() : accountAcct, null).observe(ShowAccountActivity.this, apiResponse -> manageVIewPostActions(MUTE, apiResponse));
|
||||
} else if (item.getItemId() == R.id.action_report) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(ShowAccountActivity.this);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(ShowAccountActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
LayoutInflater inflater1 = getLayoutInflater();
|
||||
View dialogView = inflater1.inflate(R.layout.popup_report_peertube, new LinearLayout(ShowAccountActivity.this), false);
|
||||
dialogBuilder.setView(dialogView);
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ public class ShowChannelActivity extends BaseBarActivity {
|
|||
PostActionsVM viewModel = new ViewModelProvider(ShowChannelActivity.this).get(PostActionsVM.class);
|
||||
viewModel.post(MUTE, channel.getOwnerAccount().getAcct(), null).observe(ShowChannelActivity.this, apiResponse -> manageVIewPostActions(MUTE, apiResponse));
|
||||
} else if (item.getItemId() == R.id.action_report) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(ShowChannelActivity.this);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(ShowChannelActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
LayoutInflater inflater1 = getLayoutInflater();
|
||||
View dialogView = inflater1.inflate(R.layout.popup_report_peertube, new LinearLayout(ShowChannelActivity.this), false);
|
||||
dialogBuilder.setView(dialogView);
|
||||
|
|
@ -265,7 +265,7 @@ public class ShowChannelActivity extends BaseBarActivity {
|
|||
} else if (doAction == action.UNFOLLOW) {
|
||||
boolean confirm_unfollow = sharedpreferences.getBoolean(Helper.SET_UNFOLLOW_VALIDATION, true);
|
||||
if (confirm_unfollow) {
|
||||
AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(ShowChannelActivity.this);
|
||||
AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(ShowChannelActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
unfollowConfirm.setTitle(getString(R.string.unfollow_confirm));
|
||||
unfollowConfirm.setMessage(channel.getAcct());
|
||||
unfollowConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ public class VideosTimelineActivity extends BaseBarActivity {
|
|||
finish();
|
||||
return true;
|
||||
} else if (item.getItemId() == R.id.action_delete) {
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(VideosTimelineActivity.this);
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(VideosTimelineActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
builder.setTitle(R.string.delete_history);
|
||||
builder.setMessage(R.string.delete_history_confirm);
|
||||
builder.setIcon(android.R.drawable.ic_dialog_alert)
|
||||
|
|
|
|||
|
|
@ -122,18 +122,6 @@ public interface PeertubeService {
|
|||
@Field("password") String password,
|
||||
@Field("externalAuthToken") String externalAuthToken);
|
||||
|
||||
@FormUrlEncoded
|
||||
@POST("users/token")
|
||||
Call<Token> otpConnetion(
|
||||
@Header("x-peertube-otp") String externalAuthToken,
|
||||
@Field("client_id") String client_id,
|
||||
@Field("client_secret") String client_secret,
|
||||
@Field("response_type") String response_type,
|
||||
@Field("grant_type") String grant_type,
|
||||
@Field("scope") String scope,
|
||||
@Field("username") String username,
|
||||
@Field("password") String password);
|
||||
|
||||
//TOKEN
|
||||
//Refresh
|
||||
@FormUrlEncoded
|
||||
|
|
|
|||
|
|
@ -33,9 +33,6 @@ import android.webkit.URLUtil;
|
|||
import androidx.documentfile.provider.DocumentFile;
|
||||
import androidx.preference.PreferenceManager;
|
||||
|
||||
import com.google.android.material.button.MaterialButton;
|
||||
import com.google.gson.JsonSyntaxException;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
|
|
@ -95,7 +92,6 @@ import app.fedilab.android.peertube.viewmodel.CommentVM;
|
|||
import app.fedilab.android.peertube.viewmodel.PlaylistsVM;
|
||||
import app.fedilab.android.peertube.viewmodel.TimelineVM;
|
||||
import app.fedilab.android.sqlite.Sqlite;
|
||||
import es.dmoral.toasty.Toasty;
|
||||
import okhttp3.MediaType;
|
||||
import okhttp3.MultipartBody;
|
||||
import okhttp3.OkHttpClient;
|
||||
|
|
@ -160,18 +156,7 @@ public class RetrofitPeertubeAPI {
|
|||
String instance = host;
|
||||
try {
|
||||
UserMe userMe = new RetrofitPeertubeAPI(activity, instance, token).verifyCredentials();
|
||||
if (userMe == null) {
|
||||
Handler mainHandler = new Handler(Looper.getMainLooper());
|
||||
Runnable myRunnable = () -> {
|
||||
MaterialButton login = activity.findViewById(R.id.login_button);
|
||||
if (login != null) {
|
||||
login.setEnabled(true);
|
||||
}
|
||||
Toasty.error(activity, activity.getString(R.string.toast_error_peertube_not_supported), Toasty.LENGTH_SHORT).show();
|
||||
};
|
||||
mainHandler.post(myRunnable);
|
||||
return;
|
||||
}
|
||||
|
||||
peertubeAccount = userMe.getAccount();
|
||||
} catch (Error error) {
|
||||
Error.displayError(activity, error);
|
||||
|
|
@ -267,9 +252,7 @@ public class RetrofitPeertubeAPI {
|
|||
public Token manageToken(OauthParams oauthParams) throws Error {
|
||||
PeertubeService peertubeService = init();
|
||||
Call<Token> refreshTokenCall = null;
|
||||
if (oauthParams.x_peertube_otp != null) {
|
||||
refreshTokenCall = peertubeService.otpConnetion(oauthParams.x_peertube_otp, oauthParams.getClient_id(), oauthParams.getClient_secret(), "code", oauthParams.getGrant_type(), "upload", oauthParams.getUsername(), oauthParams.getPassword());
|
||||
} else if (oauthParams.getGrant_type().compareTo("password") == 0) {
|
||||
if (oauthParams.getGrant_type().compareTo("password") == 0) {
|
||||
refreshTokenCall = peertubeService.createToken(oauthParams.getClient_id(), oauthParams.getClient_secret(), oauthParams.getGrant_type(), oauthParams.getUsername(), oauthParams.getPassword());
|
||||
} else if (oauthParams.getGrant_type().compareTo("refresh_token") == 0) {
|
||||
refreshTokenCall = peertubeService.refreshToken(oauthParams.getClient_id(), oauthParams.getClient_secret(), oauthParams.getRefresh_token(), oauthParams.getGrant_type());
|
||||
|
|
@ -1205,9 +1188,9 @@ public class RetrofitPeertubeAPI {
|
|||
}
|
||||
throw error;
|
||||
}
|
||||
} catch (IOException | JsonSyntaxException e) {
|
||||
} catch (IOException e) {
|
||||
Error error = new Error();
|
||||
error.setError(_context.getString(R.string.toast_error_peertube_not_supported));
|
||||
error.setError(_context.getString(R.string.toast_error));
|
||||
apiResponse.setError(error);
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,9 +44,6 @@ public class OauthParams {
|
|||
private String code;
|
||||
@SerializedName("redirect_uri")
|
||||
private String redirect_uri;
|
||||
@SerializedName("x_peertube_otp")
|
||||
public String x_peertube_otp;
|
||||
|
||||
|
||||
public String getClient_secret() {
|
||||
return client_secret;
|
||||
|
|
|
|||
|
|
@ -55,8 +55,8 @@ public class UserMe {
|
|||
private NotificationSettings notificationSettings;
|
||||
@SerializedName("nsfwPolicy")
|
||||
private String nsfwPolicy;
|
||||
/* @SerializedName("role")
|
||||
private Role role;*/
|
||||
@SerializedName("role")
|
||||
private Role role;
|
||||
@SerializedName("roleLabel")
|
||||
private String roleLabel;
|
||||
@SerializedName("username")
|
||||
|
|
@ -74,13 +74,13 @@ public class UserMe {
|
|||
@SerializedName("webTorrentEnabled")
|
||||
private boolean webTorrentEnabled;
|
||||
|
||||
/* public Role getRole() {
|
||||
public Role getRole() {
|
||||
return role;
|
||||
}
|
||||
|
||||
public void setRole(Role role) {
|
||||
this.role = role;
|
||||
}*/
|
||||
}
|
||||
|
||||
public PeertubeAccount getAccount() {
|
||||
return account;
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ package app.fedilab.android.peertube.drawer;
|
|||
|
||||
import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_INSTANCE;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.dialogStyle;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.app.Activity;
|
||||
|
|
@ -142,7 +143,7 @@ public class AboutInstanceAdapter extends RecyclerView.Adapter<RecyclerView.View
|
|||
popup.setOnMenuItemClickListener(item -> {
|
||||
int itemId = item.getItemId();
|
||||
if (itemId == R.id.action_delete) {
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context);
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context, dialogStyle());
|
||||
builder.setTitle(R.string.delete_instance);
|
||||
builder.setMessage(R.string.delete_instance_confirm);
|
||||
builder.setIcon(android.R.drawable.ic_dialog_alert)
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ package app.fedilab.android.peertube.drawer;
|
|||
|
||||
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_ID;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_INSTANCE;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.dialogStyle;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
|
|
@ -89,7 +90,7 @@ public class ChannelListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
|
|||
popup.setOnMenuItemClickListener(item -> {
|
||||
int itemId = item.getItemId();
|
||||
if (itemId == R.id.action_delete) {
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context);
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context, dialogStyle());
|
||||
builder.setTitle(context.getString(R.string.delete_channel) + ": " + channel.getName());
|
||||
builder.setMessage(context.getString(R.string.action_channel_confirm_delete));
|
||||
builder.setIcon(android.R.drawable.ic_dialog_alert)
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ package app.fedilab.android.peertube.drawer;
|
|||
* You should have received a copy of the GNU General Public License along with Fedilab; if not,
|
||||
* see <http://www.gnu.org/licenses>. */
|
||||
|
||||
|
||||
import static app.fedilab.android.mastodon.helper.Helper.dialogStyle;
|
||||
import static app.fedilab.android.peertube.client.RetrofitPeertubeAPI.ActionType.MUTE;
|
||||
import static app.fedilab.android.peertube.client.RetrofitPeertubeAPI.ActionType.REPLY;
|
||||
|
||||
|
|
@ -163,7 +163,7 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
|
|||
int itemId = item.getItemId();
|
||||
MaterialAlertDialogBuilder builder;
|
||||
if (itemId == R.id.action_delete) {
|
||||
builder = new MaterialAlertDialogBuilder(context);
|
||||
builder = new MaterialAlertDialogBuilder(context, dialogStyle());
|
||||
builder.setTitle(R.string.delete_comment);
|
||||
builder.setMessage(R.string.delete_comment_confirm);
|
||||
builder.setIcon(android.R.drawable.ic_dialog_alert)
|
||||
|
|
@ -196,7 +196,7 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
|
|||
allCommentRemoved.onAllCommentRemoved();
|
||||
}
|
||||
} else if (itemId == R.id.action_remove_comments) {
|
||||
builder = new MaterialAlertDialogBuilder(context);
|
||||
builder = new MaterialAlertDialogBuilder(context, dialogStyle());
|
||||
builder.setTitle(R.string.delete_account_comment);
|
||||
builder.setMessage(R.string.delete_account_comment_confirm);
|
||||
builder.setIcon(android.R.drawable.ic_dialog_alert)
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ package app.fedilab.android.peertube.drawer;
|
|||
* You should have received a copy of the GNU General Public License along with Fedilab; if not,
|
||||
* see <http://www.gnu.org/licenses>. */
|
||||
|
||||
|
||||
import static app.fedilab.android.mastodon.helper.Helper.dialogStyle;
|
||||
import static app.fedilab.android.peertube.client.RetrofitPeertubeAPI.ActionType.FOLLOW;
|
||||
import static app.fedilab.android.peertube.client.RetrofitPeertubeAPI.ActionType.UNFOLLOW;
|
||||
import static app.fedilab.android.peertube.viewmodel.TimelineVM.TimelineType.MY_VIDEOS;
|
||||
|
|
@ -229,7 +229,7 @@ public class PeertubeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
|
|||
popup.getMenu().findItem(R.id.action_follow).setTitle(context.getString(R.string.action_follow));
|
||||
boolean confirm_unfollow = sharedpreferences.getBoolean(Helper.SET_UNFOLLOW_VALIDATION, true);
|
||||
if (confirm_unfollow) {
|
||||
AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(context, dialogStyle());
|
||||
unfollowConfirm.setTitle(context.getString(R.string.unfollow_confirm));
|
||||
unfollowConfirm.setMessage(video.getChannel().getAcct());
|
||||
unfollowConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
|
||||
|
|
@ -259,7 +259,7 @@ public class PeertubeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
|
|||
intent.putExtras(b);
|
||||
context.startActivity(intent);
|
||||
} else if (itemId == R.id.action_report) {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(context, dialogStyle());
|
||||
LayoutInflater inflater1 = ((Activity) context).getLayoutInflater();
|
||||
View dialogView = inflater1.inflate(R.layout.popup_report_peertube, new LinearLayout(context), false);
|
||||
dialogBuilder.setView(dialogView);
|
||||
|
|
@ -323,7 +323,7 @@ public class PeertubeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
|
|||
return;
|
||||
}
|
||||
if (apiResponse.getPlaylists() != null && apiResponse.getPlaylists().size() > 0) {
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context, dialogStyle());
|
||||
builder.setTitle(R.string.modify_playlists);
|
||||
|
||||
List<PlaylistData.Playlist> ownerPlaylists = apiResponse.getPlaylists();
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ package app.fedilab.android.peertube.drawer;
|
|||
* see <http://www.gnu.org/licenses>. */
|
||||
|
||||
|
||||
|
||||
import static app.fedilab.android.mastodon.helper.Helper.dialogStyle;
|
||||
|
||||
import android.annotation.SuppressLint;
|
||||
import android.content.Context;
|
||||
|
|
@ -105,7 +105,7 @@ public class PlaylistAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
|
|||
popup.setOnMenuItemClickListener(item -> {
|
||||
int itemId = item.getItemId();
|
||||
if (itemId == R.id.action_delete) {
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context);
|
||||
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context, dialogStyle());
|
||||
builder.setTitle(context.getString(R.string.action_lists_delete) + ": " + playlist.getDisplayName());
|
||||
builder.setMessage(context.getString(R.string.action_lists_confirm_delete));
|
||||
builder.setIcon(android.R.drawable.ic_dialog_alert)
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ package app.fedilab.android.peertube.fragment;
|
|||
* You should have received a copy of the GNU General Public License along with Fedilab; if not,
|
||||
* see <http://www.gnu.org/licenses>. */
|
||||
|
||||
|
||||
import static app.fedilab.android.mastodon.helper.Helper.dialogStyle;
|
||||
import static app.fedilab.android.peertube.activities.PeertubeUploadActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE;
|
||||
|
||||
import android.Manifest;
|
||||
|
|
@ -230,7 +230,7 @@ public class DisplayChannelsFragment extends Fragment implements ChannelListAdap
|
|||
public void manageAlert(ChannelParams oldChannelValues) {
|
||||
|
||||
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(context);
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(context, dialogStyle());
|
||||
bindingDialog = AddChannelPeertubeBinding.inflate(LayoutInflater.from(context), null, false);
|
||||
dialogBuilder.setView(bindingDialog.getRoot());
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ package app.fedilab.android.peertube.fragment;
|
|||
* You should have received a copy of the GNU General Public License along with Fedilab; if not,
|
||||
* see <http://www.gnu.org/licenses>. */
|
||||
|
||||
|
||||
import static app.fedilab.android.mastodon.helper.Helper.dialogStyle;
|
||||
import static app.fedilab.android.peertube.client.RetrofitPeertubeAPI.DataType.MY_CHANNELS;
|
||||
import static app.fedilab.android.peertube.helper.Helper.peertubeInformation;
|
||||
|
||||
|
|
@ -103,7 +103,7 @@ public class DisplayPlaylistsFragment extends Fragment {
|
|||
}
|
||||
|
||||
binding.addNew.setOnClickListener(view -> {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(requireActivity());
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(requireActivity(), dialogStyle());
|
||||
bindingAlert = AddPlaylistPeertubeBinding.inflate(getLayoutInflater());
|
||||
dialogBuilder.setView(bindingAlert.getRoot());
|
||||
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ public class FragmentLoginPickInstancePeertube extends Fragment implements Insta
|
|||
itemsKeyLanguage = new String[languages.size()];
|
||||
|
||||
binding.pickupLanguages.setOnClickListener(v -> {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(requireContext());
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(requireContext(), app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
|
||||
int i = 0;
|
||||
if (languages.size() > 0) {
|
||||
|
|
@ -175,7 +175,7 @@ public class FragmentLoginPickInstancePeertube extends Fragment implements Insta
|
|||
|
||||
|
||||
binding.pickupCategories.setOnClickListener(v -> {
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(requireContext());
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(requireContext(), app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
int i = 0;
|
||||
if (categories.size() > 0) {
|
||||
Iterator<Map.Entry<Integer, String>> it = categories.entrySet().iterator();
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ public class PeertubeRegisterFragment extends Fragment {
|
|||
return;
|
||||
}
|
||||
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(requireContext());
|
||||
AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(requireContext(), app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
dialogBuilder.setCancelable(false);
|
||||
dialogBuilder.setPositiveButton(R.string.validate, (dialog, which) -> {
|
||||
dialog.dismiss();
|
||||
|
|
|
|||
|
|
@ -329,6 +329,18 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
|
|||
|
||||
//****** App theme *******
|
||||
final SharedPreferences sharedpref = PreferenceManager.getDefaultSharedPreferences(requireActivity());
|
||||
ListPreference SET_THEME_BASE = findPreference(getString(R.string.SET_THEME_BASE));
|
||||
if (SET_THEME_BASE != null) {
|
||||
SET_THEME_BASE.getContext().setTheme(app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
}
|
||||
ListPreference SET_THEME_DEFAULT_LIGHT = findPreference(getString(R.string.SET_THEME_DEFAULT_LIGHT));
|
||||
if (SET_THEME_DEFAULT_LIGHT != null) {
|
||||
SET_THEME_DEFAULT_LIGHT.getContext().setTheme(app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
}
|
||||
ListPreference SET_THEME_DEFAULT_DARK = findPreference(getString(R.string.SET_THEME_DEFAULT_DARK));
|
||||
if (SET_THEME_DEFAULT_DARK != null) {
|
||||
SET_THEME_DEFAULT_DARK.getContext().setTheme(app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
}
|
||||
|
||||
|
||||
//****** Video mode *******
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ package app.fedilab.android.peertube.helper;
|
|||
import static android.content.Context.DOWNLOAD_SERVICE;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_ID;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_INSTANCE;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_SOFTWARE;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_TOKEN;
|
||||
import static app.fedilab.android.mastodon.helper.Helper.dialogStyle;
|
||||
import static app.fedilab.android.peertube.activities.PeertubeMainActivity.typeOfConnection;
|
||||
|
||||
import android.Manifest;
|
||||
|
|
@ -53,8 +53,6 @@ import android.webkit.WebView;
|
|||
import android.widget.ImageView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
import androidx.core.app.ActivityCompat;
|
||||
import androidx.core.content.ContextCompat;
|
||||
|
|
@ -66,8 +64,6 @@ import com.bumptech.glide.RequestBuilder;
|
|||
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
|
||||
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
|
||||
import com.bumptech.glide.request.RequestOptions;
|
||||
import com.bumptech.glide.request.target.CustomTarget;
|
||||
import com.bumptech.glide.request.transition.Transition;
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
|
||||
import java.io.IOException;
|
||||
|
|
@ -382,36 +378,10 @@ public class Helper {
|
|||
}
|
||||
try {
|
||||
RequestBuilder<Drawable> requestBuilder = Glide.with(imageView.getContext())
|
||||
.load(url);
|
||||
.load(url)
|
||||
.thumbnail(0.1f);
|
||||
requestBuilder.apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(10)))
|
||||
.into(new CustomTarget<Drawable>() {
|
||||
@Override
|
||||
public void onResourceReady(@NonNull Drawable resource, Transition<? super Drawable> transition) {
|
||||
imageView.setImageDrawable(resource);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLoadFailed(@Nullable Drawable errorDrawable) {
|
||||
super.onLoadFailed(errorDrawable);
|
||||
BitmapDrawable avatar = new AvatarGenerator.AvatarBuilder(context)
|
||||
.setLabel(channel.getAcct())
|
||||
.setAvatarSize(120)
|
||||
.setTextSize(30)
|
||||
.toSquare()
|
||||
.setBackgroundColor(fetchAccentColor(context))
|
||||
.build();
|
||||
Glide.with(imageView.getContext())
|
||||
.asDrawable()
|
||||
.load(avatar)
|
||||
.apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(10)))
|
||||
.into(imageView);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLoadCleared(@Nullable Drawable placeholder) {
|
||||
|
||||
}
|
||||
});
|
||||
.into(imageView);
|
||||
} catch (Exception e) {
|
||||
try {
|
||||
BitmapDrawable avatar = new AvatarGenerator.AvatarBuilder(context)
|
||||
|
|
@ -458,27 +428,7 @@ public class Helper {
|
|||
} else {
|
||||
requestBuilder.apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(round)));
|
||||
}
|
||||
requestBuilder.into(new CustomTarget<Drawable>() {
|
||||
@Override
|
||||
public void onResourceReady(@NonNull Drawable resource, Transition<? super Drawable> transition) {
|
||||
imageView.setImageDrawable(resource);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLoadFailed(@Nullable Drawable errorDrawable) {
|
||||
super.onLoadFailed(errorDrawable);
|
||||
Glide.with(imageView.getContext())
|
||||
.asDrawable()
|
||||
.load(R.drawable.missing_peertube)
|
||||
.apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(10)))
|
||||
.into(imageView);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLoadCleared(@Nullable Drawable placeholder) {
|
||||
|
||||
}
|
||||
});
|
||||
requestBuilder.into(imageView);
|
||||
} catch (Exception e) {
|
||||
try {
|
||||
Glide.with(imageView.getContext())
|
||||
|
|
@ -554,7 +504,7 @@ public class Helper {
|
|||
* @param url String download url
|
||||
*/
|
||||
public static void manageDownloads(final Context context, final String url) {
|
||||
final AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
|
||||
final AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context, dialogStyle());
|
||||
final DownloadManager.Request request;
|
||||
try {
|
||||
request = new DownloadManager.Request(Uri.parse(url.trim()));
|
||||
|
|
@ -589,7 +539,7 @@ public class Helper {
|
|||
* @param currentAccount BaseAccount
|
||||
*/
|
||||
public static void logoutCurrentUser(Activity activity, BaseAccount currentAccount) {
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(activity);
|
||||
AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(activity, dialogStyle());
|
||||
alt_bld.setTitle(R.string.action_logout);
|
||||
if (currentAccount.mastodon_account != null && currentAccount.mastodon_account.username != null && currentAccount.instance != null) {
|
||||
alt_bld.setMessage(activity.getString(R.string.logout_account_confirmation, currentAccount.mastodon_account.username, currentAccount.instance));
|
||||
|
|
@ -625,7 +575,7 @@ public class Helper {
|
|||
editor.putString(CLIENT_SECRET, null);
|
||||
editor.putString(PREF_USER_ID, null);
|
||||
editor.putString(PREF_USER_INSTANCE, null);
|
||||
editor.putString(PREF_USER_SOFTWARE, null);
|
||||
// editor.putString(PREF_USER_SOFTWARE, null);
|
||||
editor.apply();
|
||||
Intent loginActivity = new Intent(activity, PeertubeMainActivity.class);
|
||||
activity.startActivity(loginActivity);
|
||||
|
|
@ -821,7 +771,7 @@ public class Helper {
|
|||
|
||||
public static void requestPermissionAndProceed(Activity activity, PermissionGranted permissionGranted) {
|
||||
if (Build.VERSION.SDK_INT >= 23) {
|
||||
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
|
||||
if (ContextCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(activity, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
|
||||
ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, app.fedilab.android.mastodon.helper.Helper.EXTERNAL_STORAGE_REQUEST_CODE_MEDIA_SAVE);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ public class SwitchAccountHelper {
|
|||
e.printStackTrace();
|
||||
}
|
||||
|
||||
AlertDialog.Builder builderSingle = new MaterialAlertDialogBuilder(activity);
|
||||
AlertDialog.Builder builderSingle = new MaterialAlertDialogBuilder(activity, app.fedilab.android.mastodon.helper.Helper.dialogStyle());
|
||||
builderSingle.setTitle(activity.getString(R.string.list_of_accounts));
|
||||
if (accounts != null) {
|
||||
final OwnAccountsAdapter accountsListAdapter = new OwnAccountsAdapter(activity, accounts);
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue