thedevstack/PiratX
2
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 5 Pull requests 1 Wiki Activity Actions 1

Revert "Change app ID and file path"

Browse source 
This reverts commit c805e130dc.
This commit is contained in:
12aw 2024-01-19 17:12:19 +01:00
parent c805e130dc
commit 0d0e77d690
68 changed files with 106 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -9,7 +9,7 @@ monocles chat ist moderner und sicherer Android XMPP-Client. Basierend auf blabb
Vorschaubilder erstellt von Pigeonalley (https://pigeonalley.com)
Download ist hier möglich:
<a href="https://f-droid.org/app/eu.monocles.chat"><img src="https://f-droid.org/badge/get-it-on-de.png" alt="Jetzt bei F-Droid" height="100"></a>
<a href="https://f-droid.org/app/de.monocles.chat"><img src="https://f-droid.org/badge/get-it-on-de.png" alt="Jetzt bei F-Droid" height="100"></a>
Folge uns auf <a rel="me" href="https://monocles.social/@monocles">monocles social</a>

4
build.gradle
View file

@ -157,7 +157,7 @@ android {
archivesBaseName += "-$versionName"
// archivesBaseName += "$versionNameSuffix" // activate for beta versions
applicationId "eu.monocles.chat"
applicationId "de.monocles.chat"
multiDexEnabled true
//versionName grgit.describe(always: true)
buildConfigField("String", "LOGTAG", '"monocles chat"')
@ -199,7 +199,7 @@ android {
playstore {
dimension "distribution"
versionNameSuffix "-playstore"
applicationId "eu.monocles.chat"
applicationId "de.monocles.chat"
buildConfigField("boolean", "SHOW_MIGRATION_INFO", 'false')
resValue "string", "applicationId", applicationId
}

2
git/release/output-metadata.json
View file

@ -4,7 +4,7 @@
"type": "APK",
"kind": "Directory"
},
"applicationId": "eu.monocles.chat",
"applicationId": "de.monocles.chat",
"variantName": "gitRelease",
"elements": [
{

2
monocles_chat.doap
View file

@ -14,7 +14,7 @@
<description xml:lang="en">monocles chat is a modern and secure chat app using XMPP. Based on Conversations and Blabber.im but with many changes.</description>
<homepage rdf:resource="https://monocles.eu/more/"/>
<download-page rdf:resource="https://f-droid.org/en/packages/eu.monocles.chat/"/>
<download-page rdf:resource="https://f-droid.org/en/packages/de.monocles.chat/"/>
<bug-database rdf:resource="https://codeberg.org/Arne/monocles_chat/issues"/>
<!-- See https://github.com/ewilderj/doap/issues/53 -->
<developer-forum rdf:resource="xmpp:development@conference.monocles.de?join"/>

2
playstore/release/output-metadata.json
View file

@ -4,7 +4,7 @@
"type": "APK",
"kind": "Directory"
},
"applicationId": "eu.monocles.chat",
"applicationId": "de.monocles.chat",
"variantName": "playstoreRelease",
"elements": [
{

2
proguard-rules.pro vendored
View file

@ -1,6 +1,6 @@
-dontobfuscate
-keep class eu.monocles.chat.**
-keep class de.monocles.chat.**
-keep class de.pixart.messenger.**
-keep class eu.siacs.conversations.**

2
src/git/java/eu/monocles/chat/ui/StartUI.java → src/git/java/de/monocles/chat/ui/StartUI.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat.ui;
package de.monocles.chat.ui;
import android.content.Context;
import android.content.Intent;

12
src/main/AndroidManifest.xml
View file

@ -133,10 +133,10 @@
tools:targetApi="tiramisu">
<service
android:name="eu.monocles.chat.DownloadDefaultStickers"
android:name="de.monocles.chat.DownloadDefaultStickers"
android:foregroundServiceType="dataSync" />
<service android:name="eu.monocles.chat.ConnectionService"
<service android:name="de.monocles.chat.ConnectionService"
android:label="@string/app_name"
android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
android:exported="true">
@ -225,7 +225,7 @@
<receiver android:name=".services.AlarmReceiver" />
<activity
android:name="eu.monocles.chat.ui.StartUI"
android:name="de.monocles.chat.ui.StartUI"
android:configChanges="orientation|screenSize"
android:label="@string/short_app_name"
android:launchMode="singleTask"
@ -328,7 +328,7 @@
android:label="@string/create_account"
android:launchMode="singleTask" />
<activity
android:name="eu.monocles.chat.SignUpPage"
android:name="de.monocles.chat.SignUpPage"
android:label="@string/create_account"
android:launchMode="singleTask"
android:exported="true">
@ -345,11 +345,11 @@
</intent-filter>
</activity>
<activity
android:name="eu.monocles.chat.RegisterMonoclesActivity"
android:name="de.monocles.chat.RegisterMonoclesActivity"
android:label="@string/create_account"
android:launchMode="singleTask" />
<activity
android:name="eu.monocles.chat.ui.CallsActivity"
android:name="de.monocles.chat.ui.CallsActivity"
android:label="@string/calls"
android:launchMode="singleTask" />
<activity

2
src/main/java/eu/monocles/chat/BobTransfer.java → src/main/java/de/monocles/chat/BobTransfer.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import android.net.Uri;
import android.util.Base64;

2
src/main/java/eu/monocles/chat/ColorResourcesLoaderCreator.java → src/main/java/de/monocles/chat/ColorResourcesLoaderCreator.java
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
package eu.monocles.chat;
package de.monocles.chat;
import android.content.Context;
import android.content.res.loader.ResourcesLoader;

2
src/main/java/eu/monocles/chat/ColorResourcesTableCreator.java → src/main/java/de/monocles/chat/ColorResourcesTableCreator.java
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
package eu.monocles.chat;
package de.monocles.chat;
import android.content.Context;
import android.util.Pair;

2
src/main/java/eu/monocles/chat/ConnectionService.java → src/main/java/de/monocles/chat/ConnectionService.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import java.lang.ref.WeakReference;
import java.util.Collections;

2
src/main/java/eu/monocles/chat/ConversationPage.java → src/main/java/de/monocles/chat/ConversationPage.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import android.content.Context;
import android.view.View;

2
src/main/java/eu/monocles/chat/DownloadDefaultStickers.java → src/main/java/de/monocles/chat/DownloadDefaultStickers.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import static eu.siacs.conversations.persistance.FileBackend.APP_DIRECTORY;

2
src/main/java/eu/monocles/chat/EmojiSearch.java → src/main/java/de/monocles/chat/EmojiSearch.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import android.app.Activity;
import android.content.Context;

2
src/main/java/eu/monocles/chat/GetThumbnailForCid.java → src/main/java/de/monocles/chat/GetThumbnailForCid.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import android.graphics.drawable.Drawable;

2
src/main/java/eu/monocles/chat/GridView.java → src/main/java/de/monocles/chat/GridView.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import android.content.Context;
import android.util.AttributeSet;

2
src/main/java/eu/monocles/chat/InlineImageSpan.java → src/main/java/de/monocles/chat/InlineImageSpan.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import android.graphics.Paint;
import android.graphics.drawable.AnimatedImageDrawable;

2
src/main/java/eu/monocles/chat/KeyboardHeightProvider.java → src/main/java/de/monocles/chat/KeyboardHeightProvider.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import android.content.Context;
import android.graphics.Rect;

2
src/main/java/eu/monocles/chat/MessageTextActionModeCallback.java → src/main/java/de/monocles/chat/MessageTextActionModeCallback.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import android.view.ActionMode;
import android.view.Menu;

2
src/main/java/eu/monocles/chat/ReadMoreListener.java → src/main/java/de/monocles/chat/ReadMoreListener.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
/**
* Created by Mays Atari.

2
src/main/java/eu/monocles/chat/ReadMoreTextView.java → src/main/java/de/monocles/chat/ReadMoreTextView.java
View file

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.monocles.chat;
package de.monocles.chat;
import android.content.Context;
import android.content.res.TypedArray;

2
src/main/java/eu/monocles/chat/RegisterMonoclesActivity.java → src/main/java/de/monocles/chat/RegisterMonoclesActivity.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import android.content.Intent;
import android.os.Bundle;

2
src/main/java/eu/monocles/chat/SignUpPage.java → src/main/java/de/monocles/chat/SignUpPage.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import static eu.siacs.conversations.ui.StartConversationActivity.addInviteUri;

2
src/main/java/eu/monocles/chat/SpannedToXHTML.java → src/main/java/de/monocles/chat/SpannedToXHTML.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import android.app.Application;
import android.graphics.Typeface;

2
src/main/java/eu/monocles/chat/SwipeDetector.java → src/main/java/de/monocles/chat/SwipeDetector.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import android.util.Log;
import android.view.MotionEvent;

2
src/main/java/eu/monocles/chat/TagEditorView.java → src/main/java/de/monocles/chat/TagEditorView.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import android.app.Activity;
import android.content.Context;

2
src/main/java/eu/monocles/chat/ThumbHash.java → src/main/java/de/monocles/chat/ThumbHash.java
View file

@ -7,7 +7,7 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package eu.monocles.chat;
package de.monocles.chat;
public final class ThumbHash {
/**

2
src/main/java/eu/monocles/chat/Util.java → src/main/java/de/monocles/chat/Util.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import android.view.View;
import android.view.ViewGroup;

2
src/main/java/eu/monocles/chat/WebxdcPage.java → src/main/java/de/monocles/chat/WebxdcPage.java
View file

@ -1,7 +1,7 @@
// Based on GPLv3 code from deltachat-android
// https://github.com/deltachat/deltachat-android/blob/master/src/org/thoughtcrime/securesms/WebViewActivity.java
// https://github.com/deltachat/deltachat-android/blob/master/src/org/thoughtcrime/securesms/WebxdcActivity.java
package eu.monocles.chat;
package de.monocles.chat;
import android.content.Context;
import android.content.Intent;

2
src/main/java/eu/monocles/chat/WebxdcUpdate.java → src/main/java/de/monocles/chat/WebxdcUpdate.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat;
package de.monocles.chat;
import android.content.ContentValues;
import android.database.Cursor;

2
src/main/java/eu/monocles/chat/ui/CallsActivity.java → src/main/java/de/monocles/chat/ui/CallsActivity.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat.ui;
package de.monocles.chat.ui;
import android.content.DialogInterface;
import android.content.Intent;

2
src/main/java/eu/monocles/chat/ui/PermissionsActivity.java → src/main/java/de/monocles/chat/ui/PermissionsActivity.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat.ui;
package de.monocles.chat.ui;
import android.Manifest;
import android.content.Intent;

2
src/main/java/eu/monocles/chat/utils → src/main/java/de/monocles/chat/utils
View file

@ -1,4 +1,4 @@
package eu.monocles.chat
package de.monocles.chat
import android.content.Context
import androidx.annotation.AttrRes

4
src/main/java/eu/siacs/conversations/entities/Contact.java
View file

@ -747,8 +747,8 @@ public class Contact implements ListItem, Blockable {
public PhoneAccountHandle phoneAccountHandle() {
ComponentName componentName = new ComponentName(
"eu.monocles.chat",
"eu.monocles.chat.ConnectionService"
"de.monocles.chat",
"de.monocles.chat.ConnectionService"
);
return new PhoneAccountHandle(componentName, phoneAccountLabel());
}

6
src/main/java/eu/siacs/conversations/entities/Conversation.java
View file

@ -64,9 +64,9 @@ import com.google.android.material.tabs.TabLayout;
import com.google.android.material.textfield.TextInputLayout;
import com.google.common.base.Optional;
import eu.monocles.chat.ConversationPage;
import eu.monocles.chat.Util;
import eu.monocles.chat.WebxdcPage;
import de.monocles.chat.ConversationPage;
import de.monocles.chat.Util;
import de.monocles.chat.WebxdcPage;
import eu.siacs.conversations.xmpp.forms.Field;

12
src/main/java/eu/siacs/conversations/entities/Message.java
View file

@ -21,10 +21,10 @@ import android.text.Html;
import android.util.Pair;
import android.view.View;
import eu.monocles.chat.BobTransfer;
import eu.monocles.chat.GetThumbnailForCid;
import eu.monocles.chat.InlineImageSpan;
import eu.monocles.chat.SpannedToXHTML;
import de.monocles.chat.BobTransfer;
import de.monocles.chat.GetThumbnailForCid;
import de.monocles.chat.InlineImageSpan;
import de.monocles.chat.SpannedToXHTML;
import java.io.IOException;
import java.util.stream.Collectors;
@ -37,8 +37,8 @@ import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.ByteSource;
import com.google.common.primitives.Longs;
import eu.monocles.chat.BobTransfer;
import eu.monocles.chat.GetThumbnailForCid;
import de.monocles.chat.BobTransfer;
import de.monocles.chat.GetThumbnailForCid;
import java.net.URI;
import java.net.URISyntaxException;

2
src/main/java/eu/siacs/conversations/generator/IqGenerator.java
View file

@ -9,7 +9,7 @@ import android.util.Log;
import android.util.Base64OutputStream;
import eu.siacs.conversations.entities.Message;
import eu.monocles.chat.BobTransfer;
import de.monocles.chat.BobTransfer;
import com.google.common.io.ByteStreams;

4
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View file

@ -6,8 +6,8 @@ import android.net.Uri;
import eu.monocles.chat.BobTransfer;
import eu.monocles.chat.WebxdcUpdate;
import de.monocles.chat.BobTransfer;
import de.monocles.chat.WebxdcUpdate;
import java.io.File;
import java.net.URISyntaxException;

2
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
View file

@ -15,7 +15,7 @@ import android.util.Log;
import com.google.common.base.Stopwatch;
import eu.monocles.chat.WebxdcUpdate;
import de.monocles.chat.WebxdcUpdate;
import org.json.JSONException;
import org.json.JSONObject;

4
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
View file

@ -63,8 +63,8 @@ import com.google.common.io.ByteStreams;
import com.wolt.blurhashkt.BlurHashDecoder;
import eu.monocles.chat.BobTransfer;
import eu.monocles.chat.ThumbHash;
import de.monocles.chat.BobTransfer;
import de.monocles.chat.ThumbHash;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;

2
src/main/java/eu/siacs/conversations/services/NotificationService.java
View file

@ -1,6 +1,6 @@
package eu.siacs.conversations.services;
import static eu.monocles.chat.ui.PermissionsActivity.permissions;
import static de.monocles.chat.ui.PermissionsActivity.permissions;
import static eu.siacs.conversations.ui.util.MyLinkify.replaceYoutube;
import static eu.siacs.conversations.utils.Compatibility.s;

2
src/main/java/eu/siacs/conversations/services/UpdateService.java
View file

@ -100,7 +100,7 @@ public class UpdateService extends AsyncTask<String, Object, UpdateService.Wrapp
String ownVersion = BuildConfig.VERSION_NAME;
String url = json.getString("appURI");
String filesize = json.getString("filesize");
if (BuildConfig.APPLICATION_ID.equals("eu.monocles.chat")) {
if (BuildConfig.APPLICATION_ID.equals("de.monocles.chat")) {
url = json.getString("appURIPS");
filesize = json.getString("filesizePS");
}

4
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -100,8 +100,8 @@ import com.google.common.base.Objects;
import com.google.common.base.Strings;
import com.otaliastudios.transcoder.strategy.DefaultAudioStrategy;
import eu.monocles.chat.EmojiSearch;
import eu.monocles.chat.WebxdcUpdate;
import de.monocles.chat.EmojiSearch;
import de.monocles.chat.WebxdcUpdate;
import org.conscrypt.Conscrypt;
import org.openintents.openpgp.IOpenPgpService2;

2
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
View file

@ -93,7 +93,7 @@ import eu.siacs.conversations.xmpp.XmppConnection;
import eu.siacs.conversations.xml.Element;
import eu.siacs.conversations.ui.util.ShareUtil;
import eu.siacs.conversations.databinding.CommandRowBinding;
import eu.monocles.chat.Util;
import de.monocles.chat.Util;
import android.view.ViewGroup;
import android.util.TypedValue;
import android.graphics.drawable.Drawable;

8
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -8,8 +8,8 @@ import java.lang.ref.WeakReference;
import java.util.Date;
import java.util.Map;
import eu.monocles.chat.KeyboardHeightProvider;
import eu.monocles.chat.WebxdcPage;
import de.monocles.chat.KeyboardHeightProvider;
import de.monocles.chat.WebxdcPage;
import eu.siacs.conversations.ui.adapter.CommandAdapter;
import eu.siacs.conversations.utils.Random;
import eu.siacs.conversations.xml.Element;
@ -114,8 +114,8 @@ import android.widget.RelativeLayout;
import android.widget.TextView.OnEditorActionListener;
import android.widget.Toast;
import eu.siacs.conversations.utils.Emoticons;
import eu.monocles.chat.BobTransfer;
import eu.monocles.chat.EmojiSearch;
import de.monocles.chat.BobTransfer;
import de.monocles.chat.EmojiSearch;
import java.net.URISyntaxException;
import android.os.Environment;
import android.os.storage.StorageManager;

6
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
View file

@ -29,7 +29,7 @@
package eu.siacs.conversations.ui;
import static eu.monocles.chat.ui.PermissionsActivity.permissions;
import static de.monocles.chat.ui.PermissionsActivity.permissions;
import static eu.siacs.conversations.ui.ConversationFragment.REQUEST_DECRYPT_PGP;
import static eu.siacs.conversations.ui.SettingsActivity.HIDE_MEMORY_WARNING;
import static eu.siacs.conversations.ui.SettingsActivity.MIN_ANDROID_SDK21_SHOWN;
@ -71,7 +71,7 @@ import android.widget.Toast;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import eu.monocles.chat.DownloadDefaultStickers;
import de.monocles.chat.DownloadDefaultStickers;
import net.java.otr4j.session.SessionStatus;
import androidx.appcompat.widget.PopupMenu;
@ -86,7 +86,7 @@ import androidx.databinding.DataBindingUtil;
import org.openintents.openpgp.util.OpenPgpApi;
import eu.monocles.chat.ui.CallsActivity;
import de.monocles.chat.ui.CallsActivity;
import eu.siacs.conversations.ui.util.AvatarWorkerTask;
import eu.siacs.conversations.utils.Compatibility;
import io.michaelrocks.libphonenumber.android.NumberParseException;

2
src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java
View file

@ -24,7 +24,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import eu.monocles.chat.SignUpPage;
import de.monocles.chat.SignUpPage;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import eu.siacs.conversations.databinding.ActivityMagicCreateBinding;

4
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
View file

@ -36,7 +36,7 @@ import android.provider.OpenableColumns;
import android.util.Log;
import static eu.siacs.conversations.utils.CameraUtils.showCameraChooser;
import eu.monocles.chat.DownloadDefaultStickers;
import de.monocles.chat.DownloadDefaultStickers;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
@ -45,7 +45,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.core.content.ContextCompat;
import androidx.exifinterface.media.ExifInterface;
import eu.monocles.chat.SignUpPage;
import de.monocles.chat.SignUpPage;
import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.utils.CameraUtils;

2
src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java
View file

@ -30,7 +30,7 @@ import java.lang.ref.WeakReference;
import java.util.List;
import java.util.Locale;
import eu.monocles.chat.SignUpPage;
import de.monocles.chat.SignUpPage;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import eu.siacs.conversations.databinding.ActivityShowLocationBinding;

2
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View file

@ -53,7 +53,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.stream.Collectors;
import eu.monocles.chat.ui.CallsActivity;
import de.monocles.chat.ui.CallsActivity;
import eu.siacs.conversations.utils.UIHelper;
import androidx.annotation.MenuRes;

2
src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java
View file

@ -19,7 +19,7 @@ import androidx.databinding.DataBindingUtil;
import com.google.common.base.Strings;
import eu.monocles.chat.DownloadDefaultStickers;
import de.monocles.chat.DownloadDefaultStickers;
import org.jetbrains.annotations.NotNull;

4
src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java
View file

@ -1,6 +1,6 @@
package eu.siacs.conversations.ui;
import static eu.monocles.chat.ui.PermissionsActivity.permissions;
import static de.monocles.chat.ui.PermissionsActivity.permissions;
import static eu.siacs.conversations.Config.DISALLOW_REGISTRATION_IN_UI;
import static eu.siacs.conversations.utils.PermissionUtils.allGranted;
import static eu.siacs.conversations.utils.PermissionUtils.readGranted;
@ -28,7 +28,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.HashSet;
import eu.monocles.chat.RegisterMonoclesActivity;
import de.monocles.chat.RegisterMonoclesActivity;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import eu.siacs.conversations.databinding.WelcomeBinding;

2
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
View file

@ -1,6 +1,6 @@
package eu.siacs.conversations.ui;
import static eu.monocles.chat.ui.PermissionsActivity.permissions;
import static de.monocles.chat.ui.PermissionsActivity.permissions;
import static eu.siacs.conversations.ui.SettingsActivity.USE_INTERNAL_UPDATER;
import android.graphics.drawable.AnimatedImageDrawable;

4
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
View file

@ -1,6 +1,6 @@
package eu.siacs.conversations.ui.adapter;
import static eu.monocles.chat.Util.getReadmakerType;
import static de.monocles.chat.Util.getReadmakerType;
import static eu.siacs.conversations.ui.util.MyLinkify.replaceYoutube;
import android.content.SharedPreferences;
@ -25,7 +25,7 @@ import com.google.common.base.Strings;
import java.util.List;
import eu.monocles.chat.Util;
import de.monocles.chat.Util;
import eu.siacs.conversations.R;
import eu.siacs.conversations.databinding.ConversationListRowBinding;
import eu.siacs.conversations.entities.Conversation;

12
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file

@ -1,8 +1,8 @@
package eu.siacs.conversations.ui.adapter;
import eu.monocles.chat.BobTransfer;
import eu.monocles.chat.MessageTextActionModeCallback;
import eu.monocles.chat.Util;
import de.monocles.chat.BobTransfer;
import de.monocles.chat.MessageTextActionModeCallback;
import de.monocles.chat.Util;
import eu.siacs.conversations.ui.widget.ClickableMovementMethod;
import eu.siacs.conversations.utils.Compatibility;
import eu.siacs.conversations.xml.Element;
@ -11,7 +11,7 @@ import me.saket.bettermovementmethod.BetterLinkMovementMethod;
import static android.view.View.GONE;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
import static eu.monocles.chat.Util.getReadmakerType;
import static de.monocles.chat.Util.getReadmakerType;
import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY;
import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY_OLD;
import static eu.siacs.conversations.persistance.FileBackend.formatTime;
@ -95,8 +95,8 @@ import java.io.IOException;
import java.net.URISyntaxException;
import java.security.NoSuchAlgorithmException;
import eu.monocles.chat.WebxdcUpdate;
import eu.monocles.chat.WebxdcPage;
import de.monocles.chat.WebxdcUpdate;
import de.monocles.chat.WebxdcPage;
import eu.siacs.conversations.entities.Message;
import eu.siacs.conversations.Config;

2
src/main/java/eu/siacs/conversations/utils/FirstStartManager.java
View file

@ -9,7 +9,7 @@ public class FirstStartManager {
Context context;
private SharedPreferences pref;
private SharedPreferences.Editor editor;
private static final String PREF_NAME = "eu.monocles.chat";
private static final String PREF_NAME = "de.monocles.chat";
private static final String IS_FIRST_TIME_LAUNCH = "IsFirstTimeLaunch";
public FirstStartManager(Context context) {

4
src/main/java/eu/siacs/conversations/utils/ThemeHelper.java
View file

@ -40,7 +40,7 @@ import android.preference.PreferenceManager;
import android.util.TypedValue;
import android.widget.TextView;
import android.content.res.loader.ResourcesLoader;
import eu.monocles.chat.ColorResourcesLoaderCreator;
import de.monocles.chat.ColorResourcesLoaderCreator;
import java.util.HashMap;
import android.util.Log;
@ -66,7 +66,7 @@ public class ThemeHelper {
if (sharedPreferences.contains("custom_theme_accent")) colors.put(R.color.custom_theme_accent, sharedPreferences.getInt("custom_theme_accent", 0));
if (colors.isEmpty()) return colors;
ResourcesLoader loader = eu.monocles.chat.ColorResourcesLoaderCreator.create(context, colors);
ResourcesLoader loader = de.monocles.chat.ColorResourcesLoaderCreator.create(context, colors);
try {
if (loader != null) context.getResources().addLoaders(loader);
} catch (final IllegalArgumentException e) {

2
src/main/res/layout-land/fragment_conversation.xml
View file

@ -187,7 +187,7 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:layout_gravity="center_vertical" />
<eu.monocles.chat.ReadMoreTextView
<de.monocles.chat.ReadMoreTextView
app:trimExpandedText="@string/show_less"
app:trimCollapsedText="@string/show_more"
app:trimMode="trimModeLength"

2
src/main/res/layout/activity_contact_details.xml
View file

@ -107,7 +107,7 @@
android:layout_gravity="center_horizontal"
android:orientation="horizontal" />
<eu.monocles.chat.TagEditorView
<de.monocles.chat.TagEditorView
android:id="@+id/edit_tags"
android:visibility="gone"
android:hint="@string/tags"

2
src/main/res/layout/activity_muc_details.xml
View file

@ -116,7 +116,7 @@
android:orientation="vertical"
android:visibility="gone">
<eu.monocles.chat.TagEditorView
<de.monocles.chat.TagEditorView
android:id="@+id/edit_tags"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
src/main/res/layout/activity_register_monocles.xml
View file

@ -52,7 +52,7 @@
android:text="@string/monocles_account_introduction"
android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
<eu.monocles.chat.ReadMoreTextView
<de.monocles.chat.ReadMoreTextView
android:id="@+id/instructions_monocles_account"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
src/main/res/layout/command_button_grid_field.xml
View file

@ -40,7 +40,7 @@
android:textAllCaps="false"
android:minHeight="75dp" />
<eu.monocles.chat.GridView
<de.monocles.chat.GridView
android:id="@+id/buttons"
android:layout_width="fill_parent"
android:layout_height="wrap_content"

2
src/main/res/layout/command_radio_edit_field.xml
View file

@ -17,7 +17,7 @@
android:textAppearance="@style/TextAppearance.Conversations.Subhead"
android:textColor="?attr/edit_text_color" />
<eu.monocles.chat.GridView
<de.monocles.chat.GridView
android:id="@+id/radios"
android:layout_width="fill_parent"
android:layout_height="wrap_content"

2
src/main/res/layout/fragment_conversation.xml
View file

@ -188,7 +188,7 @@
android:background="?attr/selectableItemBackgroundBorderless"
android:layout_gravity="center_vertical" />
<eu.monocles.chat.ReadMoreTextView
<de.monocles.chat.ReadMoreTextView
app:trimExpandedText="@string/show_less"
app:trimCollapsedText="@string/show_more"
app:trimMode="trimModeLength"

2
src/main/res/layout/message_content.xml
View file

@ -11,7 +11,7 @@
android:textIsSelectable="true"
android:textAppearance="@style/TextAppearance.Conversations.Body1" />
<eu.monocles.chat.ReadMoreTextView
<de.monocles.chat.ReadMoreTextView
app:trimExpandedText="@string/show_less"
app:trimCollapsedText="@string/show_more"
app:trimMode="trimModeLength"

16
src/main/res/xml/preferences.xml
View file

@ -9,7 +9,7 @@
<intent
android:action="android.intent.action.VIEW"
android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
android:targetPackage="eu.monocles.chat">
android:targetPackage="de.monocles.chat">
<extra
android:name="page"
android:value="userinterface" />
@ -67,7 +67,7 @@
<intent
android:action="android.intent.action.VIEW"
android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
android:targetPackage="eu.monocles.chat">
android:targetPackage="de.monocles.chat">
<extra
android:name="page"
android:value="custom_theme" />
@ -230,7 +230,7 @@
<intent
android:action="android.intent.action.VIEW"
android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
android:targetPackage="eu.monocles.chat">
android:targetPackage="de.monocles.chat">
<extra
android:name="page"
android:value="notifications" />
@ -247,7 +247,7 @@
<intent
android:action="android.intent.action.VIEW"
android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
android:targetPackage="eu.monocles.chat">
android:targetPackage="de.monocles.chat">
<extra
android:name="page"
android:value="quiet_hours" />
@ -324,7 +324,7 @@
<intent
android:action="android.intent.action.VIEW"
android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
android:targetPackage="eu.monocles.chat">
android:targetPackage="de.monocles.chat">
<extra
android:name="page"
android:value="attachments" />
@ -405,7 +405,7 @@
<intent
android:action="android.intent.action.VIEW"
android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
android:targetPackage="eu.monocles.chat">
android:targetPackage="de.monocles.chat">
<extra
android:name="page"
android:value="presence" />
@ -442,7 +442,7 @@
<intent
android:action="android.intent.action.VIEW"
android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
android:targetPackage="eu.monocles.chat">
android:targetPackage="de.monocles.chat">
<extra
android:name="page"
android:value="security" />
@ -590,7 +590,7 @@
<intent
android:action="android.intent.action.VIEW"
android:targetClass="eu.siacs.conversations.ui.SettingsActivity"
android:targetPackage="eu.monocles.chat">
android:targetPackage="de.monocles.chat">
<extra
android:name="page"
android:value="expert" />

2
src/playstore/java/eu/monocles/chat/StartUI.java → src/playstore/java/de/monocles/chat/StartUI.java
View file

@ -1,4 +1,4 @@
package eu.monocles.chat.ui;
package de.monocles.chat.ui;
import android.content.Context;
import android.content.Intent;