Change app ID and file path

This commit is contained in:
12aw 2024-01-19 16:55:26 +01:00
parent c4fed45851
commit ea34c607e1
68 changed files with 106 additions and 106 deletions

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) Vorschaubilder erstellt von Pigeonalley (https://pigeonalley.com)
Download ist hier möglich: Download ist hier möglich:
<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> <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>
Folge uns auf <a rel="me" href="https://monocles.social/@monocles">monocles social</a> Folge uns auf <a rel="me" href="https://monocles.social/@monocles">monocles social</a>

View file

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

View file

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

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> <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/"/> <homepage rdf:resource="https://monocles.eu/more/"/>
<download-page rdf:resource="https://f-droid.org/en/packages/de.monocles.chat/"/> <download-page rdf:resource="https://f-droid.org/en/packages/eu.monocles.chat/"/>
<bug-database rdf:resource="https://codeberg.org/Arne/monocles_chat/issues"/> <bug-database rdf:resource="https://codeberg.org/Arne/monocles_chat/issues"/>
<!-- See https://github.com/ewilderj/doap/issues/53 --> <!-- See https://github.com/ewilderj/doap/issues/53 -->
<developer-forum rdf:resource="xmpp:development@conference.monocles.de?join"/> <developer-forum rdf:resource="xmpp:development@conference.monocles.de?join"/>

View file

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

2
proguard-rules.pro vendored
View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

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. 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 de.monocles.chat; package eu.monocles.chat;
public final class ThumbHash { public final class ThumbHash {
/** /**

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -21,10 +21,10 @@ import android.text.Html;
import android.util.Pair; import android.util.Pair;
import android.view.View; import android.view.View;
import de.monocles.chat.BobTransfer; import eu.monocles.chat.BobTransfer;
import de.monocles.chat.GetThumbnailForCid; import eu.monocles.chat.GetThumbnailForCid;
import de.monocles.chat.InlineImageSpan; import eu.monocles.chat.InlineImageSpan;
import de.monocles.chat.SpannedToXHTML; import eu.monocles.chat.SpannedToXHTML;
import java.io.IOException; import java.io.IOException;
import java.util.stream.Collectors; 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.collect.ImmutableSet;
import com.google.common.io.ByteSource; import com.google.common.io.ByteSource;
import com.google.common.primitives.Longs; import com.google.common.primitives.Longs;
import de.monocles.chat.BobTransfer; import eu.monocles.chat.BobTransfer;
import de.monocles.chat.GetThumbnailForCid; import eu.monocles.chat.GetThumbnailForCid;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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