working (e87a3473) · Commits · Android-smartphones / Fedilab

app/build.gradle

+1 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ android {
		'src/main/res/layouts/mastodon',
		'src/main/res/layouts/peertube',
		'src/main/res/layouts',
		'src/main/layout',
		'src/main/res/drawables/mastodon',
		'src/main/res/drawables/peertube',
		'src/main/res/drawables',

app/src/fdroid/java/app/fedilab/android/activities/PeertubeBaseMainActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ public abstract class PeertubeBaseMainActivity extends AppCompatActivity impleme
		assert b != null;
		int state = b.getInt("state_asked", -1);
		int displayed = b.getInt("displayed", -1);
		castedTube = b.getParcelable("castedTube");
		castedTube = (VideoData.Video) b.getSerializable("castedTube");

		if (state == 1) {
		discoverCast();

app/src/main/assets/categories.json

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		{
		"1": "Music",
		"2": "Films",
		"3": "Vehicles",
		"4": "Art",
		"5": "Sports",
		"6": "Travels",
		"7": "Gaming",
		"8": "People",
		"9": "Comedy",
		"10": "Entertainment",
		"11": "News & Politics",
		"12": "How To",
		"13": "Education",
		"14": "Activism",
		"15": "Science & Technology",
		"16": "Animals",
		"17": "Kids",
		"18": "Food"
		}
		No newline at end of file

app/src/main/assets/languages.json

0 → 100644

+199 −0

Original line number	Diff line number	Diff line
		{
		"aa": "Afar",
		"ab": "Abkhazian",
		"af": "Afrikaans",
		"ak": "Akan",
		"am": "Amharic",
		"ar": "Arabic",
		"an": "Aragonese",
		"ase": "American Sign Language",
		"as": "Assamese",
		"av": "Avaric",
		"avk": "Kotava",
		"ay": "Aymara",
		"az": "Azerbaijani",
		"ba": "Bashkir",
		"bm": "Bambara",
		"be": "Belarusian",
		"bn": "Bengali",
		"bfi": "British Sign Language",
		"bi": "Bislama",
		"bo": "Tibetan",
		"bs": "Bosnian",
		"br": "Breton",
		"bg": "Bulgarian",
		"bzs": "Brazilian Sign Language",
		"ca": "Catalan",
		"cs": "Czech",
		"ch": "Chamorro",
		"ce": "Chechen",
		"cv": "Chuvash",
		"kw": "Cornish",
		"co": "Corsican",
		"cr": "Cree",
		"cse": "Czech Sign Language",
		"csl": "Chinese Sign Language",
		"cy": "Welsh",
		"da": "Danish",
		"de": "German",
		"dv": "Dhivehi",
		"dsl": "Danish Sign Language",
		"dz": "Dzongkha",
		"el": "Greek",
		"en": "English",
		"eo": "Esperanto",
		"et": "Estonian",
		"eu": "Basque",
		"ee": "Ewe",
		"fo": "Faroese",
		"fa": "Persian",
		"fj": "Fijian",
		"fi": "Finnish",
		"fr": "French",
		"fy": "Western Frisian",
		"fsl": "French Sign Language",
		"ff": "Fulah",
		"gd": "Scottish Gaelic",
		"ga": "Irish",
		"gl": "Galician",
		"gv": "Manx",
		"gn": "Guarani",
		"gsg": "German Sign Language",
		"gu": "Gujarati",
		"ht": "Haitian",
		"ha": "Hausa",
		"sh": "Serbo-Croatian",
		"he": "Hebrew",
		"hz": "Herero",
		"hi": "Hindi",
		"ho": "Hiri Motu",
		"hr": "Croatian",
		"hu": "Hungarian",
		"hy": "Armenian",
		"ig": "Igbo",
		"ii": "Sichuan Yi",
		"iu": "Inuktitut",
		"id": "Indonesian",
		"ik": "Inupiaq",
		"is": "Icelandic",
		"it": "Italian",
		"jv": "Javanese",
		"jbo": "Lojban",
		"ja": "Japanese",
		"jsl": "Japanese Sign Language",
		"kab": "Kabyle",
		"kl": "Kalaallisut",
		"kn": "Kannada",
		"ks": "Kashmiri",
		"ka": "Georgian",
		"kr": "Kanuri",
		"kk": "Kazakh",
		"km": "Khmer",
		"ki": "Kikuyu",
		"rw": "Kinyarwanda",
		"ky": "Kirghiz",
		"kv": "Komi",
		"kg": "Kongo",
		"ko": "Korean",
		"kj": "Kuanyama",
		"ku": "Kurdish",
		"lo": "Lao",
		"la": "Latin",
		"lv": "Latvian",
		"li": "Limburgan",
		"ln": "Lingala",
		"lt": "Lithuanian",
		"lb": "Luxembourgish",
		"lu": "Luba-Katanga",
		"lg": "Ganda",
		"mh": "Marshallese",
		"ml": "Malayalam",
		"mr": "Marathi",
		"mk": "Macedonian",
		"mg": "Malagasy",
		"mt": "Maltese",
		"mn": "Mongolian",
		"mi": "Maori",
		"ms": "Malay (macrolanguage)",
		"my": "Burmese",
		"na": "Nauru",
		"nv": "Navajo",
		"nr": "South Ndebele",
		"nd": "North Ndebele",
		"ng": "Ndonga",
		"ne": "Nepali (macrolanguage)",
		"nl": "Dutch",
		"nn": "Norwegian Nynorsk",
		"nb": "Norwegian Bokmål",
		"no": "Norwegian",
		"ny": "Nyanja",
		"oc": "Occitan",
		"oj": "Ojibwa",
		"or": "Oriya (macrolanguage)",
		"om": "Oromo",
		"os": "Ossetian",
		"pa": "Panjabi",
		"pks": "Pakistan Sign Language",
		"pl": "Polish",
		"pt": "Portuguese",
		"ps": "Pushto",
		"qu": "Quechua",
		"rm": "Romansh",
		"ro": "Romanian",
		"rsl": "Russian Sign Language",
		"rn": "Rundi",
		"ru": "Russian",
		"sg": "Sango",
		"sdl": "Saudi Arabian Sign Language",
		"sfs": "South African Sign Language",
		"si": "Sinhala",
		"sk": "Slovak",
		"sl": "Slovenian",
		"se": "Northern Sami",
		"sm": "Samoan",
		"sn": "Shona",
		"sd": "Sindhi",
		"so": "Somali",
		"st": "Southern Sotho",
		"es": "Spanish",
		"sq": "Albanian",
		"sc": "Sardinian",
		"sr": "Serbian",
		"ss": "Swati",
		"su": "Sundanese",
		"sw": "Swahili (macrolanguage)",
		"sv": "Swedish",
		"swl": "Swedish Sign Language",
		"ty": "Tahitian",
		"ta": "Tamil",
		"tt": "Tatar",
		"te": "Telugu",
		"tg": "Tajik",
		"tl": "Tagalog",
		"th": "Thai",
		"ti": "Tigrinya",
		"tlh": "Klingon",
		"to": "Tonga (Tonga Islands)",
		"tn": "Tswana",
		"ts": "Tsonga",
		"tk": "Turkmen",
		"tr": "Turkish",
		"tw": "Twi",
		"ug": "Uighur",
		"uk": "Ukrainian",
		"ur": "Urdu",
		"uz": "Uzbek",
		"ve": "Venda",
		"vi": "Vietnamese",
		"wa": "Walloon",
		"wo": "Wolof",
		"xh": "Xhosa",
		"yi": "Yiddish",
		"yo": "Yoruba",
		"za": "Zhuang",
		"zh": "Chinese",
		"zu": "Zulu",
		"zxx": "No linguistic content",
		"zh-Hans": "Simplified Chinese",
		"zh-Hant": "Traditional Chinese"
		}
		No newline at end of file

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

+19 −7

Original line number	Diff line number	Diff line
		@@ -17,9 +17,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.mastodon.helper.CacheHelper.deleteDir;
		import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_ID;
		import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_INSTANCE;
		import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_SOFTWARE;
		import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_TOKEN;
		import static app.fedilab.android.mastodon.helper.Helper.TAG;
		import static app.fedilab.android.mastodon.helper.Helper.displayReleaseNotesIfNeeded;
		import static app.fedilab.android.mastodon.ui.drawer.StatusAdapter.sendAction;

		@@ -43,7 +44,6 @@ import android.provider.BaseColumns;
		import android.text.Editable;
		import android.text.Html;
		import android.text.TextWatcher;
		import android.util.Log;
		import android.util.Patterns;
		import android.util.TypedValue;
		import android.view.Gravity;
		@@ -330,7 +330,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		BaseMainActivity.currentToken = sharedpreferences.getString(Helper.PREF_USER_TOKEN, null);
		}
		String software = sharedpreferences.getString(PREF_USER_SOFTWARE, null);
		Log.v(TAG, "software: " + software);
		if (software != null && software.equalsIgnoreCase("peertube")) {
		startActivity(new Intent(this, PeertubeMainActivity.class));
		finish();
		@@ -725,14 +724,22 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		item.setOnMenuItemClickListener(item1 -> {
		if (!this.isFinishing()) {
		headerMenuOpen = false;
		Toasty.info(BaseMainActivity.this, getString(R.string.toast_account_changed, "@" + account.mastodon_account.acct + "@" + account.instance), Toasty.LENGTH_LONG).show();
		String acctForAccount = "";
		if (account.mastodon_account != null) {
		acctForAccount = "@" + account.mastodon_account.username + "@" + account.instance;
		} else if (account.peertube_account != null) {
		acctForAccount = "@" + account.peertube_account.getUsername() + "@" + account.instance;
		}
		Toasty.info(BaseMainActivity.this, getString(R.string.toast_account_changed, acctForAccount), Toasty.LENGTH_LONG).show();
		BaseMainActivity.currentToken = account.token;
		BaseMainActivity.currentUserID = account.user_id;
		BaseMainActivity.currentInstance = account.instance;
		api = account.api;
		SharedPreferences.Editor editor = sharedpreferences.edit();
		editor.putString(PREF_USER_TOKEN, account.token);
		editor.putString(PREF_USER_SOFTWARE, account.software);
		Log.v(TAG, "put 2: " + account.software);
		editor.putString(PREF_USER_INSTANCE, account.instance);
		editor.putString(PREF_USER_ID, account.user_id);
		editor.commit();
		//The user is now aut
		//The user is now authenticated, it will be redirected to MainActivity
		@@ -968,9 +975,12 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		Toasty.info(BaseMainActivity.this, getString(R.string.toast_account_changed, account), Toasty.LENGTH_LONG).show();
		BaseMainActivity.currentToken = accounts.get(0).token;
		BaseMainActivity.currentUserID = accounts.get(0).user_id;
		BaseMainActivity.currentInstance = accounts.get(0).instance;
		api = accounts.get(0).api;
		SharedPreferences.Editor editor = sharedpreferences.edit();
		editor.putString(PREF_USER_ID, accounts.get(0).user_id);
		editor.putString(PREF_USER_TOKEN, accounts.get(0).token);
		editor.putString(PREF_USER_INSTANCE, accounts.get(0).instance);
		editor.putString(PREF_USER_SOFTWARE, accounts.get(0).software);
		editor.commit();
		//The user is now aut
		@@ -993,10 +1003,13 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		Toasty.info(BaseMainActivity.this, getString(R.string.toast_account_changed, account), Toasty.LENGTH_LONG).show();
		BaseMainActivity.currentToken = accounts.get(1).token;
		BaseMainActivity.currentUserID = accounts.get(1).user_id;
		BaseMainActivity.currentInstance = accounts.get(1).instance;
		api = accounts.get(1).api;
		SharedPreferences.Editor editor = sharedpreferences.edit();
		editor.putString(PREF_USER_ID, accounts.get(1).user_id);
		editor.putString(PREF_USER_TOKEN, accounts.get(1).token);
		editor.putString(PREF_USER_SOFTWARE, accounts.get(1).software);
		editor.putString(PREF_USER_INSTANCE, accounts.get(1).instance);
		editor.commit();
		//The user is now aut
		//The user is now authenticated, it will be redirected to MainActivity
		@@ -1061,7 +1074,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		String userIdIntent, instanceIntent, urlOfMessage;
		if (extras != null && extras.containsKey(Helper.INTENT_ACTION)) {
		userIdIntent = extras.getString(Helper.PREF_USER_ID); //Id of the account in the intent
		instanceIntent = extras.getString(Helper.PREF_INSTANCE);
		instanceIntent = extras.getString(Helper.PREF_USER_INSTANCE);
		urlOfMessage = extras.getString(Helper.PREF_MESSAGE_URL);
		if (extras.getInt(Helper.INTENT_ACTION) == Helper.NOTIFICATION_INTENT) {
		if (userIdIntent != null && instanceIntent != null && userIdIntent.equals(currentUserID) && instanceIntent.equals(currentInstance)) {
		@@ -1078,7 +1091,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		SharedPreferences.Editor editor = sharedpreferences.edit();
		editor.putString(PREF_USER_TOKEN, account.token);
		editor.putString(PREF_USER_SOFTWARE, account.software);
		Log.v(TAG, "put 3: " + account.software);
		editor.commit();
		Intent mainActivity = new Intent(this, MainActivity.class);
		mainActivity.putExtra(Helper.INTENT_ACTION, Helper.OPEN_NOTIFICATION);