cache (60b48c59) · Commits · Android-smartphones / Fedilab

app/src/main/AndroidManifest.xml

+9 −9

Original line number	Diff line number	Diff line
		@@ -13,16 +13,15 @@

		<application
		android:name=".MainApplication"
		tools:replace="android:allowBackup"
		android:allowBackup="false"
		android:configChanges="orientation\|screenSize"
		android:icon="@mipmap/ic_launcher"
		android:usesCleartextTraffic="true"
		android:label="@string/app_name"
		android:configChanges="orientation\|screenSize"
		android:roundIcon="@mipmap/ic_launcher_round"
		android:supportsRtl="true"
		android:theme="@style/AppThemeDark"
		>
		android:usesCleartextTraffic="true"
		tools:replace="android:allowBackup">
		<activity
		android:name=".activities.MainActivity"
		android:configChanges="orientation\|screenSize\|keyboardHidden\|screenLayout\|smallestScreenSize"
		@@ -53,12 +52,13 @@
		</activity>

		<activity
		android:exported="true"
		android:name=".activities.LoginActivity"
		android:configChanges="orientation\|screenSize"
		android:exported="true"
		android:windowSoftInputMode="stateAlwaysHidden">
		<intent-filter>
		<action android:name="android.intent.action.VIEW" />

		<category android:name="android.intent.category.DEFAULT" />
		<category android:name="android.intent.category.BROWSABLE" />

		@@ -112,8 +112,8 @@
		<activity
		android:name=".activities.SearchResultTabActivity"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:theme="@style/AppThemeBar"
		android:label="@string/search" />
		android:label="@string/search"
		android:theme="@style/AppThemeBar" />
		<activity
		android:name=".activities.TrendsActivity"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		@@ -192,8 +192,8 @@
		<activity
		android:name=".activities.CustomSharingActivity"
		android:label="@string/settings_title_custom_sharing"
		android:windowSoftInputMode="stateVisible"
		android:theme="@style/AppThemeBarDark" />
		android:theme="@style/AppThemeBarDark"
		android:windowSoftInputMode="stateVisible" />
		<activity
		android:name=".activities.FilterActivity"
		android:label="@string/filters"

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -164,8 +164,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		Fragment currentFragment;
		private AppBarConfiguration mAppBarConfiguration;
		private ActivityMainBinding binding;
		private Pinned pinned;
		private BottomMenu bottomMenu;
		private final BroadcastReceiver broadcast_error_message = new BroadcastReceiver() {
		@Override
		public void onReceive(android.content.Context context, Intent intent) {
		@@ -192,7 +190,8 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		}
		}
		};

		private Pinned pinned;
		private BottomMenu bottomMenu;
		private final BroadcastReceiver broadcast_data = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {

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

+27 −32

Original line number	Diff line number	Diff line
		@@ -163,6 +163,33 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
		return 3;
		}

		private static String visibilityToString(int visibility) {
		switch (visibility) {
		case 3:
		return "public";
		case 2:
		return "unlisted";
		case 1:
		return "private";
		case 0:
		return "direct";
		}
		return "public";
		}

		public static String getVisibility(String defaultVisibility) {
		int tootVisibility = visibilityToNumber(defaultVisibility);
		if (currentAccount != null && currentAccount.mastodon_account != null && currentAccount.mastodon_account.source != null) {
		int userVisibility = visibilityToNumber(currentAccount.mastodon_account.source.privacy);
		if (tootVisibility > userVisibility) {
		return visibilityToString(userVisibility);
		} else {
		return visibilityToString(tootVisibility);
		}
		}
		return defaultVisibility;
		}

		@Override
		protected void onDestroy() {
		super.onDestroy();
		@@ -227,7 +254,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
		binding.recyclerView.scrollToPosition(composeAdapter.getItemCount() - 1);
		}


		/**
		* Intialize the common view for the context
		*
		@@ -253,7 +279,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
		binding.recyclerView.scrollToPosition(composeAdapter.getItemCount() - 1);
		}


		@Override
		public boolean onCreateOptionsMenu(@NonNull Menu menu) {
		// Inflate the menu; this adds items to the action bar if it is present.
		@@ -261,7 +286,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
		return true;
		}


		@SuppressLint("ClickableViewAccessibility")
		@Override
		public boolean onOptionsItemSelected(MenuItem item) {
		@@ -398,7 +422,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
		return true;
		}


		private void onRetrieveContact(PopupContactBinding binding, List<app.fedilab.android.client.entities.api.Account> accounts) {
		binding.loader.setVisibility(View.GONE);
		if (accounts == null) {
		@@ -414,7 +437,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
		binding.lvAccountsSearch.setLayoutManager(new LinearLayoutManager(ComposeActivity.this));
		}


		@Override
		public void onActivityResult(int requestCode, int resultCode, Intent data) {
		super.onActivityResult(requestCode, resultCode, data);
		@@ -437,33 +459,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
		}
		}

		private static String visibilityToString(int visibility) {
		switch (visibility) {
		case 3:
		return "public";
		case 2:
		return "unlisted";
		case 1:
		return "private";
		case 0:
		return "direct";
		}
		return "public";
		}

		public static String getVisibility(String defaultVisibility) {
		int tootVisibility = visibilityToNumber(defaultVisibility);
		if (currentAccount != null && currentAccount.mastodon_account != null && currentAccount.mastodon_account.source != null) {
		int userVisibility = visibilityToNumber(currentAccount.mastodon_account.source.privacy);
		if (tootVisibility > userVisibility) {
		return visibilityToString(userVisibility);
		} else {
		return visibilityToString(tootVisibility);
		}
		}
		return defaultVisibility;
		}

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,7 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
		private boolean changes;
		private boolean bottomChanges;
		private boolean update;

		public void setChanges(boolean changes) {
		this.changes = changes;
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ public class SearchResultTabActivity extends BaseActivity {
		@Override
		public void onTabUnselected(TabLayout.Tab tab) {
		}

		@Override
		public void onTabReselected(TabLayout.Tab tab) {
		Fragment fragment;