diff options
Diffstat (limited to 'app/src/main/java/app/fedilab/android/mastodon/activities')
8 files changed, 38 insertions, 20 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java index 57bfb2460..1816d881a 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java @@ -49,7 +49,7 @@ import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import androidx.preference.PreferenceManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.work.Data; diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java index 2e76069db..a69aa8c37 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java @@ -32,7 +32,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.lifecycle.ViewModelProvider; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.bumptech.glide.Glide; import com.google.android.material.dialog.MaterialAlertDialogBuilder; @@ -43,6 +43,7 @@ import java.util.List; import java.util.Locale; import app.fedilab.android.BaseMainActivity; +import app.fedilab.android.BuildConfig; import app.fedilab.android.R; import app.fedilab.android.databinding.AccountFieldItemBinding; import app.fedilab.android.databinding.ActivityEditProfileBinding; @@ -270,7 +271,8 @@ public class EditProfileActivity extends BaseBarActivity { b.putSerializable(Helper.ARG_ACCOUNT, account); Intent intentBD = new Intent(Helper.BROADCAST_DATA); intentBD.putExtras(b); - LocalBroadcastManager.getInstance(EditProfileActivity.this).sendBroadcast(intentBD); + intentBD.setPackage(BuildConfig.APPLICATION_ID); + sendBroadcast(intentBD); } private Intent prepareIntent() { diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java index ab93056b3..83ac74a5a 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/HashTagActivity.java @@ -28,7 +28,7 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; import androidx.lifecycle.ViewModelProvider; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.google.android.material.dialog.MaterialAlertDialogBuilder; @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.List; import app.fedilab.android.BaseMainActivity; +import app.fedilab.android.BuildConfig; import app.fedilab.android.R; import app.fedilab.android.activities.MainActivity; import app.fedilab.android.databinding.ActivityHashtagBinding; @@ -192,7 +193,8 @@ public class HashTagActivity extends BaseActivity { b.putBoolean(Helper.RECEIVE_REDRAW_TOPBAR, true); Intent intentBD = new Intent(Helper.BROADCAST_DATA); intentBD.putExtras(b); - LocalBroadcastManager.getInstance(HashTagActivity.this).sendBroadcast(intentBD); + intentBD.setPackage(BuildConfig.APPLICATION_ID); + sendBroadcast(intentBD); dialog.dismiss(); }); unpinConfirm.show(); @@ -246,7 +248,8 @@ public class HashTagActivity extends BaseActivity { b.putBoolean(Helper.RECEIVE_REDRAW_TOPBAR, true); Intent intentBD = new Intent(Helper.BROADCAST_DATA); intentBD.putExtras(b); - LocalBroadcastManager.getInstance(HashTagActivity.this).sendBroadcast(intentBD); + intentBD.setPackage(BuildConfig.APPLICATION_ID); + sendBroadcast(intentBD); pinnedTag = true; invalidateOptionsMenu(); } catch (DBException e) { diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/MastodonListActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/MastodonListActivity.java index a5cf710d5..4b2fa6cc9 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/MastodonListActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/MastodonListActivity.java @@ -30,7 +30,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProvider; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -41,6 +41,7 @@ import java.util.Collections; import java.util.List; import app.fedilab.android.BaseMainActivity; +import app.fedilab.android.BuildConfig; import app.fedilab.android.R; import app.fedilab.android.activities.MainActivity; import app.fedilab.android.databinding.ActivityListBinding; @@ -290,7 +291,8 @@ public class MastodonListActivity extends BaseBarActivity implements MastodonLis Intent intentBD = new Intent(Helper.BROADCAST_DATA); b.putSerializable(Helper.RECEIVE_MASTODON_LIST, mastodonListList); intentBD.putExtras(b); - LocalBroadcastManager.getInstance(MastodonListActivity.this).sendBroadcast(intentBD); + intentBD.setPackage(BuildConfig.APPLICATION_ID); + sendBroadcast(intentBD); }); alt_bld.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss()); AlertDialog alert = alt_bld.create(); @@ -325,7 +327,8 @@ public class MastodonListActivity extends BaseBarActivity implements MastodonLis Intent intentBD = new Intent(Helper.BROADCAST_DATA); b.putSerializable(Helper.RECEIVE_MASTODON_LIST, mastodonListList); intentBD.putExtras(b); - LocalBroadcastManager.getInstance(MastodonListActivity.this).sendBroadcast(intentBD); + intentBD.setPackage(BuildConfig.APPLICATION_ID); + sendBroadcast(intentBD); }); dialog.dismiss(); } else { @@ -372,7 +375,8 @@ public class MastodonListActivity extends BaseBarActivity implements MastodonLis b.putBoolean(Helper.RECEIVE_REDRAW_TOPBAR, true); Intent intentBD = new Intent(Helper.BROADCAST_DATA); intentBD.putExtras(b); - LocalBroadcastManager.getInstance(MastodonListActivity.this).sendBroadcast(intentBD); + intentBD.setPackage(BuildConfig.APPLICATION_ID); + sendBroadcast(intentBD); } catch ( DBException e) { e.printStackTrace(); diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java index 5e293f143..e2ac02e87 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/ProfileActivity.java @@ -57,7 +57,7 @@ import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityOptionsCompat; import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import androidx.preference.PreferenceManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -79,6 +79,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import app.fedilab.android.BaseMainActivity; +import app.fedilab.android.BuildConfig; import app.fedilab.android.R; import app.fedilab.android.activities.MainActivity; import app.fedilab.android.databinding.ActivityProfileBinding; @@ -904,7 +905,8 @@ public class ProfileActivity extends BaseActivity { b.putBoolean(Helper.RECEIVE_REDRAW_TOPBAR, true); Intent intentBD = new Intent(Helper.BROADCAST_DATA); intentBD.putExtras(b); - LocalBroadcastManager.getInstance(ProfileActivity.this).sendBroadcast(intentBD); + intentBD.setPackage(BuildConfig.APPLICATION_ID); + sendBroadcast(intentBD); }); } catch (DBException e) { e.printStackTrace(); diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/ReorderTimelinesActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/ReorderTimelinesActivity.java index de89f1e3b..a0cdd2673 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/ReorderTimelinesActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/ReorderTimelinesActivity.java @@ -31,7 +31,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.lifecycle.ViewModelProvider; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import androidx.preference.PreferenceManager; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; @@ -43,6 +43,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.concurrent.TimeUnit; +import app.fedilab.android.BuildConfig; import app.fedilab.android.R; import app.fedilab.android.activities.MainActivity; import app.fedilab.android.databinding.ActivityReorderTabsBinding; @@ -288,7 +289,8 @@ public class ReorderTimelinesActivity extends BaseBarActivity implements OnStart b.putBoolean(Helper.RECEIVE_REDRAW_TOPBAR, true); Intent intentBD = new Intent(Helper.BROADCAST_DATA); intentBD.putExtras(b); - LocalBroadcastManager.getInstance(ReorderTimelinesActivity.this).sendBroadcast(intentBD); + intentBD.setPackage(BuildConfig.APPLICATION_ID); + sendBroadcast(intentBD); }); } else { runOnUiThread(() -> Toasty.warning(ReorderTimelinesActivity.this, getString(R.string.toast_instance_unavailable), Toast.LENGTH_LONG).show()); @@ -376,14 +378,16 @@ public class ReorderTimelinesActivity extends BaseBarActivity implements OnStart b.putBoolean(Helper.RECEIVE_REDRAW_TOPBAR, true); Intent intentBD = new Intent(Helper.BROADCAST_DATA); intentBD.putExtras(b); - LocalBroadcastManager.getInstance(ReorderTimelinesActivity.this).sendBroadcast(intentBD); + intentBD.setPackage(BuildConfig.APPLICATION_ID); + sendBroadcast(intentBD); } if (bottomChanges) { Bundle b = new Bundle(); b.putBoolean(Helper.RECEIVE_REDRAW_BOTTOM, true); Intent intentBD = new Intent(Helper.BROADCAST_DATA); intentBD.putExtras(b); - LocalBroadcastManager.getInstance(ReorderTimelinesActivity.this).sendBroadcast(intentBD); + intentBD.setPackage(BuildConfig.APPLICATION_ID); + sendBroadcast(intentBD); } } diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminActionActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminActionActivity.java index aa82c40a3..2349e3a94 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminActionActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminActionActivity.java @@ -33,7 +33,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminDomainBlockActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminDomainBlockActivity.java index 3b579c399..4257961c2 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminDomainBlockActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/admin/AdminDomainBlockActivity.java @@ -26,10 +26,11 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.lifecycle.ViewModelProvider; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import app.fedilab.android.BuildConfig; import app.fedilab.android.R; import app.fedilab.android.activities.MainActivity; import app.fedilab.android.databinding.ActivityAdminDomainblockBinding; @@ -108,7 +109,8 @@ public class AdminDomainBlockActivity extends BaseBarActivity { Toasty.error(AdminDomainBlockActivity.this, getString(R.string.toast_error), Toasty.LENGTH_SHORT).show(); } Intent intent = new Intent(Helper.BROADCAST_DATA).putExtra(Helper.ARG_ADMIN_DOMAINBLOCK, adminDomainBlockResult); - LocalBroadcastManager.getInstance(AdminDomainBlockActivity.this).sendBroadcast(intent); + intent.setPackage(BuildConfig.APPLICATION_ID); + sendBroadcast(intent); finish(); } ); @@ -136,7 +138,8 @@ public class AdminDomainBlockActivity extends BaseBarActivity { adminVM.deleteDomain(MainActivity.currentInstance, MainActivity.currentToken, adminDomainBlock.id) .observe(AdminDomainBlockActivity.this, adminDomainBlockResult -> { Intent intent = new Intent(Helper.BROADCAST_DATA).putExtra(Helper.ARG_ADMIN_DOMAINBLOCK_DELETE, adminDomainBlock); - LocalBroadcastManager.getInstance(AdminDomainBlockActivity.this).sendBroadcast(intent); + intent.setPackage(BuildConfig.APPLICATION_ID); + sendBroadcast(intent); finish(); } ); |