12 files changed, 150 insertions, 1 deletions
diff --git a/src/standard/java/de/pixart/messenger/services/EmojiService.java b/src/git/java/de/pixart/messenger/services/EmojiService.java
index f76cf5a4b..f76cf5a4b 100644
--- a/src/standard/java/de/pixart/messenger/services/EmojiService.java
+++ b/src/git/java/de/pixart/messenger/services/EmojiService.java
diff --git a/src/standard/java/de/pixart/messenger/services/PushManagementService.java b/src/git/java/de/pixart/messenger/services/PushManagementService.java
index 9d4673fd3..9d4673fd3 100644
--- a/src/standard/java/de/pixart/messenger/services/PushManagementService.java
+++ b/src/git/java/de/pixart/messenger/services/PushManagementService.java
diff --git a/src/main/java/de/pixart/messenger/ui/widget/EmojiWrapperEditText.java b/src/git/java/de/pixart/messenger/ui/widget/EmojiWrapperEditText.java
index 7d4a06b28..7d4a06b28 100644
--- a/src/main/java/de/pixart/messenger/ui/widget/EmojiWrapperEditText.java
+++ b/src/git/java/de/pixart/messenger/ui/widget/EmojiWrapperEditText.java
diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java
index 72aacf397..2d0c4acb9 100644
--- a/src/main/java/de/pixart/messenger/Config.java
+++ b/src/main/java/de/pixart/messenger/Config.java
@@ -39,7 +39,7 @@ public final class Config {
         return (ENCRYPTION_MASK & (ENCRYPTION_MASK - 1)) != 0;
     }
 
-    public static final String LOGTAG = "Pix-Art_Messenger";
+    public static final String LOGTAG = BuildConfig.LOGTAG;
 
     public static final Jid BUG_REPORTS = Jid.of("bugs@pix-art.de");
 
diff --git a/src/standardPush/AndroidManifest.xml b/src/playstore/AndroidManifest.xml
index a54f8bee1..a54f8bee1 100644
--- a/src/standardPush/AndroidManifest.xml
+++ b/src/playstore/AndroidManifest.xml
diff --git a/src/standardPush/java/de/pixart/messenger/services/EmojiService.java b/src/playstore/java/de/pixart/messenger/services/EmojiService.java
index 0e5bfadd0..0e5bfadd0 100644
--- a/src/standardPush/java/de/pixart/messenger/services/EmojiService.java
+++ b/src/playstore/java/de/pixart/messenger/services/EmojiService.java
diff --git a/src/standardPush/java/de/pixart/messenger/services/MaintenanceReceiver.java b/src/playstore/java/de/pixart/messenger/services/MaintenanceReceiver.java
index 31ed95a88..31ed95a88 100644
--- a/src/standardPush/java/de/pixart/messenger/services/MaintenanceReceiver.java
+++ b/src/playstore/java/de/pixart/messenger/services/MaintenanceReceiver.java
diff --git a/src/standardPush/java/de/pixart/messenger/services/PushManagementService.java b/src/playstore/java/de/pixart/messenger/services/PushManagementService.java
index a7054cf2f..a7054cf2f 100644
--- a/src/standardPush/java/de/pixart/messenger/services/PushManagementService.java
+++ b/src/playstore/java/de/pixart/messenger/services/PushManagementService.java
diff --git a/src/standardPush/java/de/pixart/messenger/services/PushMessageReceiver.java b/src/playstore/java/de/pixart/messenger/services/PushMessageReceiver.java
index c6d9b96be..c6d9b96be 100644
--- a/src/standardPush/java/de/pixart/messenger/services/PushMessageReceiver.java
+++ b/src/playstore/java/de/pixart/messenger/services/PushMessageReceiver.java
diff --git a/src/playstore/java/de/pixart/messenger/ui/widget/EmojiWrapperEditText.java b/src/playstore/java/de/pixart/messenger/ui/widget/EmojiWrapperEditText.java
new file mode 100644
index 000000000..662669fa3
--- /dev/null
+++ b/src/playstore/java/de/pixart/messenger/ui/widget/EmojiWrapperEditText.java
@@ -0,0 +1,17 @@
+package de.pixart.messenger.ui.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.appcompat.widget.AppCompatEditText;
+
+public class EmojiWrapperEditText extends AppCompatEditText {
+
+    public EmojiWrapperEditText(Context context) {
+        super(context);
+    }
+
+    public EmojiWrapperEditText(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+}
+\ No newline at end of file
diff --git a/src/schulchat/res/values/about.xml b/src/schulchat/res/values/about.xml
new file mode 100644
index 000000000..8cdc8db36
--- /dev/null
+++ b/src/schulchat/res/values/about.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_about_message" translatable="false"><b>Schulchat Messenger</b>
+			\n\nCopyright © 2014-2019 Christian Schneppe
+			\n\nhttps://schulchat.de
+			\n\nThis program is free software: you can redistribute it and/or modify
+			it under the terms of the GNU General Public License as published by
+			the Free Software Foundation, either version 3 of the License, or
+			(at your option) any later version.
+			\n\nThis program is distributed in the hope that it will be useful,
+			but WITHOUT ANY WARRANTY; without even the implied warranty of
+			MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+			GNU General Public License for more details.
+			\n\nYou should have received a copy of the GNU General Public License
+			along with this program. If not, see https://www.gnu.org/licenses
+	</string>
+    <string name="pref_about_libraries" translatable="false"><b>Libraries</b>
+			\n\nhttps://www.bouncycastle.org\n(The MIT License (MIT))
+			\n\nhttps://www.gnu.org/software/libidn\n(Apache License, Version 2.0)
+			\n\nhttps://github.com/ge0rg/MemorizingTrustManager\n(The MIT License (MIT))
+			\n\nhttps://github.com/MiniDNS/minidns\n(WTFPL)
+			\n\nhttps://github.com/open-keychain/openkeychain-api-lib\n(Apache License, Version 2.0)
+			\n\nhttps://github.com/jitsi/otr4j\n(LGPL-3.0)
+			\n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0)
+			\n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0)
+			\n\nhttps://github.com/leolin310148/ShortcutBadger\n(Apache License, Version 2.0)
+			\n\nhttps://github.com/kyleduo/SwitchButton\n(Apache License, Version 2.0)
+			\n\nhttps://github.com/WhisperSystems/libaxolotl-java\n(GPLv3)
+			\n\nhttps://github.com/vinc3m1/RoundedImageView\n(Apache License, Version 2.0)
+			\n\nhttps://github.com/jdamcd/android-crop\n(Apache License, Version 2.0)
+		    \n\nhttps://github.com/google/gson\n(Apache License, Version 2.0)
+		    \n\nhttp://hc.apache.org/httpcomponents-client\n(Apache License, Version 2.0)
+		    \n\nhttp://hc.apache.org/httpcomponents-core\n(Apache License, Version 2.0)
+			\n\nhttps://github.com/square/picasso\n(Apache License, Version 2.0)
+			\n\nhttps://github.com/davemorrissey/subsampling-scale-image-view\n(Apache License, Version 2.0)
+            \n\nhttps://github.com/koral--/android-gif-drawable\n(The MIT License (MIT))
+			\n\nhttps://github.com/rtoshiro/FullscreenVideoView\n(Apache License, Version 2.0)
+            \n\nhttps://github.com/mangstadt/ez-vcard\n(FreeBSD)
+            \n\nhttps://github.com/googlesamples/easypermissions\n(Apache License, Version 2.0)
+            \n\nhttps://github.com/blazsolar/FlowLayout\n(Apache License, Version 2.0)
+            \n\nhttps://github.com/ypresto/android-transcoder\n(Apache License, Version 2.0)
+            \n\nhttp://www.eclipse.org/jetty/\n(Apache License, Version 2.0 and Eclipse Public License 1.0)
+            \n\nhttp://leafletjs.com/\n(BSD 2-Clause)
+            \n\nhttps://www.openstreetmap.org/\n(Open Database License)
+            \n\nhttp://xmpp.rocks/\n(The MIT License (MIT))
+            \n\nhttps://github.com/drakeet/ToastCompat/\n(Apache License, Version 2.0)
+            \n\nhttps://github.com/leinardi/FloatingActionButtonSpeedDial/\n(Apache License, Version 2.0)
+            \n\nhttps://github.com/PonnamKarthik/RichLinkPreview\n(Apache License, Version 2.0)
+            \n\nhttps://github.com/AppIntro/AppIntro\n(Apache License, Version 2.0)
+    </string>
+</resources>
+\ No newline at end of file
diff --git a/src/schulchat/res/values/defaults.xml b/src/schulchat/res/values/defaults.xml
new file mode 100644
index 000000000..6d96c3de0
--- /dev/null
+++ b/src/schulchat/res/values/defaults.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="type_pc" translatable="false">Computer</string>
+    <string name="type_phone" translatable="false">Mobile phone</string>
+    <string name="type_tablet" translatable="false">Tablet</string>
+    <string name="type_web" translatable="false">Web browser</string>
+    <string name="type_console" translatable="false">Console</string>
+
+    <bool name="portrait_only">true</bool>
+    <bool name="enter_is_send">false</bool>
+    <bool name="dnd_on_silent_mode">false</bool>
+    <bool name="treat_vibrate_as_silent">false</bool>
+    <bool name="vibrate_on_notification">true</bool>
+    <bool name="led">true</bool>
+    <bool name="notifications_from_strangers">true</bool>
+    <bool name="headsup_notifications">true</bool>
+    <bool name="enable_quiet_hours">false</bool>
+    <bool name="manually_change_presence">true</bool>
+    <bool name="away_when_screen_off">false</bool>
+    <bool name="confirm_messages">true</bool>
+    <bool name="allow_message_correction">true</bool>
+    <bool name="chat_states">true</bool>
+    <bool name="autojoin">true</bool>
+    <bool name="indicate_received">true</bool>
+    <bool name="use_tor">false</bool>
+    <bool name="show_connection_options">false</bool>
+    <bool name="last_activity">true</bool>
+    <bool name="dont_trust_system_cas">false</bool>
+    <bool name="btbv">true</bool>
+    <bool name="send_button_status">true</bool>
+    <bool name="display_enter_key">false</bool>
+    <bool name="show_dynamic_tags">false</bool>
+    <bool name="presence_colored_names">false</bool>
+    <bool name="use_max_brightness">true</bool>
+    <bool name="auto_rotate">true</bool>
+    <bool name="send_crashreport">true</bool>
+    <bool name="use_invidious">false</bool>
+    <bool name="plain_text_logs">false</bool>
+    <bool name="validate_hostname">false</bool>
+    <bool name="show_foreground_service">true</bool>
+    <bool name="warn_unencrypted_chat">false</bool>
+    <bool name="use_bundled_emoji">true</bool>
+    <bool name="enable_multi_accounts">false</bool>
+    <bool name="show_qr_code_scan">true</bool>
+    <bool name="scroll_to_bottom">true</bool>
+    <bool name="start_searching">false</bool>
+    <bool name="show_record_voice_btn">true</bool>
+    <bool name="quick_share_attachment_choice">true</bool>
+    <bool name="screen_security">false</bool>
+    <bool name="play_gif_inside">false</bool>
+    <bool name="prefer_xmpp_avatar">true</bool>
+    <bool name="show_links_inside">true</bool>
+    <bool name="show_maps_inside">true</bool>
+    <bool name="use_internal_updater">false</bool>
+    <bool name="show_own_accounts">false</bool>
+    <bool name="vibrate_in_chat">true</bool>
+    <integer name="auto_accept_filesize_wifi">10485760</integer>
+    <integer name="auto_accept_filesize_mobile">524288</integer>
+    <integer name="auto_accept_filesize_roaming">0</integer>
+    <integer name="automatic_message_deletion">0</integer>
+    <integer name="grace_period">144</integer>
+    <string name="default_resource" translatable="false">Phone</string>
+    <string name="notification_ringtone">content://settings/system/notification_sound</string>
+    <string name="picture_compression">auto</string>
+    <string name="image_compression">mid</string>
+    <string name="video_compression">mid</string>
+    <string name="quick_action">recent</string>
+    <string name="omemo_setting_default">default_off</string>
+    <string name="theme">auto</string>
+    <string name="default_font_size">small</string>
+
+    <string-array name="domains">
+    </string-array>
+
+    <string-array name="support_domains">
+    </string-array>
+    
+    <string-array name="support_site">
+    </string-array>
+</resources>
+