diff --git a/app/build.gradle b/app/build.gradle index 14dc0417a..b6d2ba5b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 28 - versionCode 276 - versionName "2.3.0" + versionCode 277 + versionName "2.3.1" multiDexEnabled true renderscriptTargetApi 28 as int renderscriptSupportModeEnabled true diff --git a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java index df375c232..09f363c36 100644 --- a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java @@ -273,6 +273,10 @@ public class LoginActivity extends BaseActivity { return; } instance = login_instance.getText().toString().trim().toLowerCase(); + if(instance.endsWith(".gab.com") || instance.equals("gab.com")){ + Toasty.error(LoginActivity.this,getString(R.string.client_error), Toast.LENGTH_LONG).show(); + return; + } connect_button.setEnabled(false); new Thread(new Runnable(){ @Override diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 5b57c13c3..6c0b7029c 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -865,7 +865,7 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n No s\'ha pogut desar la imatge Opacitat Retalla - Enable photo editor + Habilita l\'editor de fotos %d vot %d vots diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 3fcede26a..512f8647b 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -873,7 +873,7 @@ Falha ao salvar imagem. Transparência Recortar - Enable photo editor + Ativar editor de fotos %d voto %d votos diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index fd8f098d9..54078d9de 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -873,7 +873,7 @@ Kunde inte spara bilden Genomskinlighet Beskär - Enable photo editor + Aktivera bildeditor %d röst %d röster diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2b3fabde4..34920a4ba 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -841,35 +841,35 @@ 显示时间线 在嘟文中标记机器人账户 管理标签 - Remember the position in Home timeline - History - Playlists - Display name - Privacy - Create - You don\'t have any playlists. Click on the \"+\" icon to add a new playlist - You must provide a display name! - The channel is required when the playlist is public. - Create a playlist - There is nothing in this playlist yet. - Edit media - redo - Gallery - Emoji - Sticker - Eraser - Text - Filter - Adjust - Brush - Are you sure to exit without saving the image? - Discard - Saving… - Image Saved Successfully! - Failed to save Image - Opacity - Crop - Enable photo editor + 记住在主时间线中的位置 + 历史 + 播放列表 + 显示名称 + 隐私 + 创建 + 你没有任何播放列表。 点击\"+\"图标添加一个新的播放列表 + 你必须提供显示的名字! + 当播放列表是公开的时,该频道是需要的。 + 创建播放列表 + 在这个播放列表中还没有任何内容。 + 编辑媒体 + 重做 + 相册 + Emoji 表情 + 贴纸 + 橡皮擦 + 文本 + 过滤器 + 调整 + 画笔 + 您确定要退出而不保存图像吗? + 舍弃 + 正在保存… + 图像保存成功! + 保存图像失败 + 不透明度 + 剪裁 + 启用照片编辑器 %d 票