Commit e9571221 authored by Thomas's avatar Thomas
Browse files

Changes

parent f2799e93

app/build.gradle

+9 −0
Original line number Diff line number Diff line
@@ -63,6 +63,15 @@ android { 
            java.srcDirs = ['src/main/java', 'src/fdroid/java']

            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 {

        all {

app/src/main/AndroidManifest.xml

+38 −38
Original line number Diff line number Diff line
@@ -168,49 +168,49 @@ 
            </intent-filter>

        </activity>

        <activity

            android:name=".activities.StatusHistoryActivity"

            android:name=".mastodon.activities.StatusHistoryActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/status_history"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.ContextActivity"

            android:name=".mastodon.activities.ContextActivity"

            android:configChanges="keyboardHidden|orientation|screenSize" />

        <activity

            android:name=".activities.DraftActivity"

            android:name=".mastodon.activities.DraftActivity"

            android:configChanges="keyboardHidden|orientation|screenSize" />

        <activity

            android:name=".imageeditor.EditImageActivity"

            android:name=".mastodon.imageeditor.EditImageActivity"

            android:configChanges="keyboardHidden|orientation|screenSize" />

        <activity

            android:name=".activities.ComposeActivity"

            android:name=".mastodon.activities.ComposeActivity"

            android:configChanges="orientation|screenSize"

            android:label="@string/compose" />

        <activity

            android:name=".activities.StatusInfoActivity"

            android:name=".mastodon.activities.StatusInfoActivity"

            android:configChanges="keyboardHidden|orientation|screenSize" />

        <activity

            android:name=".activities.FollowRequestActivity"

            android:name=".mastodon.activities.FollowRequestActivity"

            android:configChanges="keyboardHidden|orientation|screenSize" />

        <activity

            android:name=".activities.ProfileActivity"

            android:name=".mastodon.activities.ProfileActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/account" />

        <activity

            android:name=".activities.admin.AdminAccountActivity"

            android:name=".mastodon.activities.admin.AdminAccountActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/account" />

        <activity

            android:name=".activities.AccountReportActivity"

            android:name=".mastodon.activities.AccountReportActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/account"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.admin.AdminReportActivity"

            android:name=".mastodon.activities.admin.AdminReportActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/report"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.ScheduledActivity"

            android:name=".mastodon.activities.ScheduledActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/scheduled" />

        <activity
@@ -219,17 +219,17 @@ 




        <activity

            android:name=".activities.SearchResultTabActivity"

            android:name=".mastodon.activities.SearchResultTabActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/search"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.TrendsActivity"

            android:name=".mastodon.activities.TrendsActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/trending"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.ReorderTimelinesActivity"

            android:name=".mastodon.activities.ReorderTimelinesActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/reorder_timelines"

            android:theme="@style/AppThemeBar" />
@@ -240,102 +240,102 @@ 
            android:theme="@style/AppThemeBar" />



        <activity

            android:name=".activities.admin.AdminDomainBlockActivity"

            android:name=".mastodon.activities.admin.AdminDomainBlockActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/blocked_domains"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.SuggestionActivity"

            android:name=".mastodon.activities.SuggestionActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/Suggestions"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.DirectoryActivity"

            android:name=".mastodon.activities.DirectoryActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/Directory"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.PartnerShipActivity"

            android:name=".mastodon.activities.PartnerShipActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/action_about"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.ActionActivity"

            android:name=".mastodon.activities.ActionActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/interactions"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.admin.AdminActionActivity"

            android:name=".mastodon.activities.admin.AdminActionActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/administration"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.MastodonListActivity"

            android:name=".mastodon.activities.MastodonListActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/action_lists"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.FollowedTagActivity"

            android:name=".mastodon.activities.FollowedTagActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/followed_tags"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.SettingsActivity"

            android:name=".mastodon.activities.SettingsActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/settings"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.InstanceActivity"

            android:name=".mastodon.activities.InstanceActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/action_about_instance"

            android:theme="@style/AppThemeAlertDialog" />

        <activity

            android:name=".activities.InstanceProfileActivity"

            android:name=".mastodon.activities.InstanceProfileActivity"

            android:excludeFromRecents="true"

            android:theme="@style/AppThemeAlertDialog" />

        <activity

            android:name=".activities.ProxyActivity"

            android:name=".mastodon.activities.ProxyActivity"

            android:excludeFromRecents="true"

            android:theme="@style/AppThemeAlertDialog" />

        <activity

            android:name=".activities.HashTagActivity"

            android:name=".mastodon.activities.HashTagActivity"

            android:configChanges="keyboardHidden|orientation|screenSize" />

        <activity

            android:name=".activities.AnnouncementActivity"

            android:name=".mastodon.activities.AnnouncementActivity"

            android:configChanges="keyboardHidden|orientation|screenSize" />

        <activity

            android:name=".activities.MediaActivity"

            android:name=".mastodon.activities.MediaActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:theme="@style/Transparent" />



        <activity

            android:name=".activities.InstanceHealthActivity"

            android:name=".mastodon.activities.InstanceHealthActivity"

            android:excludeFromRecents="true"

            android:theme="@style/AppThemeAlertDialog" />



        <activity

            android:name=".activities.ReportActivity"

            android:name=".mastodon.activities.ReportActivity"

            android:theme="@style/AppThemeBar"

            android:windowSoftInputMode="stateVisible" />



        <activity

            android:name=".activities.CustomSharingActivity"

            android:name=".mastodon.activities.CustomSharingActivity"

            android:label="@string/settings_title_custom_sharing"

            android:theme="@style/AppThemeBar"

            android:windowSoftInputMode="stateVisible" />

        <activity

            android:name=".activities.FilterActivity"

            android:name=".mastodon.activities.FilterActivity"

            android:label="@string/filters"

            android:theme="@style/AppThemeBar"

            android:windowSoftInputMode="stateVisible" />

        <activity

            android:name=".activities.EditProfileActivity"

            android:name=".mastodon.activities.EditProfileActivity"

            android:label="@string/edit_profile"

            android:theme="@style/AppThemeBar"

            android:windowSoftInputMode="stateVisible" />



        <activity

            android:name=".activities.CacheActivity"

            android:name=".mastodon.activities.CacheActivity"

            android:label="@string/action_cache"

            android:theme="@style/AppThemeBar" />
@@ -350,7 +350,7 @@ 
        </provider>



        <receiver

            android:name=".broadcastreceiver.ToastMessage"

            android:name=".mastodon.broadcastreceiver.ToastMessage"

            android:exported="false">

            <intent-filter>

                <action android:name="RECEIVE_TOAST_MESSAGE" />
@@ -358,7 +358,7 @@ 
        </receiver>



        <receiver

            android:name=".services.CustomReceiver"

            android:name=".mastodon.services.CustomReceiver"

            android:enabled="true"

            android:exported="true">

            <intent-filter>

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+70 −70
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ package app.fedilab.android; 


import static app.fedilab.android.BaseMainActivity.status.DISCONNECTED;

import static app.fedilab.android.BaseMainActivity.status.UNKNOWN;

import static app.fedilab.android.helper.CacheHelper.deleteDir;

import static app.fedilab.android.helper.Helper.PREF_USER_TOKEN;

import static app.fedilab.android.helper.Helper.displayReleaseNotesIfNeeded;

import static app.fedilab.android.ui.drawer.StatusAdapter.sendAction;

import static app.fedilab.android.mastodon.helper.CacheHelper.deleteDir;

import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_TOKEN;

import static app.fedilab.android.mastodon.helper.Helper.displayReleaseNotesIfNeeded;

import static app.fedilab.android.mastodon.ui.drawer.StatusAdapter.sendAction;



import android.Manifest;

import android.annotation.SuppressLint;
@@ -104,69 +104,69 @@ import java.util.regex.Matcher; 
import java.util.regex.Pattern;



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.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.NavHeaderMainBinding;

import app.fedilab.android.exception.DBException;

import app.fedilab.android.helper.CrossActionHelper;

import app.fedilab.android.helper.Helper;

import app.fedilab.android.helper.MastodonHelper;

import app.fedilab.android.helper.PinnedTimelineHelper;

import app.fedilab.android.helper.PushHelper;

import app.fedilab.android.ui.drawer.AccountsSearchTopBarAdapter;

import app.fedilab.android.ui.drawer.TagSearchTopBarAdapter;

import app.fedilab.android.ui.fragment.timeline.FragmentMastodonConversation;

import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline;

import app.fedilab.android.ui.fragment.timeline.FragmentNotificationContainer;

import app.fedilab.android.viewmodel.mastodon.AccountsVM;

import app.fedilab.android.viewmodel.mastodon.FiltersVM;

import app.fedilab.android.viewmodel.mastodon.InstancesVM;

import app.fedilab.android.viewmodel.mastodon.SearchVM;

import app.fedilab.android.viewmodel.mastodon.TimelinesVM;

import app.fedilab.android.viewmodel.mastodon.TopBarVM;

import app.fedilab.android.mastodon.activities.ActionActivity;

import app.fedilab.android.mastodon.activities.AnnouncementActivity;

import app.fedilab.android.mastodon.activities.BaseActivity;

import app.fedilab.android.mastodon.activities.CacheActivity;

import app.fedilab.android.mastodon.activities.ComposeActivity;

import app.fedilab.android.mastodon.activities.ContextActivity;

import app.fedilab.android.mastodon.activities.DirectoryActivity;

import app.fedilab.android.mastodon.activities.DraftActivity;

import app.fedilab.android.mastodon.activities.FilterActivity;

import app.fedilab.android.mastodon.activities.FollowRequestActivity;

import app.fedilab.android.mastodon.activities.FollowedTagActivity;

import app.fedilab.android.mastodon.activities.InstanceActivity;

import app.fedilab.android.mastodon.activities.InstanceHealthActivity;

import app.fedilab.android.mastodon.activities.MastodonListActivity;

import app.fedilab.android.mastodon.activities.PartnerShipActivity;

import app.fedilab.android.mastodon.activities.ProfileActivity;

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 okhttp3.Call;

import okhttp3.Callback;
@@ -186,7 +186,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
    public static status networkAvailable = UNKNOWN;

    public static Instance instanceInfo;

    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 show_boosts, show_replies, show_dms, show_art_nsfw;

    public static String regex_home, regex_local, regex_public;
@@ -615,10 +615,10 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                        .client(okHttpClient)

                        .build();

                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) {

                    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()) {

                            currentAccount.mastodon_account = accountResponse.body();

                        }
@@ -818,7 +818,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                                binding.toolbarSearch.setSuggestionsAdapter(cursorAdapter);

                                new Thread(() -> {

                                    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

                                                .with(BaseMainActivity.this.getApplicationContext())

                                                .load(account.avatar_static)
@@ -1047,7 +1047,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                    }



                    @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

                            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
@@ -1291,7 +1291,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                            }



                            @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) {

                                    Intent intent = new Intent(BaseMainActivity.this, ProfileActivity.class);

                                    Bundle b = new Bundle();

app/src/main/java/app/fedilab/android/MainApplication.java

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import org.acra.config.DialogConfigurationBuilder; 
import org.acra.config.MailSenderConfigurationBuilder;

import org.acra.data.StringFormat;



import app.fedilab.android.helper.ThemeHelper;

import app.fedilab.android.mastodon.helper.ThemeHelper;

import es.dmoral.toasty.Toasty;
@@ -42,6 +42,7 @@ public class MainApplication extends MultiDexApplication { 


    private static MainApplication app;

    private WebView webView;



    public static MainApplication getApp() {

        return app;

    }

app/src/main/java/app/fedilab/android/activities/AboutActivity.java

+8 −6
Original line number Diff line number Diff line
@@ -31,13 +31,15 @@ import java.util.List; 
import app.fedilab.android.BaseMainActivity;

import app.fedilab.android.BuildConfig;

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.helper.CrossActionHelper;

import app.fedilab.android.helper.Helper;

import app.fedilab.android.helper.MastodonHelper;

import app.fedilab.android.viewmodel.mastodon.AccountsVM;

import app.fedilab.android.mastodon.activities.BaseBarActivity;

import app.fedilab.android.mastodon.activities.ProfileActivity;

import app.fedilab.android.mastodon.client.entities.api.Account;

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 {