Fix issue #317 (b60780bc) · Commits · Android-smartphones / Fedilab

app/src/main/AndroidManifest.xml

+0 −32

Original line number	Diff line number	Diff line
		@@ -55,7 +55,6 @@
		<activity
		android:exported="true"
		android:name=".activities.LoginActivity"
		android:noHistory="true"
		android:configChanges="orientation\|screenSize"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		@@ -76,47 +75,37 @@
		android:configChanges="keyboardHidden\|orientation\|screenSize" />
		<activity
		android:name=".activities.DraftActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize" />
		<activity
		android:name=".imageeditor.EditImageActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize" />
		<activity
		android:name=".activities.ComposeActivity"
		android:noHistory="true"
		android:configChanges="orientation\|screenSize"
		android:label="@string/compose" />
		<activity
		android:name=".activities.StatusInfoActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize" />
		<activity
		android:name=".activities.FollowRequestActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize" />
		<activity
		android:name=".activities.WebviewActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize" />
		<activity
		android:name=".activities.ProfileActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:label="@string/account" />
		<activity
		android:name=".activities.AdminAccountActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:label="@string/account" />
		<activity
		android:name=".activities.ScheduledActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:label="@string/scheduled" />
		<activity
		android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
		android:noHistory="true"
		android:theme="@style/Base.Theme.AppCompat" />

		<service
		@@ -125,123 +114,102 @@

		<activity
		android:name=".activities.SearchResultTabActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:theme="@style/AppThemeBar"
		android:label="@string/search" />
		<activity
		android:name=".activities.TrendsActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:label="@string/trending"
		android:theme="@style/AppThemeBar" />
		<activity
		android:name=".activities.ReorderTimelinesActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:label="@string/reorder_timelines"
		android:theme="@style/AppThemeBar" />
		<activity
		android:name=".activities.AboutActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:label="@string/action_about"
		android:theme="@style/AppThemeBar" />

		<activity
		android:name=".activities.PartnerShipActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:label="@string/action_about"
		android:theme="@style/AppThemeBar" />
		<activity
		android:name=".activities.ActionActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:label="@string/interactions"
		android:theme="@style/AppThemeBar" />
		<activity
		android:name=".activities.AdminActionActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:label="@string/administration"
		android:theme="@style/AppThemeBar" />
		<activity
		android:name=".activities.MastodonListActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:label="@string/action_lists"
		android:theme="@style/AppThemeBar" />
		<activity
		android:name=".activities.SettingsActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:label="@string/settings"
		android:theme="@style/AppThemeBar" />
		<activity
		android:name=".activities.InstanceActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:label="@string/action_about_instance"
		android:theme="@style/DialogDark" />
		<activity
		android:name=".activities.InstanceProfileActivity"
		android:noHistory="true"
		android:excludeFromRecents="true"
		android:theme="@style/DialogDark" />
		<activity
		android:name=".activities.ProxyActivity"
		android:noHistory="true"
		android:excludeFromRecents="true"
		android:theme="@style/DialogDark" />
		<activity
		android:name=".activities.HashTagActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize" />
		<activity
		android:name=".activities.AnnouncementActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize" />
		<activity
		android:name=".activities.MediaActivity"
		android:noHistory="true"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:theme="@style/TransparentDark" />

		<activity
		android:name=".activities.InstanceHealthActivity"
		android:noHistory="true"
		android:excludeFromRecents="true"
		android:theme="@style/DialogDark" />

		<activity
		android:name=".activities.ReportActivity"
		android:noHistory="true"
		android:theme="@style/AppThemeBarDark"
		android:windowSoftInputMode="stateVisible" />

		<activity
		android:name=".activities.CustomSharingActivity"
		android:noHistory="true"
		android:label="@string/settings_title_custom_sharing"
		android:windowSoftInputMode="stateVisible"
		android:theme="@style/AppThemeBarDark" />
		<activity
		android:name=".activities.FilterActivity"
		android:noHistory="true"
		android:label="@string/filters"
		android:theme="@style/AppThemeBarDark"
		android:windowSoftInputMode="stateVisible" />
		<activity
		android:name=".activities.EditProfileActivity"
		android:noHistory="true"
		android:label="@string/edit_profile"
		android:theme="@style/AppThemeBarDark"
		android:windowSoftInputMode="stateVisible" />

		<activity
		android:name=".activities.CacheActivity"
		android:noHistory="true"
		android:label="@string/action_cache"
		android:theme="@style/AppThemeBarDark" />

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

+69 −57

Original line number	Diff line number	Diff line
		@@ -665,7 +665,7 @@ public class ProfileActivity extends BaseActivity {
		int itemId = item.getItemId();
		String[] splitAcct = account.acct.split("@");
		SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(ProfileActivity.this);
		AlertDialog.Builder builderInner;
		AlertDialog.Builder builderInner = null;
		final boolean isOwner = account.id.compareToIgnoreCase(BaseMainActivity.currentUserID) == 0;
		final String[] stringArrayConf;
		if (isOwner) {
		@@ -882,6 +882,8 @@ public class ProfileActivity extends BaseActivity {
		startActivity(intent);
		return true;
		} else if (itemId == R.id.action_mute) {

		if (relationship != null) {
		if (relationship.muting) {
		builderInner = new AlertDialog.Builder(ProfileActivity.this, Helper.dialogStyle());
		builderInner.setTitle(stringArrayConf[4]);
		@@ -891,6 +893,10 @@ public class ProfileActivity extends BaseActivity {
		builderInner.setTitle(stringArrayConf[0]);
		doActionAccount = action.MUTE;
		}
		} else {
		doActionAccount = action.NOTHING;
		}

		} else if (itemId == R.id.action_report) {
		builderInner = new AlertDialog.Builder(ProfileActivity.this, Helper.dialogStyle());
		builderInner.setTitle(R.string.report_account);
		@@ -913,6 +919,7 @@ public class ProfileActivity extends BaseActivity {
		return true;
		} else if (itemId == R.id.action_block) {
		builderInner = new AlertDialog.Builder(ProfileActivity.this, Helper.dialogStyle());
		if (relationship != null) {
		if (relationship.blocking) {
		builderInner.setTitle(stringArrayConf[5]);
		doActionAccount = action.UNBLOCK;
		@@ -920,6 +927,9 @@ public class ProfileActivity extends BaseActivity {
		builderInner.setTitle(stringArrayConf[1]);
		doActionAccount = action.BLOCK;
		}
		} else {
		doActionAccount = action.NOTHING;
		}
		} else if (itemId == R.id.action_block_instance) {
		builderInner = new AlertDialog.Builder(ProfileActivity.this, Helper.dialogStyle());
		doActionAccount = action.BLOCK_DOMAIN;
		@@ -928,6 +938,7 @@ public class ProfileActivity extends BaseActivity {
		} else {
		return true;
		}
		if (doAction != action.NOTHING && builderInner != null) {
		builderInner.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
		builderInner.setPositiveButton(R.string.yes, (dialog, which) -> {
		String target;
		@@ -972,6 +983,7 @@ public class ProfileActivity extends BaseActivity {
		dialog.dismiss();
		});
		builderInner.show();
		}
		return true;
		}