mirrors
/
Fedilab
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Changes

Browse Source
fix_reports
Thomas 2 years ago
parent f2799e939c
commit e9571221be
476 changed files with 1900 additions and 1924 deletions
Show Stats Download Patch File Download Diff File

9
app/build.gradle
Unescape View File

@ -63,6 +63,15 @@ android {
java.srcDirs = ['src/main/java', 'src/fdroid/java'] java.srcDirs = ['src/main/java', 'src/fdroid/java']
res.srcDirs = ['src/main/res', 'src/fdroid/res'] res.srcDirs = ['src/main/res', 'src/fdroid/res']
} }
main {
res.srcDirs = [
'src/main/res/layouts/mastodon',
'src/main/res/layouts/peertube',
' src/main/res/layouts',
'src/main/res'
]
}
} }
configurations { configurations {
all { all {

76
app/src/main/AndroidManifest.xml
Unescape View File

@ -168,49 +168,49 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".activities.StatusHistoryActivity" android:name=".mastodon.activities.StatusHistoryActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/status_history" android:label="@string/status_history"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
<activity <activity
android:name=".activities.ContextActivity" android:name=".mastodon.activities.ContextActivity"
android:configChanges="keyboardHidden|orientation|screenSize" /> android:configChanges="keyboardHidden|orientation|screenSize" />
<activity <activity
android:name=".activities.DraftActivity" android:name=".mastodon.activities.DraftActivity"
android:configChanges="keyboardHidden|orientation|screenSize" /> android:configChanges="keyboardHidden|orientation|screenSize" />
<activity <activity
android:name=".imageeditor.EditImageActivity" android:name=".mastodon.imageeditor.EditImageActivity"
android:configChanges="keyboardHidden|orientation|screenSize" /> android:configChanges="keyboardHidden|orientation|screenSize" />
<activity <activity
android:name=".activities.ComposeActivity" android:name=".mastodon.activities.ComposeActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="@string/compose" /> android:label="@string/compose" />
<activity <activity
android:name=".activities.StatusInfoActivity" android:name=".mastodon.activities.StatusInfoActivity"
android:configChanges="keyboardHidden|orientation|screenSize" /> android:configChanges="keyboardHidden|orientation|screenSize" />
<activity <activity
android:name=".activities.FollowRequestActivity" android:name=".mastodon.activities.FollowRequestActivity"
android:configChanges="keyboardHidden|orientation|screenSize" /> android:configChanges="keyboardHidden|orientation|screenSize" />
<activity <activity
android:name=".activities.ProfileActivity" android:name=".mastodon.activities.ProfileActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/account" /> android:label="@string/account" />
<activity <activity
android:name=".activities.admin.AdminAccountActivity" android:name=".mastodon.activities.admin.AdminAccountActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/account" /> android:label="@string/account" />
<activity <activity
android:name=".activities.AccountReportActivity" android:name=".mastodon.activities.AccountReportActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/account" android:label="@string/account"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
<activity <activity
android:name=".activities.admin.AdminReportActivity" android:name=".mastodon.activities.admin.AdminReportActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/report" android:label="@string/report"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
<activity <activity
android:name=".activities.ScheduledActivity" android:name=".mastodon.activities.ScheduledActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/scheduled" /> android:label="@string/scheduled" />
<activity <activity
@ -219,17 +219,17 @@
<activity <activity
android:name=".activities.SearchResultTabActivity" android:name=".mastodon.activities.SearchResultTabActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/search" android:label="@string/search"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
<activity <activity
android:name=".activities.TrendsActivity" android:name=".mastodon.activities.TrendsActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/trending" android:label="@string/trending"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
<activity <activity
android:name=".activities.ReorderTimelinesActivity" android:name=".mastodon.activities.ReorderTimelinesActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/reorder_timelines" android:label="@string/reorder_timelines"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
@ -240,102 +240,102 @@
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
<activity <activity
android:name=".activities.admin.AdminDomainBlockActivity" android:name=".mastodon.activities.admin.AdminDomainBlockActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/blocked_domains" android:label="@string/blocked_domains"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
<activity <activity
android:name=".activities.SuggestionActivity" android:name=".mastodon.activities.SuggestionActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/Suggestions" android:label="@string/Suggestions"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
<activity <activity
android:name=".activities.DirectoryActivity" android:name=".mastodon.activities.DirectoryActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/Directory" android:label="@string/Directory"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
<activity <activity
android:name=".activities.PartnerShipActivity" android:name=".mastodon.activities.PartnerShipActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/action_about" android:label="@string/action_about"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
<activity <activity
android:name=".activities.ActionActivity" android:name=".mastodon.activities.ActionActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/interactions" android:label="@string/interactions"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
<activity <activity
android:name=".activities.admin.AdminActionActivity" android:name=".mastodon.activities.admin.AdminActionActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/administration" android:label="@string/administration"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
<activity <activity
android:name=".activities.MastodonListActivity" android:name=".mastodon.activities.MastodonListActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/action_lists" android:label="@string/action_lists"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
<activity <activity
android:name=".activities.FollowedTagActivity" android:name=".mastodon.activities.FollowedTagActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/followed_tags" android:label="@string/followed_tags"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
<activity <activity
android:name=".activities.SettingsActivity" android:name=".mastodon.activities.SettingsActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/settings" android:label="@string/settings"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
<activity <activity
android:name=".activities.InstanceActivity" android:name=".mastodon.activities.InstanceActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/action_about_instance" android:label="@string/action_about_instance"
android:theme="@style/AppThemeAlertDialog" /> android:theme="@style/AppThemeAlertDialog" />
<activity <activity
android:name=".activities.InstanceProfileActivity" android:name=".mastodon.activities.InstanceProfileActivity"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:theme="@style/AppThemeAlertDialog" /> android:theme="@style/AppThemeAlertDialog" />
<activity <activity
android:name=".activities.ProxyActivity" android:name=".mastodon.activities.ProxyActivity"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:theme="@style/AppThemeAlertDialog" /> android:theme="@style/AppThemeAlertDialog" />
<activity <activity
android:name=".activities.HashTagActivity" android:name=".mastodon.activities.HashTagActivity"
android:configChanges="keyboardHidden|orientation|screenSize" /> android:configChanges="keyboardHidden|orientation|screenSize" />
<activity <activity
android:name=".activities.AnnouncementActivity" android:name=".mastodon.activities.AnnouncementActivity"
android:configChanges="keyboardHidden|orientation|screenSize" /> android:configChanges="keyboardHidden|orientation|screenSize" />
<activity <activity
android:name=".activities.MediaActivity" android:name=".mastodon.activities.MediaActivity"
android:configChanges="keyboardHidden|orientation|screenSize" android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@style/Transparent" /> android:theme="@style/Transparent" />
<activity <activity
android:name=".activities.InstanceHealthActivity" android:name=".mastodon.activities.InstanceHealthActivity"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:theme="@style/AppThemeAlertDialog" /> android:theme="@style/AppThemeAlertDialog" />
<activity <activity
android:name=".activities.ReportActivity" android:name=".mastodon.activities.ReportActivity"
android:theme="@style/AppThemeBar" android:theme="@style/AppThemeBar"
android:windowSoftInputMode="stateVisible" /> android:windowSoftInputMode="stateVisible" />
<activity <activity
android:name=".activities.CustomSharingActivity" android:name=".mastodon.activities.CustomSharingActivity"
android:label="@string/settings_title_custom_sharing" android:label="@string/settings_title_custom_sharing"
android:theme="@style/AppThemeBar" android:theme="@style/AppThemeBar"
android:windowSoftInputMode="stateVisible" /> android:windowSoftInputMode="stateVisible" />
<activity <activity
android:name=".activities.FilterActivity" android:name=".mastodon.activities.FilterActivity"
android:label="@string/filters" android:label="@string/filters"
android:theme="@style/AppThemeBar" android:theme="@style/AppThemeBar"
android:windowSoftInputMode="stateVisible" /> android:windowSoftInputMode="stateVisible" />
<activity <activity
android:name=".activities.EditProfileActivity" android:name=".mastodon.activities.EditProfileActivity"
android:label="@string/edit_profile" android:label="@string/edit_profile"
android:theme="@style/AppThemeBar" android:theme="@style/AppThemeBar"
android:windowSoftInputMode="stateVisible" /> android:windowSoftInputMode="stateVisible" />
<activity <activity
android:name=".activities.CacheActivity" android:name=".mastodon.activities.CacheActivity"
android:label="@string/action_cache" android:label="@string/action_cache"
android:theme="@style/AppThemeBar" /> android:theme="@style/AppThemeBar" />
@ -350,7 +350,7 @@
</provider> </provider>
<receiver <receiver
android:name=".broadcastreceiver.ToastMessage" android:name=".mastodon.broadcastreceiver.ToastMessage"
android:exported="false"> android:exported="false">
<intent-filter> <intent-filter>
<action android:name="RECEIVE_TOAST_MESSAGE" /> <action android:name="RECEIVE_TOAST_MESSAGE" />
@ -358,7 +358,7 @@
</receiver> </receiver>
<receiver <receiver
android:name=".services.CustomReceiver" android:name=".mastodon.services.CustomReceiver"
android:enabled="true" android:enabled="true"
android:exported="true"> android:exported="true">
<intent-filter> <intent-filter>

140
app/src/main/java/app/fedilab/android/BaseMainActivity.java
Unescape View File

@ -16,10 +16,10 @@ package app.fedilab.android;
import static app.fedilab.android.BaseMainActivity.status.DISCONNECTED; import static app.fedilab.android.BaseMainActivity.status.DISCONNECTED;
import static app.fedilab.android.BaseMainActivity.status.UNKNOWN; import static app.fedilab.android.BaseMainActivity.status.UNKNOWN;
import static app.fedilab.android.helper.CacheHelper.deleteDir; import static app.fedilab.android.mastodon.helper.CacheHelper.deleteDir;
import static app.fedilab.android.helper.Helper.PREF_USER_TOKEN; import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_TOKEN;
import static app.fedilab.android.helper.Helper.displayReleaseNotesIfNeeded; import static app.fedilab.android.mastodon.helper.Helper.displayReleaseNotesIfNeeded;
import static app.fedilab.android.ui.drawer.StatusAdapter.sendAction; import static app.fedilab.android.mastodon.ui.drawer.StatusAdapter.sendAction;
import android.Manifest; import android.Manifest;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
@ -104,69 +104,69 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import app.fedilab.android.activities.AboutActivity; import app.fedilab.android.activities.AboutActivity;
import app.fedilab.android.activities.ActionActivity;
import app.fedilab.android.activities.AnnouncementActivity;
import app.fedilab.android.activities.BaseActivity;
import app.fedilab.android.activities.CacheActivity;
import app.fedilab.android.activities.ComposeActivity;
import app.fedilab.android.activities.ContextActivity;
import app.fedilab.android.activities.DirectoryActivity;
import app.fedilab.android.activities.DraftActivity;
import app.fedilab.android.activities.FilterActivity;
import app.fedilab.android.activities.FollowRequestActivity;
import app.fedilab.android.activities.FollowedTagActivity;
import app.fedilab.android.activities.InstanceActivity;
import app.fedilab.android.activities.InstanceHealthActivity;
import app.fedilab.android.activities.LoginActivity; import app.fedilab.android.activities.LoginActivity;
import app.fedilab.android.activities.MainActivity; import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.activities.MastodonListActivity;
import app.fedilab.android.activities.PartnerShipActivity;
import app.fedilab.android.activities.ProfileActivity;
import app.fedilab.android.activities.ProxyActivity;
import app.fedilab.android.activities.ReorderTimelinesActivity;
import app.fedilab.android.activities.ScheduledActivity;
import app.fedilab.android.activities.SearchResultTabActivity;
import app.fedilab.android.activities.SettingsActivity;
import app.fedilab.android.activities.SuggestionActivity;
import app.fedilab.android.activities.TrendsActivity;
import app.fedilab.android.activities.admin.AdminActionActivity;
import app.fedilab.android.broadcastreceiver.NetworkStateReceiver;
import app.fedilab.android.client.endpoints.MastodonAccountsService;
import app.fedilab.android.client.entities.api.Emoji;
import app.fedilab.android.client.entities.api.EmojiInstance;
import app.fedilab.android.client.entities.api.Filter;
import app.fedilab.android.client.entities.api.Instance;
import app.fedilab.android.client.entities.api.MastodonList;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.api.Tag;
import app.fedilab.android.client.entities.app.Account;
import app.fedilab.android.client.entities.app.BaseAccount;
import app.fedilab.android.client.entities.app.BottomMenu;
import app.fedilab.android.client.entities.app.MutedAccounts;
import app.fedilab.android.client.entities.app.Pinned;
import app.fedilab.android.client.entities.app.PinnedTimeline;
import app.fedilab.android.client.entities.app.StatusCache;
import app.fedilab.android.client.entities.app.StatusDraft;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.ActivityMainBinding; import app.fedilab.android.databinding.ActivityMainBinding;
import app.fedilab.android.databinding.NavHeaderMainBinding; import app.fedilab.android.databinding.NavHeaderMainBinding;
import app.fedilab.android.exception.DBException; import app.fedilab.android.mastodon.activities.ActionActivity;
import app.fedilab.android.helper.CrossActionHelper; import app.fedilab.android.mastodon.activities.AnnouncementActivity;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.activities.BaseActivity;
import app.fedilab.android.helper.MastodonHelper; import app.fedilab.android.mastodon.activities.CacheActivity;
import app.fedilab.android.helper.PinnedTimelineHelper; import app.fedilab.android.mastodon.activities.ComposeActivity;
import app.fedilab.android.helper.PushHelper; import app.fedilab.android.mastodon.activities.ContextActivity;
import app.fedilab.android.ui.drawer.AccountsSearchTopBarAdapter; import app.fedilab.android.mastodon.activities.DirectoryActivity;
import app.fedilab.android.ui.drawer.TagSearchTopBarAdapter; import app.fedilab.android.mastodon.activities.DraftActivity;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonConversation; import app.fedilab.android.mastodon.activities.FilterActivity;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline; import app.fedilab.android.mastodon.activities.FollowRequestActivity;
import app.fedilab.android.ui.fragment.timeline.FragmentNotificationContainer; import app.fedilab.android.mastodon.activities.FollowedTagActivity;
import app.fedilab.android.viewmodel.mastodon.AccountsVM; import app.fedilab.android.mastodon.activities.InstanceActivity;
import app.fedilab.android.viewmodel.mastodon.FiltersVM; import app.fedilab.android.mastodon.activities.InstanceHealthActivity;
import app.fedilab.android.viewmodel.mastodon.InstancesVM; import app.fedilab.android.mastodon.activities.MastodonListActivity;
import app.fedilab.android.viewmodel.mastodon.SearchVM; import app.fedilab.android.mastodon.activities.PartnerShipActivity;
import app.fedilab.android.viewmodel.mastodon.TimelinesVM; import app.fedilab.android.mastodon.activities.ProfileActivity;
import app.fedilab.android.viewmodel.mastodon.TopBarVM; import app.fedilab.android.mastodon.activities.ProxyActivity;
import app.fedilab.android.mastodon.activities.ReorderTimelinesActivity;
import app.fedilab.android.mastodon.activities.ScheduledActivity;
import app.fedilab.android.mastodon.activities.SearchResultTabActivity;
import app.fedilab.android.mastodon.activities.SettingsActivity;
import app.fedilab.android.mastodon.activities.SuggestionActivity;
import app.fedilab.android.mastodon.activities.TrendsActivity;
import app.fedilab.android.mastodon.activities.admin.AdminActionActivity;
import app.fedilab.android.mastodon.broadcastreceiver.NetworkStateReceiver;
import app.fedilab.android.mastodon.client.endpoints.MastodonAccountsService;
import app.fedilab.android.mastodon.client.entities.api.Emoji;
import app.fedilab.android.mastodon.client.entities.api.EmojiInstance;
import app.fedilab.android.mastodon.client.entities.api.Filter;
import app.fedilab.android.mastodon.client.entities.api.Instance;
import app.fedilab.android.mastodon.client.entities.api.MastodonList;
import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.mastodon.client.entities.api.Tag;
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.BottomMenu;
import app.fedilab.android.mastodon.client.entities.app.MutedAccounts;
import app.fedilab.android.mastodon.client.entities.app.Pinned;
import app.fedilab.android.mastodon.client.entities.app.PinnedTimeline;
import app.fedilab.android.mastodon.client.entities.app.StatusCache;
import app.fedilab.android.mastodon.client.entities.app.StatusDraft;
import app.fedilab.android.mastodon.client.entities.app.Timeline;
import app.fedilab.android.mastodon.exception.DBException;
import app.fedilab.android.mastodon.helper.CrossActionHelper;
import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.helper.MastodonHelper;
import app.fedilab.android.mastodon.helper.PinnedTimelineHelper;
import app.fedilab.android.mastodon.helper.PushHelper;
import app.fedilab.android.mastodon.ui.drawer.AccountsSearchTopBarAdapter;
import app.fedilab.android.mastodon.ui.drawer.TagSearchTopBarAdapter;
import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonConversation;
import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTimeline;
import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentNotificationContainer;
import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.FiltersVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.InstancesVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.SearchVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.TimelinesVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.TopBarVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
import okhttp3.Call; import okhttp3.Call;
import okhttp3.Callback; import okhttp3.Callback;
@ -186,7 +186,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
public static status networkAvailable = UNKNOWN; public static status networkAvailable = UNKNOWN;
public static Instance instanceInfo; public static Instance instanceInfo;
public static List<Filter> mainFilters; public static List<Filter> mainFilters;
public static List<app.fedilab.android.client.entities.api.Account> filteredAccounts; public static List<app.fedilab.android.mastodon.client.entities.api.Account> filteredAccounts;
public static boolean filterFetched; public static boolean filterFetched;
public static boolean show_boosts, show_replies, show_dms, show_art_nsfw; public static boolean show_boosts, show_replies, show_dms, show_art_nsfw;
public static String regex_home, regex_local, regex_public; public static String regex_home, regex_local, regex_public;
@ -615,10 +615,10 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
.client(okHttpClient) .client(okHttpClient)
.build(); .build();
MastodonAccountsService mastodonAccountsService = retrofit.create(MastodonAccountsService.class); MastodonAccountsService mastodonAccountsService = retrofit.create(MastodonAccountsService.class);
retrofit2.Call<app.fedilab.android.client.entities.api.Account> accountCall = mastodonAccountsService.verify_credentials(MainActivity.currentToken); retrofit2.Call<app.fedilab.android.mastodon.client.entities.api.Account> accountCall = mastodonAccountsService.verify_credentials(MainActivity.currentToken);
if (accountCall != null) { if (accountCall != null) {
try { try {
retrofit2.Response<app.fedilab.android.client.entities.api.Account> accountResponse = accountCall.execute(); retrofit2.Response<app.fedilab.android.mastodon.client.entities.api.Account> accountResponse = accountCall.execute();
if (accountResponse.isSuccessful()) { if (accountResponse.isSuccessful()) {
currentAccount.mastodon_account = accountResponse.body(); currentAccount.mastodon_account = accountResponse.body();
} }
@ -818,7 +818,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
binding.toolbarSearch.setSuggestionsAdapter(cursorAdapter); binding.toolbarSearch.setSuggestionsAdapter(cursorAdapter);
new Thread(() -> { new Thread(() -> {
int i = 0; int i = 0;
for (app.fedilab.android.client.entities.api.Account account : accounts) { for (app.fedilab.android.mastodon.client.entities.api.Account account : accounts) {
FutureTarget<File> futureTarget = Glide FutureTarget<File> futureTarget = Glide
.with(BaseMainActivity.this.getApplicationContext()) .with(BaseMainActivity.this.getApplicationContext())
.load(account.avatar_static) .load(account.avatar_static)
@ -1047,7 +1047,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
} }
@Override @Override
public void federatedAccount(app.fedilab.android.client.entities.api.Account account) { public void federatedAccount(app.fedilab.android.mastodon.client.entities.api.Account account) {
} }
}); });
@ -1281,7 +1281,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
} }
@Override @Override
public void federatedAccount(app.fedilab.android.client.entities.api.Account account) { public void federatedAccount(app.fedilab.android.mastodon.client.entities.api.Account account) {
} }
}); });
} else {//It's an account } else {//It's an account
@ -1291,7 +1291,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
} }
@Override @Override
public void federatedAccount(app.fedilab.android.client.entities.api.Account account) { public void federatedAccount(app.fedilab.android.mastodon.client.entities.api.Account account) {
if (account != null) { if (account != null) {
Intent intent = new Intent(BaseMainActivity.this, ProfileActivity.class); Intent intent = new Intent(BaseMainActivity.this, ProfileActivity.class);
Bundle b = new Bundle(); Bundle b = new Bundle();

3
app/src/main/java/app/fedilab/android/MainApplication.java
Unescape View File

@ -33,7 +33,7 @@ import org.acra.config.DialogConfigurationBuilder;
import org.acra.config.MailSenderConfigurationBuilder; import org.acra.config.MailSenderConfigurationBuilder;
import org.acra.data.StringFormat; import org.acra.data.StringFormat;
import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.mastodon.helper.ThemeHelper;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
@ -42,6 +42,7 @@ public class MainApplication extends MultiDexApplication {
private static MainApplication app; private static MainApplication app;
private WebView webView; private WebView webView;
public static MainApplication getApp() { public static MainApplication getApp() {
return app; return app;
} }

14
app/src/main/java/app/fedilab/android/activities/AboutActivity.java
Unescape View File

@ -31,13 +31,15 @@ import java.util.List;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.BuildConfig; import app.fedilab.android.BuildConfig;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.databinding.ActivityAboutBinding; import app.fedilab.android.databinding.ActivityAboutBinding;
import app.fedilab.android.helper.CrossActionHelper; import app.fedilab.android.mastodon.activities.BaseBarActivity;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.activities.ProfileActivity;
import app.fedilab.android.helper.MastodonHelper; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.viewmodel.mastodon.AccountsVM; import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.mastodon.helper.CrossActionHelper;
import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.helper.MastodonHelper;
import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
public class AboutActivity extends BaseBarActivity { public class AboutActivity extends BaseBarActivity {

24
app/src/main/java/app/fedilab/android/activities/LoginActivity.java
Unescape View File

@ -15,9 +15,6 @@ package app.fedilab.android.activities;
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
import static app.fedilab.android.helper.Helper.PREF_USER_TOKEN;
import static app.fedilab.android.helper.MastodonHelper.REDIRECT_CONTENT_WEB;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
@ -39,13 +36,16 @@ import java.util.regex.Matcher;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.app.Account; import app.fedilab.android.mastodon.activities.BaseActivity;
import app.fedilab.android.exception.DBException; import app.fedilab.android.mastodon.activities.ProxyActivity;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.app.Account;
import app.fedilab.android.ui.fragment.login.FragmentLoginMain; import app.fedilab.android.mastodon.exception.DBException;
import app.fedilab.android.viewmodel.mastodon.AccountsVM; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.viewmodel.mastodon.AdminVM; import app.fedilab.android.mastodon.helper.MastodonHelper;
import app.fedilab.android.viewmodel.mastodon.OauthVM; import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.AdminVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.OauthVM;
import app.fedilab.android.ui.fragment.FragmentLoginMain;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
@ -69,7 +69,7 @@ public class LoginActivity extends BaseActivity {
BaseMainActivity.api = Account.API.MASTODON; BaseMainActivity.api = Account.API.MASTODON;
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(activity); SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(activity);
SharedPreferences.Editor editor = sharedpreferences.edit(); SharedPreferences.Editor editor = sharedpreferences.edit();
editor.putString(PREF_USER_TOKEN, account.token); editor.putString(Helper.PREF_USER_TOKEN, account.token);
editor.commit(); editor.commit();
//The user is now authenticated, it will be redirected to MainActivity //The user is now authenticated, it will be redirected to MainActivity
Runnable myRunnable = () -> { Runnable myRunnable = () -> {
@ -86,7 +86,7 @@ public class LoginActivity extends BaseActivity {
private void manageItent(Intent intent) { private void manageItent(Intent intent) {
if (intent != null && intent.getData() != null && intent.getData().toString().contains(REDIRECT_CONTENT_WEB + "?code=")) { if (intent != null && intent.getData() != null && intent.getData().toString().contains(MastodonHelper.REDIRECT_CONTENT_WEB + "?code=")) {
String url = intent.getData().toString(); String url = intent.getData().toString();
Matcher matcher = Helper.codePattern.matcher(url); Matcher matcher = Helper.codePattern.matcher(url);
if (!matcher.find()) { if (!matcher.find()) {

17
app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/AccountReportActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -29,14 +29,15 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import java.util.ArrayList; import java.util.ArrayList;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Status; import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.client.entities.api.admin.AdminAccount;
import app.fedilab.android.client.entities.api.admin.AdminReport;
import app.fedilab.android.databinding.ActivityAdminReportBinding; import app.fedilab.android.databinding.ActivityAdminReportBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.mastodon.client.entities.api.admin.AdminAccount;
import app.fedilab.android.ui.drawer.StatusReportAdapter; import app.fedilab.android.mastodon.client.entities.api.admin.AdminReport;
import app.fedilab.android.viewmodel.mastodon.AdminVM; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.helper.ThemeHelper;
import app.fedilab.android.mastodon.ui.drawer.StatusReportAdapter;
import app.fedilab.android.mastodon.viewmodel.mastodon.AdminVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
public class AccountReportActivity extends BaseBarActivity { public class AccountReportActivity extends BaseBarActivity {

14
app/src/main/java/app/fedilab/android/activities/ActionActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/ActionActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -22,13 +22,13 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.ActivityActionsBinding; import app.fedilab.android.databinding.ActivityActionsBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.app.Timeline;
import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonAccount; import app.fedilab.android.mastodon.helper.ThemeHelper;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonDomainBlock; import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonAccount;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline; import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonDomainBlock;
import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTimeline;
public class ActionActivity extends BaseBarActivity { public class ActionActivity extends BaseBarActivity {

10
app/src/main/java/app/fedilab/android/activities/AnnouncementActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/AnnouncementActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -27,11 +27,11 @@ import androidx.appcompat.app.ActionBar;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.EmojiInstance;
import app.fedilab.android.databinding.ActivityAnnouncementBinding; import app.fedilab.android.databinding.ActivityAnnouncementBinding;
import app.fedilab.android.exception.DBException; import app.fedilab.android.mastodon.client.entities.api.EmojiInstance;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.exception.DBException;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonAnnouncement; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonAnnouncement;
public class AnnouncementActivity extends BaseActivity { public class AnnouncementActivity extends BaseActivity {

6
app/src/main/java/app/fedilab/android/activities/BaseActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -34,8 +34,8 @@ import com.vanniktech.emoji.EmojiManager;
import com.vanniktech.emoji.one.EmojiOneProvider; import com.vanniktech.emoji.one.EmojiOneProvider;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.mastodon.helper.ThemeHelper;
@SuppressLint("Registered") @SuppressLint("Registered")

6
app/src/main/java/app/fedilab/android/activities/BaseAlertDialogActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/BaseAlertDialogActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -34,8 +34,8 @@ import com.vanniktech.emoji.EmojiManager;
import com.vanniktech.emoji.one.EmojiOneProvider; import com.vanniktech.emoji.one.EmojiOneProvider;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.mastodon.helper.ThemeHelper;
@SuppressLint("Registered") @SuppressLint("Registered")

6
app/src/main/java/app/fedilab/android/activities/BaseBarActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/BaseBarActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -34,8 +34,8 @@ import com.vanniktech.emoji.EmojiManager;
import com.vanniktech.emoji.one.EmojiOneProvider; import com.vanniktech.emoji.one.EmojiOneProvider;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.mastodon.helper.ThemeHelper;
@SuppressLint("Registered") @SuppressLint("Registered")

4
app/src/main/java/app/fedilab/android/activities/BaseFragmentActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/BaseFragmentActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -21,7 +21,7 @@ import androidx.fragment.app.FragmentActivity;
import com.vanniktech.emoji.EmojiManager; import com.vanniktech.emoji.EmojiManager;
import com.vanniktech.emoji.one.EmojiOneProvider; import com.vanniktech.emoji.one.EmojiOneProvider;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.helper.Helper;
@SuppressLint("Registered") @SuppressLint("Registered")

6
app/src/main/java/app/fedilab/android/activities/BaseTransparentActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/BaseTransparentActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -34,8 +34,8 @@ import com.vanniktech.emoji.EmojiManager;
import com.vanniktech.emoji.one.EmojiOneProvider; import com.vanniktech.emoji.one.EmojiOneProvider;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.mastodon.helper.ThemeHelper;
@SuppressLint("Registered") @SuppressLint("Registered")

20
app/src/main/java/app/fedilab/android/activities/CacheActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/CacheActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -33,16 +33,16 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.app.Account;
import app.fedilab.android.client.entities.app.BaseAccount;
import app.fedilab.android.client.entities.app.CacheAccount;
import app.fedilab.android.client.entities.app.StatusCache;
import app.fedilab.android.client.entities.app.StatusDraft;
import app.fedilab.android.databinding.ActivityCacheBinding; import app.fedilab.android.databinding.ActivityCacheBinding;
import app.fedilab.android.exception.DBException; import app.fedilab.android.mastodon.client.entities.app.Account;
import app.fedilab.android.helper.CacheHelper; import app.fedilab.android.mastodon.client.entities.app.BaseAccount;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.app.CacheAccount;
import app.fedilab.android.ui.drawer.CacheAdapter; import app.fedilab.android.mastodon.client.entities.app.StatusCache;
import app.fedilab.android.mastodon.client.entities.app.StatusDraft;
import app.fedilab.android.mastodon.exception.DBException;
import app.fedilab.android.mastodon.helper.CacheHelper;
import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.ui.drawer.CacheAdapter;
public class CacheActivity extends BaseBarActivity { public class CacheActivity extends BaseBarActivity {

67
app/src/main/java/app/fedilab/android/activities/ComposeActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -18,7 +18,6 @@ package app.fedilab.android.activities;
import static app.fedilab.android.BaseMainActivity.currentAccount; import static app.fedilab.android.BaseMainActivity.currentAccount;
import static app.fedilab.android.BaseMainActivity.currentInstance; import static app.fedilab.android.BaseMainActivity.currentInstance;
import static app.fedilab.android.BaseMainActivity.emojis; import static app.fedilab.android.BaseMainActivity.emojis;
import static app.fedilab.android.ui.drawer.ComposeAdapter.prepareDraft;
import android.Manifest; import android.Manifest;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
@ -72,30 +71,32 @@ import java.util.concurrent.TimeUnit;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Attachment; import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.client.entities.api.Context;
import app.fedilab.android.client.entities.api.EmojiInstance;
import app.fedilab.android.client.entities.api.Instance;
import app.fedilab.android.client.entities.api.Mention;
import app.fedilab.android.client.entities.api.ScheduledStatus;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.app.BaseAccount;
import app.fedilab.android.client.entities.app.StatusDraft;
import app.fedilab.android.databinding.ActivityPaginationBinding; import app.fedilab.android.databinding.ActivityPaginationBinding;
import app.fedilab.android.databinding.PopupContactBinding; import app.fedilab.android.databinding.PopupContactBinding;
import app.fedilab.android.exception.DBException; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.helper.DividerDecorationSimple; import app.fedilab.android.mastodon.client.entities.api.Attachment;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.Context;
import app.fedilab.android.helper.MastodonHelper; import app.fedilab.android.mastodon.client.entities.api.EmojiInstance;
import app.fedilab.android.helper.MediaHelper; import app.fedilab.android.mastodon.client.entities.api.Instance;
import app.fedilab.android.interfaces.OnDownloadInterface; import app.fedilab.android.mastodon.client.entities.api.Mention;
import app.fedilab.android.jobs.ComposeWorker; import app.fedilab.android.mastodon.client.entities.api.ScheduledStatus;
import app.fedilab.android.jobs.ScheduleThreadWorker; import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.services.ThreadMessageService; import app.fedilab.android.mastodon.client.entities.app.BaseAccount;
import app.fedilab.android.ui.drawer.AccountsReplyAdapter; import app.fedilab.android.mastodon.client.entities.app.StatusDraft;
import app.fedilab.android.ui.drawer.ComposeAdapter; import app.fedilab.android.mastodon.exception.DBException;
import app.fedilab.android.viewmodel.mastodon.AccountsVM; import app.fedilab.android.mastodon.helper.DividerDecorationSimple;
import app.fedilab.android.viewmodel.mastodon.StatusesVM; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.helper.MastodonHelper;
import app.fedilab.android.mastodon.helper.MediaHelper;
import app.fedilab.android.mastodon.interfaces.OnDownloadInterface;
import app.fedilab.android.mastodon.jobs.ComposeWorker;
import app.fedilab.android.mastodon.jobs.ScheduleThreadWorker;
import app.fedilab.android.mastodon.services.ThreadMessageService;
import app.fedilab.android.mastodon.ui.drawer.AccountsReplyAdapter;
import app.fedilab.android.mastodon.ui.drawer.ComposeAdapter;
import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.StatusesVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
public class ComposeActivity extends BaseActivity implements ComposeAdapter.ManageDrafts, AccountsReplyAdapter.ActionDone, ComposeAdapter.promptDraftListener { public class ComposeActivity extends BaseActivity implements ComposeAdapter.ManageDrafts, AccountsReplyAdapter.ActionDone, ComposeAdapter.promptDraftListener {
@ -145,9 +146,9 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
private Uri photoFileUri; private Uri photoFileUri;
private ScheduledStatus scheduledStatus; private ScheduledStatus scheduledStatus;
private String visibility; private String visibility;
private app.fedilab.android.client.entities.api.Account accountMention; private Account accountMention;
private String statusReplyId; private String statusReplyId;
private app.fedilab.android.client.entities.api.Account mentionBooster; private Account mentionBooster;
private String sharedSubject, sharedContent, sharedTitle, sharedDescription, shareURL, sharedUrlMedia; private String sharedSubject, sharedContent, sharedTitle, sharedDescription, shareURL, sharedUrlMedia;
private String editMessageId; private String editMessageId;
@ -210,7 +211,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
private void storeDraftWarning() { private void storeDraftWarning() {
if (statusDraft == null) { if (statusDraft == null) {
statusDraft = prepareDraft(statusList, composeAdapter, account.instance, account.user_id); statusDraft = ComposeAdapter.prepareDraft(statusList, composeAdapter, account.instance, account.user_id);
} }
if (canBeSent(statusDraft)) { if (canBeSent(statusDraft)) {
if (promptSaveDraft) { if (promptSaveDraft) {
@ -391,7 +392,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
} }
} else if (item.getItemId() == R.id.action_schedule) { } else if (item.getItemId() == R.id.action_schedule) {
if (statusDraft == null) { if (statusDraft == null) {
statusDraft = prepareDraft(statusList, composeAdapter, account.instance, account.user_id); statusDraft = ComposeAdapter.prepareDraft(statusList, composeAdapter, account.instance, account.user_id);
} }
if (canBeSent(statusDraft)) { if (canBeSent(statusDraft)) {
MediaHelper.scheduleMessage(ComposeActivity.this, date -> storeDraft(true, date)); MediaHelper.scheduleMessage(ComposeActivity.this, date -> storeDraft(true, date));
@ -402,14 +403,14 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
return true; return true;
} }
private void onRetrieveContact(PopupContactBinding popupContactBinding, List<app.fedilab.android.client.entities.api.Account> accounts) { private void onRetrieveContact(PopupContactBinding popupContactBinding, List<Account> accounts) {
popupContactBinding.loader.setVisibility(View.GONE); popupContactBinding.loader.setVisibility(View.GONE);
if (accounts == null) { if (accounts == null) {
accounts = new ArrayList<>(); accounts = new ArrayList<>();
} }
List<Boolean> checkedValues = new ArrayList<>(); List<Boolean> checkedValues = new ArrayList<>();
List<app.fedilab.android.client.entities.api.Account> contacts = new ArrayList<>(accounts); List<Account> contacts = new ArrayList<>(accounts);
for (app.fedilab.android.client.entities.api.Account account : contacts) { for (Account account : contacts) {
checkedValues.add(composeAdapter.getLastComposeContent().contains("@" + account.acct)); checkedValues.add(composeAdapter.getLastComposeContent().contains("@" + account.acct));
} }
AccountsReplyAdapter contactAdapter = new AccountsReplyAdapter(contacts, checkedValues); AccountsReplyAdapter contactAdapter = new AccountsReplyAdapter(contacts, checkedValues);
@ -480,8 +481,8 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
} else if (visibility == null && currentAccount != null && currentAccount.mastodon_account != null && currentAccount.mastodon_account.source != null) { } else if (visibility == null && currentAccount != null && currentAccount.mastodon_account != null && currentAccount.mastodon_account.source != null) {
visibility = currentAccount.mastodon_account.source.privacy; visibility = currentAccount.mastodon_account.source.privacy;
} }
mentionBooster = (app.fedilab.android.client.entities.api.Account) b.getSerializable(Helper.ARG_MENTION_BOOSTER); mentionBooster = (Account) b.getSerializable(Helper.ARG_MENTION_BOOSTER);
accountMention = (app.fedilab.android.client.entities.api.Account) b.getSerializable(Helper.ARG_ACCOUNT_MENTION); accountMention = (Account) b.getSerializable(Helper.ARG_ACCOUNT_MENTION);
//Shared elements //Shared elements
sharedAttachments = (ArrayList<Attachment>) b.getSerializable(Helper.ARG_MEDIA_ATTACHMENTS); sharedAttachments = (ArrayList<Attachment>) b.getSerializable(Helper.ARG_MEDIA_ATTACHMENTS);
sharedUrlMedia = b.getString(Helper.ARG_SHARE_URL_MEDIA); sharedUrlMedia = b.getString(Helper.ARG_SHARE_URL_MEDIA);

21
app/src/main/java/app/fedilab/android/activities/ContextActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/ContextActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -16,7 +16,6 @@ package app.fedilab.android.activities;
import static app.fedilab.android.BaseMainActivity.currentAccount; import static app.fedilab.android.BaseMainActivity.currentAccount;
import static app.fedilab.android.ui.drawer.StatusAdapter.sendAction;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@ -41,14 +40,16 @@ import java.util.regex.Pattern;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Status; import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.client.entities.app.StatusCache;
import app.fedilab.android.databinding.ActivityConversationBinding; import app.fedilab.android.databinding.ActivityConversationBinding;
import app.fedilab.android.exception.DBException; import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.app.StatusCache;
import app.fedilab.android.helper.MastodonHelper; import app.fedilab.android.mastodon.exception.DBException;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonContext; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.viewmodel.mastodon.StatusesVM; import app.fedilab.android.mastodon.helper.MastodonHelper;
import app.fedilab.android.mastodon.ui.drawer.StatusAdapter;
import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonContext;
import app.fedilab.android.mastodon.viewmodel.mastodon.StatusesVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
public class ContextActivity extends BaseActivity implements FragmentMastodonContext.FirstMessage { public class ContextActivity extends BaseActivity implements FragmentMastodonContext.FirstMessage {
@ -114,7 +115,7 @@ public class ContextActivity extends BaseActivity implements FragmentMastodonCon
new StatusCache(getApplication()).updateIfExists(statusCache); new StatusCache(getApplication()).updateIfExists(statusCache);
Handler mainHandler = new Handler(Looper.getMainLooper()); Handler mainHandler = new Handler(Looper.getMainLooper());
//Update UI //Update UI
Runnable myRunnable = () -> sendAction(ContextActivity.this, Helper.ARG_STATUS_ACTION, status, null); Runnable myRunnable = () -> StatusAdapter.sendAction(ContextActivity.this, Helper.ARG_STATUS_ACTION, status, null);
mainHandler.post(myRunnable); mainHandler.post(myRunnable);
} catch (DBException e) { } catch (DBException e) {
e.printStackTrace(); e.printStackTrace();

18
app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/CustomSharingActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -31,15 +31,15 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Attachment;
import app.fedilab.android.client.entities.api.Emoji;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.api.Tag;
import app.fedilab.android.databinding.ActivityCustomSharingBinding; import app.fedilab.android.databinding.ActivityCustomSharingBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.Attachment;
import app.fedilab.android.helper.customsharing.CustomSharingAsyncTask; import app.fedilab.android.mastodon.client.entities.api.Emoji;
import app.fedilab.android.helper.customsharing.CustomSharingResponse; import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.helper.customsharing.OnCustomSharingInterface; import app.fedilab.android.mastodon.client.entities.api.Tag;
import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.helper.customsharing.CustomSharingAsyncTask;
import app.fedilab.android.mastodon.helper.customsharing.CustomSharingResponse;
import app.fedilab.android.mastodon.helper.customsharing.OnCustomSharingInterface;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;

8
app/src/main/java/app/fedilab/android/activities/DirectoryActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/DirectoryActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -14,7 +14,7 @@ package app.fedilab.android.activities;
* You should have received a copy of the GNU General Public License along with Fedilab; if not, * You should have received a copy of the GNU General Public License along with Fedilab; if not,
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
import static app.fedilab.android.client.entities.app.Timeline.TimeLineEnum.ACCOUNT_DIRECTORY; import static app.fedilab.android.mastodon.client.entities.app.Timeline.TimeLineEnum.ACCOUNT_DIRECTORY;
import android.os.Bundle; import android.os.Bundle;
import android.view.Menu; import android.view.Menu;
@ -24,8 +24,8 @@ import org.jetbrains.annotations.NotNull;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.databinding.ActivityDirectoryBinding; import app.fedilab.android.databinding.ActivityDirectoryBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonAccount; import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonAccount;
public class DirectoryActivity extends BaseBarActivity { public class DirectoryActivity extends BaseBarActivity {

16
app/src/main/java/app/fedilab/android/activities/DraftActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/DraftActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -40,14 +40,14 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Attachment;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.app.StatusDraft;
import app.fedilab.android.databinding.ActivityDraftsBinding; import app.fedilab.android.databinding.ActivityDraftsBinding;
import app.fedilab.android.exception.DBException; import app.fedilab.android.mastodon.client.entities.api.Attachment;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.ui.drawer.StatusDraftAdapter; import app.fedilab.android.mastodon.client.entities.app.StatusDraft;
import app.fedilab.android.viewmodel.mastodon.TimelinesVM; 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;
public class DraftActivity extends BaseActivity implements StatusDraftAdapter.DraftActions { public class DraftActivity extends BaseActivity implements StatusDraftAdapter.DraftActions {

20
app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -43,14 +43,14 @@ import java.util.Locale;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Field;
import app.fedilab.android.databinding.AccountFieldItemBinding; import app.fedilab.android.databinding.AccountFieldItemBinding;
import app.fedilab.android.databinding.ActivityEditProfileBinding; import app.fedilab.android.databinding.ActivityEditProfileBinding;
import app.fedilab.android.exception.DBException; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.Field;
import app.fedilab.android.helper.MastodonHelper; import app.fedilab.android.mastodon.exception.DBException;
import app.fedilab.android.viewmodel.mastodon.AccountsVM; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.helper.MastodonHelper;
import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
public class EditProfileActivity extends BaseBarActivity { public class EditProfileActivity extends BaseBarActivity {
@ -208,7 +208,7 @@ public class EditProfileActivity extends BaseBarActivity {
Helper.recreateMainActivity(EditProfileActivity.this); Helper.recreateMainActivity(EditProfileActivity.this);
new Thread(() -> { new Thread(() -> {
try { try {
new app.fedilab.android.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(currentAccount); new app.fedilab.android.mastodon.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(currentAccount);
} catch (DBException e) { } catch (DBException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -235,7 +235,7 @@ public class EditProfileActivity extends BaseBarActivity {
currentAccount.mastodon_account = account; currentAccount.mastodon_account = account;
new Thread(() -> { new Thread(() -> {
try { try {
new app.fedilab.android.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(currentAccount); new app.fedilab.android.mastodon.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(currentAccount);
} catch (DBException e) { } catch (DBException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -329,7 +329,7 @@ public class EditProfileActivity extends BaseBarActivity {
currentAccount.mastodon_account = account; currentAccount.mastodon_account = account;
new Thread(() -> { new Thread(() -> {
try { try {
new app.fedilab.android.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(currentAccount); new app.fedilab.android.mastodon.client.entities.app.Account(EditProfileActivity.this).insertOrUpdate(currentAccount);
sendBroadCast(account); sendBroadCast(account);
} catch (DBException e) { } catch (DBException e) {
e.printStackTrace(); e.printStackTrace();

15
app/src/main/java/app/fedilab/android/activities/FilterActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/FilterActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -40,13 +40,14 @@ import java.util.Objects;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Filter; import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.databinding.ActivityFiltersBinding; import app.fedilab.android.databinding.ActivityFiltersBinding;
import app.fedilab.android.databinding.PopupAddFilterBinding; import app.fedilab.android.databinding.PopupAddFilterBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.Filter;
import app.fedilab.android.ui.drawer.FilterAdapter; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.ui.drawer.KeywordAdapter; import app.fedilab.android.mastodon.ui.drawer.FilterAdapter;
import app.fedilab.android.viewmodel.mastodon.FiltersVM; import app.fedilab.android.mastodon.ui.drawer.KeywordAdapter;
import app.fedilab.android.mastodon.viewmodel.mastodon.FiltersVM;
public class FilterActivity extends BaseBarActivity implements FilterAdapter.Delete { public class FilterActivity extends BaseBarActivity implements FilterAdapter.Delete {
@ -236,7 +237,7 @@ public class FilterActivity extends BaseBarActivity implements FilterAdapter.Del
alertDialog.setTitle(context.getString(R.string.action_update_filter)); alertDialog.setTitle(context.getString(R.string.action_update_filter));
alertDialog.setOnDismissListener(dialogInterface -> { alertDialog.setOnDismissListener(dialogInterface -> {
//Hide keyboard //Hide keyboard
InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE); InputMethodManager imm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(popupAddFilterBinding.addTitle.getWindowToken(), 0); imm.hideSoftInputFromWindow(popupAddFilterBinding.addTitle.getWindowToken(), 0);
}); });
if (alertDialog.getWindow() != null) { if (alertDialog.getWindow() != null) {

12
app/src/main/java/app/fedilab/android/activities/FollowRequestActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/FollowRequestActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -29,12 +29,12 @@ import java.util.List;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Accounts;
import app.fedilab.android.databinding.ActivityStatusInfoBinding; import app.fedilab.android.databinding.ActivityStatusInfoBinding;
import app.fedilab.android.helper.MastodonHelper; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.ui.drawer.AccountFollowRequestAdapter; import app.fedilab.android.mastodon.client.entities.api.Accounts;
import app.fedilab.android.viewmodel.mastodon.AccountsVM; import app.fedilab.android.mastodon.helper.MastodonHelper;
import app.fedilab.android.mastodon.ui.drawer.AccountFollowRequestAdapter;
import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
public class FollowRequestActivity extends BaseActivity { public class FollowRequestActivity extends BaseActivity {

16
app/src/main/java/app/fedilab/android/activities/FollowedTagActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/FollowedTagActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -34,15 +34,15 @@ import java.util.ArrayList;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Tag;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.ActivityFollowedTagsBinding; import app.fedilab.android.databinding.ActivityFollowedTagsBinding;
import app.fedilab.android.databinding.PopupAddFollowedTagtBinding; import app.fedilab.android.databinding.PopupAddFollowedTagtBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.Tag;
import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.mastodon.client.entities.app.Timeline;
import app.fedilab.android.ui.drawer.FollowedTagAdapter; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline; import app.fedilab.android.mastodon.helper.ThemeHelper;
import app.fedilab.android.viewmodel.mastodon.TagVM; import app.fedilab.android.mastodon.ui.drawer.FollowedTagAdapter;
import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTimeline;
import app.fedilab.android.mastodon.viewmodel.mastodon.TagVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;

29
app/src/main/java/app/fedilab/android/activities/HashTagActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -37,20 +37,21 @@ import java.util.List;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Filter; import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.app.Pinned;
import app.fedilab.android.client.entities.app.PinnedTimeline;
import app.fedilab.android.client.entities.app.StatusDraft;
import app.fedilab.android.client.entities.app.TagTimeline;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.ActivityHashtagBinding; import app.fedilab.android.databinding.ActivityHashtagBinding;
import app.fedilab.android.exception.DBException; import app.fedilab.android.mastodon.client.entities.api.Filter;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline; import app.fedilab.android.mastodon.client.entities.app.Pinned;
import app.fedilab.android.viewmodel.mastodon.FiltersVM; import app.fedilab.android.mastodon.client.entities.app.PinnedTimeline;
import app.fedilab.android.viewmodel.mastodon.ReorderVM; import app.fedilab.android.mastodon.client.entities.app.StatusDraft;
import app.fedilab.android.viewmodel.mastodon.TagVM; import app.fedilab.android.mastodon.client.entities.app.TagTimeline;
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.ui.fragment.timeline.FragmentMastodonTimeline;
import app.fedilab.android.mastodon.viewmodel.mastodon.FiltersVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.ReorderVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.TagVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;

33
app/src/main/java/app/fedilab/android/activities/InstanceActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/InstanceActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -39,11 +39,12 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Instance; import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.databinding.ActivityInstanceBinding; import app.fedilab.android.databinding.ActivityInstanceBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.Instance;
import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.viewmodel.mastodon.InstancesVM; import app.fedilab.android.mastodon.helper.ThemeHelper;
import app.fedilab.android.mastodon.viewmodel.mastodon.InstancesVM;
public class InstanceActivity extends DialogFragment { public class InstanceActivity extends DialogFragment {
@ -77,17 +78,17 @@ public class InstanceActivity extends DialogFragment {
binding.about.setOnClickListener(v -> Helper.openBrowser(requireActivity(), "https://" + MainActivity.currentInstance + "/about")); binding.about.setOnClickListener(v -> Helper.openBrowser(requireActivity(), "https://" + MainActivity.currentInstance + "/about"));
binding.privacy.setOnClickListener(v -> Helper.openBrowser(requireActivity(), "https://" + MainActivity.currentInstance + "/privacy-policy")); binding.privacy.setOnClickListener(v -> Helper.openBrowser(requireActivity(), "https://" + MainActivity.currentInstance + "/privacy-policy"));
binding.close.setOnClickListener( view -> { binding.close.setOnClickListener(view -> {
if (applyMaxChar) { if (applyMaxChar) {
String max_char = binding.maxChar.getText().toString(); String max_char = binding.maxChar.getText().toString();
SharedPreferences.Editor editor = sharedpreferences.edit(); SharedPreferences.Editor editor = sharedpreferences.edit();
if (!max_char.isEmpty()) { if (!max_char.isEmpty()) {
try { try {
editor.putInt(getString(R.string.SET_MAX_INSTANCE_CHAR) + MainActivity.currentInstance, Integer.parseInt(max_char)); editor.putInt(getString(R.string.SET_MAX_INSTANCE_CHAR) + MainActivity.currentInstance, Integer.parseInt(max_char));
editor.apply(); editor.apply();
} catch (Exception ignored) { } catch (Exception ignored) {
} }
} }
} }
requireDialog().dismiss(); requireDialog().dismiss();

42
app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.kt → app/src/main/java/app/fedilab/android/mastodon/activities/InstanceHealthActivity.kt
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities package app.fedilab.android.mastodon.activities
import android.app.Dialog import android.app.Dialog
import android.content.Intent import android.content.Intent
@ -12,11 +12,11 @@ import androidx.fragment.app.DialogFragment
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import app.fedilab.android.BaseMainActivity import app.fedilab.android.BaseMainActivity
import app.fedilab.android.R import app.fedilab.android.R
import app.fedilab.android.client.entities.app.InstanceSocial
import app.fedilab.android.databinding.ActivityInstanceSocialBinding import app.fedilab.android.databinding.ActivityInstanceSocialBinding
import app.fedilab.android.helper.Helper import app.fedilab.android.mastodon.client.entities.app.InstanceSocial
import app.fedilab.android.helper.ThemeHelper import app.fedilab.android.mastodon.helper.Helper
import app.fedilab.android.viewmodel.mastodon.InstanceSocialVM import app.fedilab.android.mastodon.helper.ThemeHelper
import app.fedilab.android.mastodon.viewmodel.mastodon.InstanceSocialVM
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
@ -59,11 +59,15 @@ class InstanceHealthActivity : DialogFragment() {
} }
private fun checkInstance() { private fun checkInstance() {
val instanceSocialVM = ViewModelProvider(this@InstanceHealthActivity)[InstanceSocialVM::class.java] val instanceSocialVM =
ViewModelProvider(this@InstanceHealthActivity)[InstanceSocialVM::class.java]
instanceSocialVM.getInstances(BaseMainActivity.currentInstance.trim { it <= ' ' }) instanceSocialVM.getInstances(BaseMainActivity.currentInstance.trim { it <= ' ' })
.observe(this@InstanceHealthActivity) { instanceSocialList: InstanceSocial? -> .observe(this@InstanceHealthActivity) { instanceSocialList: InstanceSocial? ->
val instance = instanceSocialList?.instances?.firstOrNull { instance -> val instance = instanceSocialList?.instances?.firstOrNull { instance ->
instance.name.equals(BaseMainActivity.currentInstance.trim { it <= ' ' }, ignoreCase = true) instance.name.equals(
BaseMainActivity.currentInstance.trim { it <= ' ' },
ignoreCase = true
)
} }
if (instance != null) { if (instance != null) {
instance.thumbnail?.takeIf { it != "null" }?.let { thumbnail -> instance.thumbnail?.takeIf { it != "null" }?.let { thumbnail ->
@ -76,15 +80,31 @@ class InstanceHealthActivity : DialogFragment() {
binding.name.text = instance.name binding.name.text = instance.name
if (instance.up) { if (instance.up) {
binding.up.setText(app.fedilab.android.R.string.is_up) binding.up.setText(app.fedilab.android.R.string.is_up)
binding.up.setTextColor(ThemeHelper.getAttColor(requireContext(), app.fedilab.android.R.attr.colorPrimary)) binding.up.setTextColor(
ThemeHelper.getAttColor(
requireContext(),
app.fedilab.android.R.attr.colorPrimary
)
)
} else { } else {
binding.up.setText(app.fedilab.android.R.string.is_down) binding.up.setText(app.fedilab.android.R.string.is_down)
binding.up.setTextColor(ThemeHelper.getAttColor(requireContext(), app.fedilab.android.R.attr.colorError)) binding.up.setTextColor(
ThemeHelper.getAttColor(
requireContext(),
app.fedilab.android.R.attr.colorError
)
)
} }
binding.uptime.text = getString(app.fedilab.android.R.string.instance_health_uptime, instance.uptime * 100) binding.uptime.text = getString(
app.fedilab.android.R.string.instance_health_uptime,
instance.uptime * 100
)
if (instance.checked_at != null) if (instance.checked_at != null)
binding.checkedAt.text = binding.checkedAt.text =
getString(app.fedilab.android.R.string.instance_health_checkedat, Helper.dateToString(instance.checked_at)) getString(
app.fedilab.android.R.string.instance_health_checkedat,
Helper.dateToString(instance.checked_at)
)
binding.values.text = getString( binding.values.text = getString(
app.fedilab.android.R.string.instance_health_indication, app.fedilab.android.R.string.instance_health_indication,
instance.version, instance.version,

6
app/src/main/java/app/fedilab/android/activities/InstanceProfileActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/InstanceProfileActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -29,8 +29,8 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.databinding.ActivityInstanceProfileBinding; import app.fedilab.android.databinding.ActivityInstanceProfileBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.viewmodel.mastodon.NodeInfoVM; import app.fedilab.android.mastodon.viewmodel.mastodon.NodeInfoVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
public class InstanceProfileActivity extends DialogFragment { public class InstanceProfileActivity extends DialogFragment {

31
app/src/main/java/app/fedilab/android/activities/MastodonListActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/MastodonListActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -42,23 +42,24 @@ import java.util.List;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Account; import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.client.entities.api.MastodonList;
import app.fedilab.android.client.entities.app.Pinned;
import app.fedilab.android.client.entities.app.PinnedTimeline;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.ActivityListBinding; import app.fedilab.android.databinding.ActivityListBinding;
import app.fedilab.android.databinding.PopupAddListBinding; import app.fedilab.android.databinding.PopupAddListBinding;
import app.fedilab.android.databinding.PopupManageAccountsListBinding; import app.fedilab.android.databinding.PopupManageAccountsListBinding;
import app.fedilab.android.exception.DBException; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.MastodonList;
import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.mastodon.client.entities.app.Pinned;
import app.fedilab.android.ui.drawer.AccountListAdapter; import app.fedilab.android.mastodon.client.entities.app.PinnedTimeline;
import app.fedilab.android.ui.drawer.MastodonListAdapter; import app.fedilab.android.mastodon.client.entities.app.Timeline;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline; import app.fedilab.android.mastodon.exception.DBException;
import app.fedilab.android.viewmodel.mastodon.AccountsVM; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.viewmodel.mastodon.ReorderVM; import app.fedilab.android.mastodon.helper.ThemeHelper;
import app.fedilab.android.viewmodel.mastodon.TimelinesVM; import app.fedilab.android.mastodon.ui.drawer.AccountListAdapter;
import app.fedilab.android.mastodon.ui.drawer.MastodonListAdapter;
import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTimeline;
import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.ReorderVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.TimelinesVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;

25
app/src/main/java/app/fedilab/android/activities/MediaActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/MediaActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -14,8 +14,6 @@ package app.fedilab.android.activities;
* You should have received a copy of the GNU General Public License along with Fedilab; if not, * You should have received a copy of the GNU General Public License along with Fedilab; if not,
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
import static app.fedilab.android.ui.fragment.media.FragmentMediaProfile.mediaAttachmentProfile;
import android.Manifest; import android.Manifest;
import android.app.DownloadManager; import android.app.DownloadManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
@ -49,14 +47,15 @@ import org.jetbrains.annotations.NotNull;
import java.util.ArrayList; import java.util.ArrayList;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Attachment;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.databinding.ActivityMediaPagerBinding; import app.fedilab.android.databinding.ActivityMediaPagerBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.Attachment;
import app.fedilab.android.helper.MediaHelper; import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.helper.TranslateHelper; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.interfaces.OnDownloadInterface; import app.fedilab.android.mastodon.helper.MediaHelper;
import app.fedilab.android.ui.fragment.media.FragmentMedia; import app.fedilab.android.mastodon.helper.TranslateHelper;
import app.fedilab.android.mastodon.interfaces.OnDownloadInterface;
import app.fedilab.android.mastodon.ui.fragment.media.FragmentMedia;
import app.fedilab.android.mastodon.ui.fragment.media.FragmentMediaProfile;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
@ -72,7 +71,7 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
long id = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1); long id = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1);
if (downloadID == id) { if (downloadID == id) {
DownloadManager manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE); DownloadManager manager = (DownloadManager) context.getSystemService(DOWNLOAD_SERVICE);
assert manager != null; assert manager != null;
Uri uri = manager.getUriForDownloadedFile(downloadID); Uri uri = manager.getUriForDownloadedFile(downloadID);
Intent shareIntent = new Intent(Intent.ACTION_SEND); Intent shareIntent = new Intent(Intent.ACTION_SEND);
@ -118,9 +117,9 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload
mediaFromProfile = b.getBoolean(Helper.ARG_MEDIA_ARRAY_PROFILE, false); mediaFromProfile = b.getBoolean(Helper.ARG_MEDIA_ARRAY_PROFILE, false);
status = (Status) b.getSerializable(Helper.ARG_STATUS); status = (Status) b.getSerializable(Helper.ARG_STATUS);
} }
if (mediaFromProfile && mediaAttachmentProfile != null) { if (mediaFromProfile && FragmentMediaProfile.mediaAttachmentProfile != null) {
attachments = new ArrayList<>(); attachments = new ArrayList<>();
attachments.addAll(mediaAttachmentProfile); attachments.addAll(FragmentMediaProfile.mediaAttachmentProfile);
} }
if (getSupportActionBar() != null) { if (getSupportActionBar() != null) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);

14
app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/PartnerShipActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -31,13 +31,13 @@ import java.util.List;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.databinding.ActivityPartnershipBinding; import app.fedilab.android.databinding.ActivityPartnershipBinding;
import app.fedilab.android.helper.CrossActionHelper; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.helper.MastodonHelper; import app.fedilab.android.mastodon.helper.CrossActionHelper;
import app.fedilab.android.viewmodel.mastodon.AccountsVM; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.helper.MastodonHelper;
import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
public class PartnerShipActivity extends BaseBarActivity { public class PartnerShipActivity extends BaseBarActivity {

55
app/src/main/java/app/fedilab/android/activities/ProfileActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -76,34 +76,35 @@ import java.util.concurrent.TimeUnit;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Account; import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.client.entities.api.Attachment;
import app.fedilab.android.client.entities.api.FamiliarFollowers;
import app.fedilab.android.client.entities.api.Field;
import app.fedilab.android.client.entities.api.IdentityProof;
import app.fedilab.android.client.entities.api.MastodonList;
import app.fedilab.android.client.entities.api.RelationShip;
import app.fedilab.android.client.entities.app.Languages;
import app.fedilab.android.client.entities.app.Pinned;
import app.fedilab.android.client.entities.app.PinnedTimeline;
import app.fedilab.android.client.entities.app.RemoteInstance;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.client.entities.app.WellKnownNodeinfo;
import app.fedilab.android.databinding.ActivityProfileBinding; import app.fedilab.android.databinding.ActivityProfileBinding;
import app.fedilab.android.databinding.NotificationsRelatedAccountsBinding; import app.fedilab.android.databinding.NotificationsRelatedAccountsBinding;
import app.fedilab.android.exception.DBException; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.helper.CrossActionHelper; import app.fedilab.android.mastodon.client.entities.api.Attachment;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.FamiliarFollowers;
import app.fedilab.android.helper.MastodonHelper; import app.fedilab.android.mastodon.client.entities.api.Field;
import app.fedilab.android.helper.SpannableHelper; import app.fedilab.android.mastodon.client.entities.api.IdentityProof;
import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.mastodon.client.entities.api.MastodonList;
import app.fedilab.android.ui.drawer.FieldAdapter; import app.fedilab.android.mastodon.client.entities.api.RelationShip;
import app.fedilab.android.ui.drawer.IdentityProofsAdapter; import app.fedilab.android.mastodon.client.entities.app.Languages;
import app.fedilab.android.ui.pageadapter.FedilabProfileTLPageAdapter; import app.fedilab.android.mastodon.client.entities.app.Pinned;
import app.fedilab.android.viewmodel.mastodon.AccountsVM; import app.fedilab.android.mastodon.client.entities.app.PinnedTimeline;
import app.fedilab.android.viewmodel.mastodon.NodeInfoVM; import app.fedilab.android.mastodon.client.entities.app.RemoteInstance;
import app.fedilab.android.viewmodel.mastodon.ReorderVM; import app.fedilab.android.mastodon.client.entities.app.Timeline;
import app.fedilab.android.viewmodel.mastodon.TimelinesVM; import app.fedilab.android.mastodon.client.entities.app.WellKnownNodeinfo;
import app.fedilab.android.mastodon.exception.DBException;
import app.fedilab.android.mastodon.helper.CrossActionHelper;
import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.helper.MastodonHelper;
import app.fedilab.android.mastodon.helper.SpannableHelper;
import app.fedilab.android.mastodon.helper.ThemeHelper;
import app.fedilab.android.mastodon.ui.drawer.FieldAdapter;
import app.fedilab.android.mastodon.ui.drawer.IdentityProofsAdapter;
import app.fedilab.android.mastodon.ui.pageadapter.FedilabProfileTLPageAdapter;
import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.NodeInfoVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.ReorderVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.TimelinesVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;

3
app/src/main/java/app/fedilab/android/activities/ProxyActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/ProxyActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -16,7 +16,6 @@ package app.fedilab.android.activities;
import android.app.Dialog; import android.app.Dialog;
import android.content.DialogInterface;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;

38
app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/ReorderTimelinesActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -15,9 +15,6 @@ package app.fedilab.android.activities;
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
import static app.fedilab.android.helper.PinnedTimelineHelper.sortMenuItem;
import static app.fedilab.android.helper.PinnedTimelineHelper.sortPositionAsc;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
@ -47,22 +44,23 @@ import java.util.ArrayList;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.app.BottomMenu;
import app.fedilab.android.client.entities.app.InstanceSocial;
import app.fedilab.android.client.entities.app.Pinned;
import app.fedilab.android.client.entities.app.PinnedTimeline;
import app.fedilab.android.client.entities.app.RemoteInstance;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.ActivityReorderTabsBinding; import app.fedilab.android.databinding.ActivityReorderTabsBinding;
import app.fedilab.android.databinding.PopupSearchInstanceBinding; import app.fedilab.android.databinding.PopupSearchInstanceBinding;
import app.fedilab.android.exception.DBException; import app.fedilab.android.mastodon.client.entities.app.BottomMenu;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.app.InstanceSocial;
import app.fedilab.android.helper.itemtouchhelper.OnStartDragListener; import app.fedilab.android.mastodon.client.entities.app.Pinned;
import app.fedilab.android.helper.itemtouchhelper.SimpleItemTouchHelperCallback; import app.fedilab.android.mastodon.client.entities.app.PinnedTimeline;
import app.fedilab.android.ui.drawer.ReorderBottomMenuAdapter; import app.fedilab.android.mastodon.client.entities.app.RemoteInstance;
import app.fedilab.android.ui.drawer.ReorderTabAdapter; import app.fedilab.android.mastodon.client.entities.app.Timeline;
import app.fedilab.android.viewmodel.mastodon.InstanceSocialVM; import app.fedilab.android.mastodon.exception.DBException;
import app.fedilab.android.viewmodel.mastodon.ReorderVM; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.helper.PinnedTimelineHelper;
import app.fedilab.android.mastodon.helper.itemtouchhelper.OnStartDragListener;
import app.fedilab.android.mastodon.helper.itemtouchhelper.SimpleItemTouchHelperCallback;
import app.fedilab.android.mastodon.ui.drawer.ReorderBottomMenuAdapter;
import app.fedilab.android.mastodon.ui.drawer.ReorderTabAdapter;
import app.fedilab.android.mastodon.viewmodel.mastodon.InstanceSocialVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.ReorderVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
import okhttp3.Call; import okhttp3.Call;
import okhttp3.Callback; import okhttp3.Callback;
@ -125,7 +123,7 @@ public class ReorderTimelinesActivity extends BaseBarActivity implements OnStart
this.pinned.pinnedTimelines = new ArrayList<>(); this.pinned.pinnedTimelines = new ArrayList<>();
update = false; update = false;
} }
sortPositionAsc(this.pinned.pinnedTimelines); PinnedTimelineHelper.sortPositionAsc(this.pinned.pinnedTimelines);
reorderTabAdapter = new ReorderTabAdapter(this.pinned, ReorderTimelinesActivity.this); reorderTabAdapter = new ReorderTabAdapter(this.pinned, ReorderTimelinesActivity.this);
ItemTouchHelper.Callback callback = ItemTouchHelper.Callback callback =
new SimpleItemTouchHelperCallback(reorderTabAdapter); new SimpleItemTouchHelperCallback(reorderTabAdapter);
@ -141,7 +139,7 @@ public class ReorderTimelinesActivity extends BaseBarActivity implements OnStart
this.bottomMenu = new BottomMenu(getApplicationContext()).defaultBottomMenu(); this.bottomMenu = new BottomMenu(getApplicationContext()).defaultBottomMenu();
this.bottomMenu.bottom_menu = new ArrayList<>(); this.bottomMenu.bottom_menu = new ArrayList<>();
} }
sortMenuItem(this.bottomMenu.bottom_menu); PinnedTimelineHelper.sortMenuItem(this.bottomMenu.bottom_menu);
reorderBottomMenuAdapter = new ReorderBottomMenuAdapter(this.bottomMenu, ReorderTimelinesActivity.this); reorderBottomMenuAdapter = new ReorderBottomMenuAdapter(this.bottomMenu, ReorderTimelinesActivity.this);
ItemTouchHelper.Callback callback = ItemTouchHelper.Callback callback =
new SimpleItemTouchHelperCallback(reorderBottomMenuAdapter); new SimpleItemTouchHelperCallback(reorderBottomMenuAdapter);

18
app/src/main/java/app/fedilab/android/activities/ReportActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/ReportActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -31,15 +31,15 @@ import java.util.List;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.RelationShip;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.ActivityReportBinding; import app.fedilab.android.databinding.ActivityReportBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.ui.drawer.RulesAdapter; import app.fedilab.android.mastodon.client.entities.api.RelationShip;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline; import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.viewmodel.mastodon.AccountsVM; import app.fedilab.android.mastodon.client.entities.app.Timeline;
import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.ui.drawer.RulesAdapter;
import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTimeline;
import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;

6
app/src/main/java/app/fedilab/android/activities/ScheduledActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/ScheduledActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -29,8 +29,8 @@ import com.google.android.material.tabs.TabLayout;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.databinding.ActivityScheduledBinding; import app.fedilab.android.databinding.ActivityScheduledBinding;
import app.fedilab.android.helper.MastodonHelper; import app.fedilab.android.mastodon.helper.MastodonHelper;
import app.fedilab.android.ui.pageadapter.FedilabScheduledPageAdapter; import app.fedilab.android.mastodon.ui.pageadapter.FedilabScheduledPageAdapter;
public class ScheduledActivity extends BaseActivity { public class ScheduledActivity extends BaseActivity {

23
app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -50,16 +50,17 @@ import java.util.regex.Pattern;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Tag;
import app.fedilab.android.databinding.ActivitySearchResultTabsBinding; import app.fedilab.android.databinding.ActivitySearchResultTabsBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.ui.drawer.AccountsSearchTopBarAdapter; import app.fedilab.android.mastodon.client.entities.api.Tag;
import app.fedilab.android.ui.drawer.TagSearchTopBarAdapter; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonAccount; import app.fedilab.android.mastodon.ui.drawer.AccountsSearchTopBarAdapter;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTag; import app.fedilab.android.mastodon.ui.drawer.TagSearchTopBarAdapter;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline; import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonAccount;
import app.fedilab.android.viewmodel.mastodon.AccountsVM; import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTag;
import app.fedilab.android.viewmodel.mastodon.SearchVM; import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTimeline;
import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.SearchVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
@ -185,7 +186,7 @@ public class SearchResultTabActivity extends BaseBarActivity {
searchView.setSuggestionsAdapter(cursorAdapter); searchView.setSuggestionsAdapter(cursorAdapter);
new Thread(() -> { new Thread(() -> {
int i = 0; int i = 0;
for (app.fedilab.android.client.entities.api.Account account : accounts) { for (Account account : accounts) {
FutureTarget<File> futureTarget = Glide FutureTarget<File> futureTarget = Glide
.with(SearchResultTabActivity.this.getApplicationContext()) .with(SearchResultTabActivity.this.getApplicationContext())
.load(account.avatar_static) .load(account.avatar_static)

2
app/src/main/java/app/fedilab/android/activities/SettingsActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/SettingsActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

9
app/src/main/java/app/fedilab/android/activities/StatusHistoryActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/StatusHistoryActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -23,10 +23,11 @@ import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.databinding.ActivityStatusHistoryBinding; import app.fedilab.android.databinding.ActivityStatusHistoryBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.ui.drawer.StatusHistoryAdapter; import app.fedilab.android.mastodon.ui.drawer.StatusHistoryAdapter;
import app.fedilab.android.viewmodel.mastodon.StatusesVM; import app.fedilab.android.mastodon.viewmodel.mastodon.StatusesVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;

18
app/src/main/java/app/fedilab/android/activities/StatusInfoActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/StatusInfoActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -29,15 +29,15 @@ import java.util.List;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Accounts;
import app.fedilab.android.client.entities.api.RelationShip;
import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.databinding.ActivityStatusInfoBinding; import app.fedilab.android.databinding.ActivityStatusInfoBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.ui.drawer.AccountAdapter; import app.fedilab.android.mastodon.client.entities.api.Accounts;
import app.fedilab.android.viewmodel.mastodon.AccountsVM; import app.fedilab.android.mastodon.client.entities.api.RelationShip;
import app.fedilab.android.viewmodel.mastodon.StatusesVM; import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.ui.drawer.AccountAdapter;
import app.fedilab.android.mastodon.viewmodel.mastodon.AccountsVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.StatusesVM;
public class StatusInfoActivity extends BaseActivity { public class StatusInfoActivity extends BaseActivity {

6
app/src/main/java/app/fedilab/android/activities/SuggestionActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/SuggestionActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -21,8 +21,8 @@ import org.jetbrains.annotations.NotNull;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.databinding.ActivitySuggestionsBinding; import app.fedilab.android.databinding.ActivitySuggestionsBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonSuggestion; import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonSuggestion;
public class SuggestionActivity extends BaseBarActivity { public class SuggestionActivity extends BaseBarActivity {

10
app/src/main/java/app/fedilab/android/activities/TrendsActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/TrendsActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities; package app.fedilab.android.mastodon.activities;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -30,11 +30,11 @@ import com.google.android.material.tabs.TabLayout;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.client.entities.app.Timeline;
import app.fedilab.android.databinding.ActivityTrendsBinding; import app.fedilab.android.databinding.ActivityTrendsBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.client.entities.app.Timeline;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTag; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline; import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTag;
import app.fedilab.android.mastodon.ui.fragment.timeline.FragmentMastodonTimeline;
public class TrendsActivity extends BaseBarActivity { public class TrendsActivity extends BaseBarActivity {

26
app/src/main/java/app/fedilab/android/activities/admin/AdminAccountActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminAccountActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities.admin; package app.fedilab.android.mastodon.activities.admin;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -53,20 +53,20 @@ import java.util.concurrent.TimeUnit;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.activities.BaseActivity;
import app.fedilab.android.activities.InstanceProfileActivity;
import app.fedilab.android.activities.MainActivity; import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.activities.MediaActivity;
import app.fedilab.android.client.entities.api.Attachment;
import app.fedilab.android.client.entities.api.admin.AdminAccount;
import app.fedilab.android.client.entities.api.admin.AdminIp;
import app.fedilab.android.databinding.ActivityAdminAccountBinding; import app.fedilab.android.databinding.ActivityAdminAccountBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.activities.BaseActivity;
import app.fedilab.android.helper.MastodonHelper; import app.fedilab.android.mastodon.activities.InstanceProfileActivity;
import app.fedilab.android.helper.SpannableHelper; import app.fedilab.android.mastodon.activities.MediaActivity;
import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.mastodon.client.entities.api.Attachment;
import app.fedilab.android.viewmodel.mastodon.AdminVM; import app.fedilab.android.mastodon.client.entities.api.admin.AdminAccount;
import app.fedilab.android.viewmodel.mastodon.NodeInfoVM; import app.fedilab.android.mastodon.client.entities.api.admin.AdminIp;
import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.helper.MastodonHelper;
import app.fedilab.android.mastodon.helper.SpannableHelper;
import app.fedilab.android.mastodon.helper.ThemeHelper;
import app.fedilab.android.mastodon.viewmodel.mastodon.AdminVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.NodeInfoVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;

22
app/src/main/java/app/fedilab/android/activities/admin/AdminActionActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminActionActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities.admin; package app.fedilab.android.mastodon.activities.admin;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -14,9 +14,9 @@ package app.fedilab.android.activities.admin;
* You should have received a copy of the GNU General Public License along with Fedilab; if not, * You should have received a copy of the GNU General Public License along with Fedilab; if not,
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
import static app.fedilab.android.activities.admin.AdminActionActivity.AdminEnum.ACCOUNT; import static app.fedilab.android.mastodon.activities.admin.AdminActionActivity.AdminEnum.ACCOUNT;
import static app.fedilab.android.activities.admin.AdminActionActivity.AdminEnum.DOMAIN; import static app.fedilab.android.mastodon.activities.admin.AdminActionActivity.AdminEnum.DOMAIN;
import static app.fedilab.android.activities.admin.AdminActionActivity.AdminEnum.REPORT; import static app.fedilab.android.mastodon.activities.admin.AdminActionActivity.AdminEnum.REPORT;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
@ -37,16 +37,16 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.activities.BaseBarActivity;
import app.fedilab.android.client.entities.api.admin.AdminDomainBlock;
import app.fedilab.android.databinding.ActivityAdminActionsBinding; import app.fedilab.android.databinding.ActivityAdminActionsBinding;
import app.fedilab.android.databinding.PopupAdminFilterAccountsBinding; import app.fedilab.android.databinding.PopupAdminFilterAccountsBinding;
import app.fedilab.android.databinding.PopupAdminFilterReportsBinding; import app.fedilab.android.databinding.PopupAdminFilterReportsBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.activities.BaseBarActivity;
import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.mastodon.client.entities.api.admin.AdminDomainBlock;
import app.fedilab.android.ui.fragment.admin.FragmentAdminAccount; import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.ui.fragment.admin.FragmentAdminDomain; import app.fedilab.android.mastodon.helper.ThemeHelper;
import app.fedilab.android.ui.fragment.admin.FragmentAdminReport; import app.fedilab.android.mastodon.ui.fragment.admin.FragmentAdminAccount;
import app.fedilab.android.mastodon.ui.fragment.admin.FragmentAdminDomain;
import app.fedilab.android.mastodon.ui.fragment.admin.FragmentAdminReport;
public class AdminActionActivity extends BaseBarActivity { public class AdminActionActivity extends BaseBarActivity {

16
app/src/main/java/app/fedilab/android/activities/admin/AdminDomainBlockActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminDomainBlockActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities.admin; package app.fedilab.android.mastodon.activities.admin;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -15,8 +15,6 @@ package app.fedilab.android.activities.admin;
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
import static app.fedilab.android.helper.Helper.BROADCAST_DATA;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.Menu; import android.view.Menu;
@ -33,12 +31,12 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.activities.BaseBarActivity;
import app.fedilab.android.activities.MainActivity; import app.fedilab.android.activities.MainActivity;
import app.fedilab.android.client.entities.api.admin.AdminDomainBlock;
import app.fedilab.android.databinding.ActivityAdminDomainblockBinding; import app.fedilab.android.databinding.ActivityAdminDomainblockBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.activities.BaseBarActivity;
import app.fedilab.android.viewmodel.mastodon.AdminVM; import app.fedilab.android.mastodon.client.entities.api.admin.AdminDomainBlock;
import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.viewmodel.mastodon.AdminVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
public class AdminDomainBlockActivity extends BaseBarActivity { public class AdminDomainBlockActivity extends BaseBarActivity {
@ -109,7 +107,7 @@ public class AdminDomainBlockActivity extends BaseBarActivity {
} else { } else {
Toasty.error(AdminDomainBlockActivity.this, getString(R.string.toast_error), Toasty.LENGTH_SHORT).show(); Toasty.error(AdminDomainBlockActivity.this, getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
} }
Intent intent = new Intent(BROADCAST_DATA).putExtra(Helper.ARG_ADMIN_DOMAINBLOCK, adminDomainBlockResult); Intent intent = new Intent(Helper.BROADCAST_DATA).putExtra(Helper.ARG_ADMIN_DOMAINBLOCK, adminDomainBlockResult);
LocalBroadcastManager.getInstance(AdminDomainBlockActivity.this).sendBroadcast(intent); LocalBroadcastManager.getInstance(AdminDomainBlockActivity.this).sendBroadcast(intent);
finish(); finish();
} }
@ -137,7 +135,7 @@ public class AdminDomainBlockActivity extends BaseBarActivity {
.setPositiveButton(R.string.unblock_domain, (dialog, which) -> { .setPositiveButton(R.string.unblock_domain, (dialog, which) -> {
adminVM.deleteDomain(MainActivity.currentInstance, MainActivity.currentToken, adminDomainBlock.id) adminVM.deleteDomain(MainActivity.currentInstance, MainActivity.currentToken, adminDomainBlock.id)
.observe(AdminDomainBlockActivity.this, adminDomainBlockResult -> { .observe(AdminDomainBlockActivity.this, adminDomainBlockResult -> {
Intent intent = new Intent(BROADCAST_DATA).putExtra(Helper.ARG_ADMIN_DOMAINBLOCK_DELETE, adminDomainBlock); Intent intent = new Intent(Helper.BROADCAST_DATA).putExtra(Helper.ARG_ADMIN_DOMAINBLOCK_DELETE, adminDomainBlock);
LocalBroadcastManager.getInstance(AdminDomainBlockActivity.this).sendBroadcast(intent); LocalBroadcastManager.getInstance(AdminDomainBlockActivity.this).sendBroadcast(intent);
finish(); finish();
} }

28
app/src/main/java/app/fedilab/android/activities/admin/AdminReportActivity.java → app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminReportActivity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.activities.admin; package app.fedilab.android.mastodon.activities.admin;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -54,20 +54,20 @@ import java.util.concurrent.TimeUnit;
import app.fedilab.android.BaseMainActivity; import app.fedilab.android.BaseMainActivity;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.activities.BaseBarActivity;
import app.fedilab.android.activities.InstanceProfileActivity;
import app.fedilab.android.activities.MediaActivity;
import app.fedilab.android.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Attachment;
import app.fedilab.android.client.entities.api.admin.AdminAccount;
import app.fedilab.android.client.entities.api.admin.AdminIp;
import app.fedilab.android.databinding.ActivityAdminAccountBinding; import app.fedilab.android.databinding.ActivityAdminAccountBinding;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.activities.BaseBarActivity;
import app.fedilab.android.helper.MastodonHelper; import app.fedilab.android.mastodon.activities.InstanceProfileActivity;
import app.fedilab.android.helper.SpannableHelper; import app.fedilab.android.mastodon.activities.MediaActivity;
import app.fedilab.android.helper.ThemeHelper; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.viewmodel.mastodon.AdminVM; import app.fedilab.android.mastodon.client.entities.api.Attachment;
import app.fedilab.android.viewmodel.mastodon.NodeInfoVM; import app.fedilab.android.mastodon.client.entities.api.admin.AdminAccount;
import app.fedilab.android.mastodon.client.entities.api.admin.AdminIp;
import app.fedilab.android.mastodon.helper.Helper;
import app.fedilab.android.mastodon.helper.MastodonHelper;
import app.fedilab.android.mastodon.helper.SpannableHelper;
import app.fedilab.android.mastodon.helper.ThemeHelper;
import app.fedilab.android.mastodon.viewmodel.mastodon.AdminVM;
import app.fedilab.android.mastodon.viewmodel.mastodon.NodeInfoVM;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;

2
app/src/main/java/app/fedilab/android/broadcastreceiver/NetworkStateReceiver.java → app/src/main/java/app/fedilab/android/mastodon/broadcastreceiver/NetworkStateReceiver.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.broadcastreceiver; package app.fedilab.android.mastodon.broadcastreceiver;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

11
app/src/main/java/app/fedilab/android/broadcastreceiver/ToastMessage.java → app/src/main/java/app/fedilab/android/mastodon/broadcastreceiver/ToastMessage.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.broadcastreceiver; package app.fedilab.android.mastodon.broadcastreceiver;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -14,15 +14,12 @@ package app.fedilab.android.broadcastreceiver;
* You should have received a copy of the GNU General Public License along with Fedilab; if not, * You should have received a copy of the GNU General Public License along with Fedilab; if not,
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
import static app.fedilab.android.helper.Helper.RECEIVE_TOAST_CONTENT;
import static app.fedilab.android.helper.Helper.RECEIVE_TOAST_TYPE;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import app.fedilab.android.helper.Helper; import app.fedilab.android.mastodon.helper.Helper;
import es.dmoral.toasty.Toasty; import es.dmoral.toasty.Toasty;
public class ToastMessage extends BroadcastReceiver { public class ToastMessage extends BroadcastReceiver {
@ -30,8 +27,8 @@ public class ToastMessage extends BroadcastReceiver {
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
Bundle b = intent.getExtras(); Bundle b = intent.getExtras();
if (b != null) { if (b != null) {
String type = b.getString(RECEIVE_TOAST_TYPE, null); String type = b.getString(Helper.RECEIVE_TOAST_TYPE, null);
String content = b.getString(RECEIVE_TOAST_CONTENT, null); String content = b.getString(Helper.RECEIVE_TOAST_CONTENT, null);
if (type != null && content != null) { if (type != null && content != null) {
switch (type) { switch (type) {
case Helper.RECEIVE_TOAST_TYPE_ERROR: case Helper.RECEIVE_TOAST_TYPE_ERROR:

4
app/src/main/java/app/fedilab/android/client/NodeInfoService.java → app/src/main/java/app/fedilab/android/mastodon/client/NodeInfoService.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client; package app.fedilab.android.mastodon.client;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -15,7 +15,7 @@ package app.fedilab.android.client;
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
import app.fedilab.android.client.entities.app.WellKnownNodeinfo; import app.fedilab.android.mastodon.client.entities.app.WellKnownNodeinfo;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.GET; import retrofit2.http.GET;
import retrofit2.http.Path; import retrofit2.http.Path;

4
app/src/main/java/app/fedilab/android/client/endpoints/JoinMastodonService.java → app/src/main/java/app/fedilab/android/mastodon/client/endpoints/JoinMastodonService.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.endpoints; package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -17,7 +17,7 @@ package app.fedilab.android.client.endpoints;
import java.util.List; import java.util.List;
import app.fedilab.android.client.entities.api.JoinMastodonInstance; import app.fedilab.android.mastodon.client.entities.api.JoinMastodonInstance;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.GET; import retrofit2.http.GET;
import retrofit2.http.Query; import retrofit2.http.Query;

28
app/src/main/java/app/fedilab/android/client/endpoints/MastodonAccountsService.java → app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonAccountsService.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.endpoints; package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -17,18 +17,18 @@ package app.fedilab.android.client.endpoints;
import java.util.List; import java.util.List;
import app.fedilab.android.client.entities.api.Account; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.client.entities.api.FamiliarFollowers; import app.fedilab.android.mastodon.client.entities.api.FamiliarFollowers;
import app.fedilab.android.client.entities.api.FeaturedTag; import app.fedilab.android.mastodon.client.entities.api.FeaturedTag;
import app.fedilab.android.client.entities.api.IdentityProof; import app.fedilab.android.mastodon.client.entities.api.IdentityProof;
import app.fedilab.android.client.entities.api.MastodonList; import app.fedilab.android.mastodon.client.entities.api.MastodonList;
import app.fedilab.android.client.entities.api.Preferences; import app.fedilab.android.mastodon.client.entities.api.Preferences;
import app.fedilab.android.client.entities.api.RelationShip; import app.fedilab.android.mastodon.client.entities.api.RelationShip;
import app.fedilab.android.client.entities.api.Report; import app.fedilab.android.mastodon.client.entities.api.Report;
import app.fedilab.android.client.entities.api.Status; import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.client.entities.api.Suggestion; import app.fedilab.android.mastodon.client.entities.api.Suggestion;
import app.fedilab.android.client.entities.api.Tag; import app.fedilab.android.mastodon.client.entities.api.Tag;
import app.fedilab.android.client.entities.api.Token; import app.fedilab.android.mastodon.client.entities.api.Token;
import okhttp3.MultipartBody; import okhttp3.MultipartBody;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.Body; import retrofit2.http.Body;
@ -96,7 +96,7 @@ public interface MastodonAccountsService {
@Field("source[privacy]") String privacy, @Field("source[privacy]") String privacy,
@Field("source[sensitive]") Boolean sensitive, @Field("source[sensitive]") Boolean sensitive,
@Field("source[language]") String language, @Field("source[language]") String language,
@Field("fields_attributes") List<app.fedilab.android.client.entities.api.Field.FieldParams> fields @Field("fields_attributes") List<app.fedilab.android.mastodon.client.entities.api.Field.FieldParams> fields
); );
//Get Account //Get Account

8
app/src/main/java/app/fedilab/android/client/endpoints/MastodonAdminService.java → app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonAdminService.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.endpoints; package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -17,9 +17,9 @@ package app.fedilab.android.client.endpoints;
import java.util.List; import java.util.List;
import app.fedilab.android.client.entities.api.admin.AdminAccount; import app.fedilab.android.mastodon.client.entities.api.admin.AdminAccount;
import app.fedilab.android.client.entities.api.admin.AdminDomainBlock; import app.fedilab.android.mastodon.client.entities.api.admin.AdminDomainBlock;
import app.fedilab.android.client.entities.api.admin.AdminReport; import app.fedilab.android.mastodon.client.entities.api.admin.AdminReport;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.DELETE; import retrofit2.http.DELETE;
import retrofit2.http.Field; import retrofit2.http.Field;

4
app/src/main/java/app/fedilab/android/client/endpoints/MastodonAnnouncementsService.java → app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonAnnouncementsService.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.endpoints; package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -17,7 +17,7 @@ package app.fedilab.android.client.endpoints;
import java.util.List; import java.util.List;
import app.fedilab.android.client.entities.api.Announcement; import app.fedilab.android.mastodon.client.entities.api.Announcement;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.DELETE; import retrofit2.http.DELETE;
import retrofit2.http.FormUrlEncoded; import retrofit2.http.FormUrlEncoded;

6
app/src/main/java/app/fedilab/android/client/endpoints/MastodonAppsService.java → app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonAppsService.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.endpoints; package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -15,8 +15,8 @@ package app.fedilab.android.client.endpoints;
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
import app.fedilab.android.client.entities.api.App; import app.fedilab.android.mastodon.client.entities.api.App;
import app.fedilab.android.client.entities.api.Token; import app.fedilab.android.mastodon.client.entities.api.Token;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.Field; import retrofit2.http.Field;
import retrofit2.http.FormUrlEncoded; import retrofit2.http.FormUrlEncoded;

4
app/src/main/java/app/fedilab/android/client/endpoints/MastodonFiltersService.java → app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonFiltersService.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.endpoints; package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -17,7 +17,7 @@ package app.fedilab.android.client.endpoints;
import java.util.List; import java.util.List;
import app.fedilab.android.client.entities.api.Filter; import app.fedilab.android.mastodon.client.entities.api.Filter;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.Body; import retrofit2.http.Body;
import retrofit2.http.DELETE; import retrofit2.http.DELETE;

12
app/src/main/java/app/fedilab/android/client/endpoints/MastodonInstanceService.java → app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonInstanceService.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.endpoints; package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -17,11 +17,11 @@ package app.fedilab.android.client.endpoints;
import java.util.List; import java.util.List;
import app.fedilab.android.client.entities.api.Account; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Activity; import app.fedilab.android.mastodon.client.entities.api.Activity;
import app.fedilab.android.client.entities.api.Emoji; import app.fedilab.android.mastodon.client.entities.api.Emoji;
import app.fedilab.android.client.entities.api.Instance; import app.fedilab.android.mastodon.client.entities.api.Instance;
import app.fedilab.android.client.entities.api.Tag; import app.fedilab.android.mastodon.client.entities.api.Tag;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.GET; import retrofit2.http.GET;
import retrofit2.http.Query; import retrofit2.http.Query;

6
app/src/main/java/app/fedilab/android/client/endpoints/MastodonNotificationsService.java → app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonNotificationsService.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.endpoints; package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -16,8 +16,8 @@ package app.fedilab.android.client.endpoints;
import java.util.List; import java.util.List;
import app.fedilab.android.client.entities.api.Notification; import app.fedilab.android.mastodon.client.entities.api.Notification;
import app.fedilab.android.client.entities.api.PushSubscription; import app.fedilab.android.mastodon.client.entities.api.PushSubscription;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.DELETE; import retrofit2.http.DELETE;
import retrofit2.http.Field; import retrofit2.http.Field;

4
app/src/main/java/app/fedilab/android/client/endpoints/MastodonOembedService.java → app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonOembedService.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.endpoints; package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -15,7 +15,7 @@ package app.fedilab.android.client.endpoints;
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
import app.fedilab.android.client.entities.api.Oembed; import app.fedilab.android.mastodon.client.entities.api.Oembed;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.GET; import retrofit2.http.GET;
import retrofit2.http.Query; import retrofit2.http.Query;

4
app/src/main/java/app/fedilab/android/client/endpoints/MastodonSearchService.java → app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonSearchService.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.endpoints; package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -15,7 +15,7 @@ package app.fedilab.android.client.endpoints;
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
import app.fedilab.android.client.entities.api.Results; import app.fedilab.android.mastodon.client.entities.api.Results;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.GET; import retrofit2.http.GET;
import retrofit2.http.Header; import retrofit2.http.Header;

18
app/src/main/java/app/fedilab/android/client/endpoints/MastodonStatusesService.java → app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonStatusesService.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.endpoints; package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -17,14 +17,14 @@ package app.fedilab.android.client.endpoints;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import app.fedilab.android.client.entities.api.Account; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Attachment; import app.fedilab.android.mastodon.client.entities.api.Attachment;
import app.fedilab.android.client.entities.api.Card; import app.fedilab.android.mastodon.client.entities.api.Card;
import app.fedilab.android.client.entities.api.Context; import app.fedilab.android.mastodon.client.entities.api.Context;
import app.fedilab.android.client.entities.api.Poll; import app.fedilab.android.mastodon.client.entities.api.Poll;
import app.fedilab.android.client.entities.api.ScheduledStatus; import app.fedilab.android.mastodon.client.entities.api.ScheduledStatus;
import app.fedilab.android.client.entities.api.Status; import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.client.entities.api.StatusSource; import app.fedilab.android.mastodon.client.entities.api.StatusSource;
import okhttp3.MultipartBody; import okhttp3.MultipartBody;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import retrofit2.Call; import retrofit2.Call;

4
app/src/main/java/app/fedilab/android/client/endpoints/MastodonTagService.java → app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonTagService.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.endpoints; package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -17,7 +17,7 @@ package app.fedilab.android.client.endpoints;
import java.util.List; import java.util.List;
import app.fedilab.android.client.entities.api.Tag; import app.fedilab.android.mastodon.client.entities.api.Tag;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.GET; import retrofit2.http.GET;
import retrofit2.http.Header; import retrofit2.http.Header;

20
app/src/main/java/app/fedilab/android/client/endpoints/MastodonTimelinesService.java → app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonTimelinesService.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.endpoints; package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -16,15 +16,15 @@ package app.fedilab.android.client.endpoints;
import java.util.List; import java.util.List;
import app.fedilab.android.client.entities.api.Account; import app.fedilab.android.mastodon.client.entities.api.Account;
import app.fedilab.android.client.entities.api.Conversation; import app.fedilab.android.mastodon.client.entities.api.Conversation;
import app.fedilab.android.client.entities.api.Marker; import app.fedilab.android.mastodon.client.entities.api.Marker;
import app.fedilab.android.client.entities.api.MastodonList; import app.fedilab.android.mastodon.client.entities.api.MastodonList;
import app.fedilab.android.client.entities.api.Status; import app.fedilab.android.mastodon.client.entities.api.Status;
import app.fedilab.android.client.entities.api.Tag; import app.fedilab.android.mastodon.client.entities.api.Tag;
import app.fedilab.android.client.entities.misskey.MisskeyNote; import app.fedilab.android.mastodon.client.entities.misskey.MisskeyNote;
import app.fedilab.android.client.entities.nitter.Nitter; import app.fedilab.android.mastodon.client.entities.nitter.Nitter;
import app.fedilab.android.client.entities.peertube.PeertubeVideo; import app.fedilab.android.mastodon.client.entities.peertube.PeertubeVideo;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.Body; import retrofit2.http.Body;
import retrofit2.http.DELETE; import retrofit2.http.DELETE;

2
app/src/main/java/app/fedilab/android/client/endpoints/PleromaAPI.java → app/src/main/java/app/fedilab/android/mastodon/client/endpoints/PleromaAPI.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.endpoints; package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/endpoints/ProgressRequestBody.java → app/src/main/java/app/fedilab/android/mastodon/client/endpoints/ProgressRequestBody.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.endpoints; package app.fedilab.android.mastodon.client.endpoints;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

4
app/src/main/java/app/fedilab/android/client/entities/api/Account.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Account.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -29,7 +29,7 @@ import java.util.Date;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import app.fedilab.android.helper.SpannableHelper; import app.fedilab.android.mastodon.helper.SpannableHelper;
public class Account implements Serializable { public class Account implements Serializable {

2
app/src/main/java/app/fedilab/android/client/entities/api/Accounts.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Accounts.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/Activity.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Activity.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

4
app/src/main/java/app/fedilab/android/client/entities/api/Announcement.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Announcement.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -24,7 +24,7 @@ import java.lang.ref.WeakReference;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import app.fedilab.android.helper.SpannableHelper; import app.fedilab.android.mastodon.helper.SpannableHelper;
public class Announcement { public class Announcement {
@SerializedName("id") @SerializedName("id")

2
app/src/main/java/app/fedilab/android/client/entities/api/App.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/App.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

23
app/src/main/java/app/fedilab/android/client/entities/api/Attachment.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Attachment.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -56,6 +56,16 @@ public class Attachment implements Serializable {
public String translation = null; public String translation = null;
public transient Status status = null; public transient Status status = null;
@Override
public boolean equals(@Nullable Object obj) {
boolean same = false;
if (obj instanceof Attachment && ((Attachment) obj).id != null && this.id != null) {
same = this.id.equals(((Attachment) obj).id);
return same;
} else return super.equals(obj);
}
public static class Meta implements Serializable { public static class Meta implements Serializable {
@SerializedName("focus") @SerializedName("focus")
public Focus focus; public Focus focus;
@ -83,15 +93,4 @@ public class Attachment implements Serializable {
public float aspect; public float aspect;
} }
@Override
public boolean equals(@Nullable Object obj) {
boolean same = false;
if (obj instanceof Attachment && ((Attachment) obj).id != null && this.id != null) {
same = this.id.equals(((Attachment) obj).id);
return same;
} else return super.equals(obj);
}
} }

2
app/src/main/java/app/fedilab/android/client/entities/api/Card.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Card.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/Context.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Context.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/Conversation.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Conversation.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;

2
app/src/main/java/app/fedilab/android/client/entities/api/Conversations.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Conversations.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/Domains.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Domains.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/Emoji.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Emoji.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

4
app/src/main/java/app/fedilab/android/client/entities/api/EmojiInstance.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/EmojiInstance.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -27,7 +27,7 @@ import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import app.fedilab.android.exception.DBException; import app.fedilab.android.mastodon.exception.DBException;
import app.fedilab.android.sqlite.Sqlite; import app.fedilab.android.sqlite.Sqlite;

2
app/src/main/java/app/fedilab/android/client/entities/api/Error.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Error.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/FamiliarFollowers.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/FamiliarFollowers.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/FeaturedTag.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/FeaturedTag.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

4
app/src/main/java/app/fedilab/android/client/entities/api/Field.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Field.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -28,7 +28,7 @@ import java.lang.ref.WeakReference;
import java.util.Date; import java.util.Date;
import app.fedilab.android.R; import app.fedilab.android.R;
import app.fedilab.android.helper.SpannableHelper; import app.fedilab.android.mastodon.helper.SpannableHelper;
public class Field implements Serializable { public class Field implements Serializable {
@SerializedName("name") @SerializedName("name")

2
app/src/main/java/app/fedilab/android/client/entities/api/Filter.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Filter.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/app/fedilab/android/client/entities/api/History.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/History.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/app/fedilab/android/client/entities/api/IdentityProof.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/IdentityProof.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/app/fedilab/android/client/entities/api/Instance.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Instance.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

4
app/src/main/java/app/fedilab/android/client/entities/api/InstanceInfo.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/InstanceInfo.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -24,7 +24,7 @@ import com.google.gson.annotations.SerializedName;
import java.io.Serializable; import java.io.Serializable;
import app.fedilab.android.exception.DBException; import app.fedilab.android.mastodon.exception.DBException;
import app.fedilab.android.sqlite.Sqlite; import app.fedilab.android.sqlite.Sqlite;

2
app/src/main/java/app/fedilab/android/client/entities/api/JoinMastodonInstance.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/JoinMastodonInstance.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/Marker.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Marker.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/MastodonList.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/MastodonList.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/Mention.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Mention.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/Notification.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Notification.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/Notifications.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Notifications.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/Oembed.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Oembed.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/Pagination.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Pagination.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/Pleroma.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Pleroma.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2022 Thomas Schneider /* Copyright 2022 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

4
app/src/main/java/app/fedilab/android/client/entities/api/Poll.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Poll.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab
@ -25,7 +25,7 @@ import java.lang.ref.WeakReference;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import app.fedilab.android.helper.SpannableHelper; import app.fedilab.android.mastodon.helper.SpannableHelper;
public class Poll implements Serializable { public class Poll implements Serializable {

2
app/src/main/java/app/fedilab/android/client/entities/api/Preferences.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Preferences.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;

2
app/src/main/java/app/fedilab/android/client/entities/api/PushSubscription.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/PushSubscription.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/Reaction.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Reaction.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

2
app/src/main/java/app/fedilab/android/client/entities/api/RelationShip.java → app/src/main/java/app/fedilab/android/mastodon/client/entities/api/RelationShip.java
Unescape View File

@ -1,4 +1,4 @@
package app.fedilab.android.client.entities.api; package app.fedilab.android.mastodon.client.entities.api;
/* Copyright 2021 Thomas Schneider /* Copyright 2021 Thomas Schneider
* *
* This file is a part of Fedilab * This file is a part of Fedilab

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save