Merge branch 'develop' into bubble_view (f9ad08f5) · Commits · Android-smartphones / Fedilab

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -478,7 +478,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		if (!activity.isDestroyed() && !activity.isFinishing() && url != null) {
		if (url.trim().isEmpty()) {
		BitmapDrawable avatar = new AvatarGenerator.AvatarBuilder(activity)
		.setLabel(account.peertube_account.getAcct())
		.setLabel(acct)
		.setAvatarSize(120)
		.setTextSize(30)
		.toSquare()

+3 −1

Original line number	Diff line number	Diff line
		@@ -126,8 +126,10 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload
		getSupportActionBar().setDisplayShowHomeEnabled(true);
		}

		if (attachments == null \|\| attachments.size() == 0)
		if (attachments == null \|\| attachments.size() == 0) {
		finish();
		return;
		}

		setTitle("");

+1 −1

Original line number	Diff line number	Diff line
		@@ -1324,7 +1324,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
		ComposeViewHolder holder = (ComposeViewHolder) viewHolder;
		boolean extraFeatures = sharedpreferences.getBoolean(context.getString(R.string.SET_EXTAND_EXTRA_FEATURES) + MainActivity.currentUserID + MainActivity.currentInstance, false);
		boolean mathsComposer = sharedpreferences.getBoolean(context.getString(R.string.SET_MATHS_COMPOSER), true);
		boolean forwardTag = sharedpreferences.getBoolean(context.getString(R.string.SET_FORWARD_TAGS_IN_REPLY), true);
		boolean forwardTag = sharedpreferences.getBoolean(context.getString(R.string.SET_FORWARD_TAGS_IN_REPLY), false);


		if (mathsComposer) {

+9 −6

Original line number	Diff line number	Diff line
		@@ -166,7 +166,7 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
		badgeCount = 0;
		headerMenuOpen = false;
		binding.navView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);

		startInForeground();
		if (getSupportActionBar() != null) {
		getSupportActionBar().setDisplayShowTitleEnabled(false);
		}
		@@ -377,7 +377,7 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {
		peertubeInformation.setPrivacies(new LinkedHashMap<>());
		peertubeInformation.setPlaylistPrivacies(new LinkedHashMap<>());
		peertubeInformation.setTranslations(new LinkedHashMap<>());
		startInForeground();


		//noinspection ConstantConditions
		if (BuildConfig.FLAVOR.compareTo("playstore") == 0) {
		@@ -417,11 +417,14 @@ public class PeertubeMainActivity extends PeertubeBaseMainActivity {

		private void startInForeground() {
		Intent notificationIntent = new Intent(this, RetrieveInfoService.class);
		try {
		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
		startForegroundService(notificationIntent);
		} else {
		startService(notificationIntent);
		}
		} catch (Exception ignored) {
		}
		}

		@Override

+1 −0

Original line number	Diff line number	Diff line
		@@ -805,4 +805,5 @@ Ara ja pots connectar-te al compte escrivint <b>%1$s</b> en el primer camp i fen
		<string name="notif_update_push">Un missatge que havies difós ha estat editat</string>
		<string name="notif_report">Una usuària ha denunciat</string>
		<string name="proxy_protocol_socks">SOCKS</string>
		<string name="card_picture">"Imatge de perfil"</string>
		</resources>
		No newline at end of file