remove schulchat from main project

13 files changed, 3 insertions, 332 deletions

diff --git a/build.gradle b/build.gradle
index 506daa3c8..628cdfe4c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,6 @@ repositories {
 configurations {
     playstoreImplementation
     gitImplementation
-    playstoreschulchatImplementation
 }
 
 dependencies {
@@ -106,8 +105,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 29
 
-        versionCode 273
-        versionName "2.2.10 beta (2019-10-26)"
+        versionCode 274
+        versionName "2.2.10 beta (2019-11-02)"
         //resConfigs "en"
 
         archivesBaseName += "-$versionName"
@@ -139,25 +138,9 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    flavorDimensions("mode", "distribution")
+    flavorDimensions("distribution")
 
     productFlavors {
-        pixart {
-            dimension "mode"
-        }
-        schulchat {
-            dimension "mode"
-            applicationId = 'de.schulchat.messenger'
-            resConfigs "en"
-
-            resValue "string", "applicationId", applicationId
-            resValue "string", "app_name", "Schulchat Messenger"
-
-            buildConfigField("String", "DOMAIN_LOCK", '"kurswahl-online.de"')
-            buildConfigField("String", "MAGIC_CREATE_DOMAIN", '"kurswahl-online.de"')
-            buildConfigField("String", "LOGTAG", '"Schulchat_Messenger"')
-            buildConfigField("boolean", "SHOW_INTRO", "false")
-        }
         playstore {
             dimension "distribution"
             versionNameSuffix "-playstore"
diff --git a/src/schulchat/AndroidManifest.xml b/src/schulchat/AndroidManifest.xml
deleted file mode 100644
index 08a2c1288..000000000
--- a/src/schulchat/AndroidManifest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="de.pixart.messenger">
-
-    <application
-        android:icon="@drawable/logo"
-        tools:ignore="GoogleAppIndexingWarning"
-        tools:replace="android:icon" />
-</manifest>
diff --git a/src/schulchat/res/drawable-hdpi/logo.png b/src/schulchat/res/drawable-hdpi/logo.png
deleted file mode 100644
index 25be49a6b..000000000
--- a/src/schulchat/res/drawable-hdpi/logo.png
+++ /dev/null
diff --git a/src/schulchat/res/drawable-mdpi/logo.png b/src/schulchat/res/drawable-mdpi/logo.png
deleted file mode 100644
index e11f58198..000000000
--- a/src/schulchat/res/drawable-mdpi/logo.png
+++ /dev/null
diff --git a/src/schulchat/res/drawable-xhdpi/logo.png b/src/schulchat/res/drawable-xhdpi/logo.png
deleted file mode 100644
index dcb4c2b0f..000000000
--- a/src/schulchat/res/drawable-xhdpi/logo.png
+++ /dev/null
diff --git a/src/schulchat/res/drawable-xxhdpi/logo.png b/src/schulchat/res/drawable-xxhdpi/logo.png
deleted file mode 100644
index 0ca0f03f8..000000000
--- a/src/schulchat/res/drawable-xxhdpi/logo.png
+++ /dev/null
diff --git a/src/schulchat/res/drawable-xxxhdpi/logo.png b/src/schulchat/res/drawable-xxxhdpi/logo.png
deleted file mode 100644
index bc41ef463..000000000
--- a/src/schulchat/res/drawable-xxxhdpi/logo.png
+++ /dev/null
diff --git a/src/schulchat/res/drawable/background.xml b/src/schulchat/res/drawable/background.xml
deleted file mode 100644
index cc4f16b21..000000000
--- a/src/schulchat/res/drawable/background.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@android:color/transparent" />
-
-    <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@drawable/logo" />
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/src/schulchat/res/layout/welcome.xml b/src/schulchat/res/layout/welcome.xml
deleted file mode 100644
index f697ca443..000000000
--- a/src/schulchat/res/layout/welcome.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <include layout="@layout/toolbar" />
-
-    <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/color_background_secondary">
-
-            <LinearLayout
-                android:id="@+id/linearLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentBottom="true"
-                android:minHeight="256dp"
-                android:orientation="vertical"
-                android:paddingStart="16dp"
-                android:paddingLeft="16dp"
-                android:paddingEnd="16dp"
-                android:paddingRight="16dp"
-                android:paddingBottom="8dp">
-
-                <Space
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/welcome_header"
-                    android:textAppearance="@style/TextAppearance.Conversations.Title" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:text="@string/welcome_text"
-                    android:textAppearance="@style/TextAppearance.Conversations.Body1" />
-
-                <TextView
-                    android:id="@id/import_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:text="@string/import_text"
-                    android:textColor="?attr/text_Color_Main"
-                    android:textSize="?attr/TextSizeBody"
-                    android:visibility="gone" />
-
-                <Button
-                    android:id="@+id/import_database"
-                    style="@style/Widget.Conversations.Button.Borderless"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:text="@string/import_database"
-                    android:textColor="?attr/colorAccent"
-                    android:visibility="gone" />
-
-                <Button
-                    android:id="@+id/create_account"
-                    style="@style/Widget.Conversations.Button.Borderless"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:text="@string/create_account"
-                    android:textColor="?attr/colorAccent" />
-
-                <Button
-                    android:id="@+id/use_existing_account"
-                    style="@style/Widget.Conversations.Button.Borderless"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:text="@string/welcome_existing_account"
-                    android:textColor="?attr/colorAccent" />
-            </LinearLayout>
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_above="@+id/linearLayout"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentTop="true">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:layout_centerVertical="true"
-                    android:padding="8dp"
-                    android:src="@drawable/logo" />
-            </RelativeLayout>
-        </RelativeLayout>
-    </ScrollView>
-</LinearLayout>
\ No newline at end of file
diff --git a/src/schulchat/res/values/about.xml b/src/schulchat/res/values/about.xml
deleted file mode 100644
index 8cdc8db36..000000000
--- a/src/schulchat/res/values/about.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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/colors.xml b/src/schulchat/res/values/colors.xml
deleted file mode 100644
index 62183f3d0..000000000
--- a/src/schulchat/res/values/colors.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="primary">#ff54547F</color>  <!-- blue 900 -->
-    <color name="primary_dark">#ff3a3a58</color>  <!-- indigo 900 -->
-    <color name="accent">#ff99a4f6</color> <!-- light blue accent -->
-
-    <!-- bubbles -->
-    <color name="lightblue">#ebecfe</color> <!-- blue 100 -->
-    <color name="darkblue">#ff373b4f</color> <!-- blue grey 800 -->
-
-    <!-- scanner -->
-    <color name="scan_result_dots">#ff4caf50</color>
-</resources>
diff --git a/src/schulchat/res/values/defaults.xml b/src/schulchat/res/values/defaults.xml
deleted file mode 100644
index 7a9cc33fc..000000000
--- a/src/schulchat/res/values/defaults.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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">always_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>
-
diff --git a/src/schulchat/res/values/strings.xml b/src/schulchat/res/values/strings.xml
deleted file mode 100644
index e5218b527..000000000
--- a/src/schulchat/res/values/strings.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-    <string name="crash_report_title">Schulchat Messenger has crashed</string>
-    <string name="crash_report_message">By sending in stack traces you are helping the ongoing development of Schulchat Messenger\n<b>Warning:</b> This will use your XMPP account to send the stack trace to the developer.</string>
-    <string name="openkeychain_required_long">Schulchat Messenger utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart Schulchat Messenger afterwards.)</small></string>
-    <string name="contact_has_no_pgp_key">Schulchat Messenger is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup OpenPGP.</small></string>
-    <string name="pref_send_crash_summary">By sending stack traces you are helping the ongoing development of Schulchat Messenger</string>
-    <string name="conversations_foreground_service" translatable="false">Schulchat Messenger</string>
-    <string name="update_info">Schulchat Messenger is downloading and installing the new version automatically.\n\nPlease wait…</string>
-    <string name="no_storage_permission">Schulchat Messenger needs access to external storage</string>
-    <string name="sync_with_contacts_long">Schulchat Messenger wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nSchulchat Messenger will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts.</string>
-    <string name="battery_optimizations_enabled_explained">Your device is doing some heavy battery optimizations on Schulchat Messenger that might lead to delayed notifications or even message loss.\nIt is recommended to disable those.</string>
-    <string name="battery_optimizations_enabled_dialog">Your device is doing some heavy battery optimizations on Schulchat Messenger that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.</string>
-    <string name="contacts_have_no_pgp_keys">Schulchat Messenger is unable to encrypt your messages because your contacts are not announcing their public keys.\n\n</string>
-    <string name="InviteText">Hello,\n\nthe user %s has invited you to Schulchat Messenger. If you are using Android, give it a try and click the following link to start over…</string>
-    <string name="pref_broadcast_last_activity_summary">Let all your contacts know when use Schulchat Messenger</string>
-    <string name="invite_user">Invite to Schulchat Messenger</string>
-    <string name="request_permissions_message">Schulchat Messenger will ask you to allow a few permissions. It is important that you allow all these permissions to use all features of this messenger. If you deny any of these permissions the app will close itself.</string>
-    <string name="request_permissions_message_again">You have denied some or all permissions needed for Schulchat Messenger. Would you like to jump to the settings and allow these permissions? If you denie any of these permissions, the app will close itself.</string>
-    <string name="data_saver_enabled_explained">Your operating system is restricting Schulchat Messenger from accessing the Internet when in background. To receive notifications of new messages you should allow Schulchat Messenger unrestricted access when Data saver is on.\n\nSchulchat Messenger will still make an effort to save data when possible.</string>
-    <string name="device_does_not_support_data_saver">Your device does not supporting disabling data saver for Schulchat Messenger.</string>
-    <string name="update_service">Schulchat Messenger update service</string>
-    <string name="huawei_protected_apps_summary">To keep receiving notifications, even when the screen is turned off, you need to add Schulchat Messenger to the list of protected apps.</string>
-    <string name="no_camera_permission">Schulchat Messenger needs access to the camera</string>
-    <string name="error_trustkey_general">Schulchat Messenger is unable to send encrypted messages to %1$s. This may be due to your contact using an outdated server or client that can not handle OMEMO.</string>
-    <string name="no_microphone_permission">Schulchat Messenger needs access to the microphone</string>
-    <string name="no_location_permission">Schulchat Messenger needs access to location services</string>
-    <string name="foreground_service_channel_description">This notification category is used to display a permanent notification indicating that Schulchat Messenger is running.</string>
-    <string name="set_profile_picture">Schulchat Messenger profile picture</string>
-    <string name="pref_show_mappreview_inside_summary">Show map previews directly inside the chat view, a connection to the Schulchat-Server will be established.</string>
-    <string name="conversations_backup">Schulchat Messenger backup</string>
-    <string name="not_a_backup_file">The file you selected is not a Schulchat Messenger backup file</string>
-    <string name="welcome_header">Welcome to\nSchulchat Messenger</string>
-    <string name="welcome_text">…is a free and secure XMPP/Jabber client for use with kurswahl-online.de.</string>
-    <string name="intro_whats_xmpp">What is XMPP / Jabber / Schulchat Messenger?</string>
-    <string name="intro_desc_privacy">Schulchat Messenger will neither sell nor analyze your data and you decide which permissions you grant.</string>
-</resources>