update

chenjia404 · Jun 19, 2023 · e52c4d0 · e52c4d0
1 parent 300c3a6
commit e52c4d0
Show file tree

Hide file tree

Showing 266 changed files with 853 additions and 468 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ ffpr
 *.sh
 pkcs11.password
 play
+app/website/release
diff --git a/app/build.gradle b/app/build.gradle
@@ -160,8 +160,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.4'
 }
 
-def canonicalVersionCode = 338
-def canonicalVersionName = "1.16.9"
+def canonicalVersionCode = 344
+def canonicalVersionName = "1.17.5"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
@@ -172,7 +172,7 @@ def abiPostFix = ['armeabi-v7a' : 1,
 
 android {
     compileSdkVersion androidCompileSdkVersion
-    namespace 'network.loki.messenger'
+    namespace 'network.qki.messenger'
     useLibrary 'org.apache.http.legacy'
 
     compileOptions {
@@ -214,6 +214,7 @@ android {
 
         vectorDrawables.useSupportLibrary = true
         project.ext.set("archivesBaseName", "session")
+        applicationId 'network.qki.messenger'
 
         buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
         buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
@@ -269,7 +270,7 @@ android {
             def postFix = abiPostFix.get(abiName, 0)
 
             if (postFix >= postFixSize) throw new AssertionError("postFix is too large")
-            output.outputFileName = output.outputFileName = "session-${variant.versionName}-${abiName}.apk"
+            output.outputFileName = output.outputFileName = "${variant.applicationId}-${variant.versionName}-${abiName}.apk"
             output.versionCodeOverride = canonicalVersionCode * postFixSize + postFix
         }
     }

diff --git a/app/google-services.json b/app/google-services.json
@@ -10,7 +10,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:43512467490:android:12239ad88b21eedf19ba7b",
         "android_client_info": {
-          "package_name": "network.loki.messenger"
+          "package_name": "network.qki.messenger"
         }
       },
       "oauth_client": [

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    package="network.qki.messenger"
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat,android.support.v13,com.davemorrissey.labs.subscaleview,com.tomergoldst.tooltips,com.klinker.android.send_message,com.takisoft.colorpicker,android.support.v14.preference" />
 
     <permission
-        android:name="network.loki.messenger.ACCESS_SESSION_SECRETS"
+        android:name="network.qki.messenger.ACCESS_SESSION_SECRETS"
         android:label="Access to Session secrets"
         android:protectionLevel="signature" />
 
@@ -33,7 +34,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-    <uses-permission android:name="network.loki.messenger.ACCESS_SESSION_SECRETS" />
+    <uses-permission android:name="network.qki.messenger.ACCESS_SESSION_SECRETS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />

diff --git a/app/src/main/assets/mnemonic/english.txt b/app/src/main/assets/mnemonic/english.txt
diff --git a/app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java
@@ -24,7 +24,7 @@
 import org.thoughtcrime.securesms.util.ThemeState;
 import org.thoughtcrime.securesms.util.UiModeUtilities;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public abstract class BaseActionBarActivity extends AppCompatActivity {
   private static final String TAG = BaseActionBarActivity.class.getSimpleName();

diff --git a/app/src/main/java/org/thoughtcrime/securesms/BaseActivity.java b/app/src/main/java/org/thoughtcrime/securesms/BaseActivity.java
@@ -15,7 +15,7 @@
 import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageActivityHelper;
 import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public abstract class BaseActivity extends FragmentActivity {
   @Override

diff --git a/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.java b/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.java
@@ -10,7 +10,7 @@
 import org.session.libsession.utilities.ExpirationUtil;
 
 import cn.carbswang.android.numberpickerview.library.NumberPickerView;
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class ExpirationDialog extends AlertDialog {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaDocumentsAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/MediaDocumentsAdapter.java
@@ -32,7 +32,7 @@
 import java.util.Date;
 import java.util.Locale;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 import static com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager.TAG;
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaGalleryAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/MediaGalleryAdapter.java
@@ -38,7 +38,7 @@
 import java.util.Locale;
 import java.util.Set;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 class MediaGalleryAdapter extends StickyHeaderGridAdapter {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java
@@ -76,7 +76,7 @@
 import java.util.List;
 import java.util.Locale;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 /**
  * Activity for displaying media attachments in-app

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -85,7 +85,7 @@
 import java.util.Locale;
 import java.util.WeakHashMap;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 /**
  * Activity for displaying media attachments in-app

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java b/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java
@@ -8,7 +8,7 @@
 
 import java.util.concurrent.TimeUnit;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class MuteDialog extends AlertDialog {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -49,7 +49,7 @@
 import java.security.InvalidKeyException;
 import java.security.Signature;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 //TODO Rename to ScreenLockActivity and refactor to Kotlin.
 public class PassphrasePromptActivity extends BaseActionBarActivity {

diff --git a/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java
@@ -53,7 +53,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 /**
  * An activity to quickly share content with contacts

diff --git a/app/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java
@@ -15,7 +15,7 @@
 import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class ShortcutLauncherActivity extends AppCompatActivity {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
@@ -46,8 +46,8 @@
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 
-import network.loki.messenger.BuildConfig;
-import network.loki.messenger.R;
+import network.qki.messenger.BuildConfig;
+import network.qki.messenger.R;
 
 public class AudioSlidePlayer implements SensorEventListener {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java b/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java
@@ -27,7 +27,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 import static android.provider.MediaStore.EXTRA_OUTPUT;
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
@@ -22,8 +22,8 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import network.loki.messenger.R
-import network.loki.messenger.databinding.ActivityWebrtcBinding
+import network.qki.messenger.R
+import network.qki.messenger.databinding.ActivityWebrtcBinding
 import org.apache.commons.lang3.time.DurationFormatUtils
 import org.session.libsession.avatars.ProfileContactPhoto
 import org.session.libsession.messaging.contacts.Contact

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AnimatingToggle.java b/app/src/main/java/org/thoughtcrime/securesms/components/AnimatingToggle.java
@@ -11,7 +11,7 @@
 import android.view.animation.AnimationUtils;
 import android.widget.FrameLayout;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 import org.session.libsession.utilities.ViewUtil;
 
 public class AnimatingToggle extends FrameLayout {

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java b/app/src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
@@ -29,7 +29,7 @@
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.session.libsession.utilities.ViewUtil;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class AttachmentTypeSelector extends PopupWindow {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -31,7 +31,7 @@
 
 import java.util.Objects;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class AvatarImageView extends AppCompatImageView {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/CircleColorImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/CircleColorImageView.java
@@ -8,7 +8,7 @@
 import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class CircleColorImageView extends AppCompatImageView {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemAlertView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemAlertView.java
@@ -9,7 +9,7 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class ConversationItemAlertView extends LinearLayout {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
@@ -23,7 +23,7 @@
 
 import java.util.Locale;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class ConversationItemFooter extends LinearLayout {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java b/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java
@@ -20,7 +20,7 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 import org.thoughtcrime.securesms.components.CustomDefaultPreference.CustomDefaultPreferenceDialogFragmentCompat.CustomPreferenceValidator;
 import org.session.libsession.utilities.TextSecurePreferences;
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java b/app/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java
@@ -10,7 +10,7 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class DeliveryStatusView extends FrameLayout {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java b/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java
@@ -19,7 +19,7 @@
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress;
 import org.thoughtcrime.securesms.events.PartProgressEvent;

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
@@ -13,7 +13,7 @@
 import android.text.style.TypefaceSpan;
 import android.util.AttributeSet;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.util.ResUtil;

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
@@ -28,7 +28,7 @@
 import android.view.Surface;
 import android.view.View;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 import org.session.libsession.utilities.ServiceUtil;
 import org.session.libsession.utilities.Util;
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/LabeledEditText.java b/app/src/main/java/org/thoughtcrime/securesms/components/LabeledEditText.java
@@ -14,7 +14,7 @@
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class LabeledEditText extends FrameLayout implements View.OnFocusChangeListener {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/MaxHeightScrollView.java b/app/src/main/java/org/thoughtcrime/securesms/components/MaxHeightScrollView.java
@@ -6,7 +6,7 @@
 import android.util.AttributeSet;
 import android.widget.ScrollView;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class MaxHeightScrollView extends ScrollView {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/MediaView.java b/app/src/main/java/org/thoughtcrime/securesms/components/MediaView.java
@@ -12,7 +12,7 @@
 import android.view.Window;
 import android.widget.FrameLayout;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.VideoSlide;
 import org.thoughtcrime.securesms.video.VideoPlayer;

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt
@@ -7,8 +7,8 @@ import android.widget.ImageView
 import android.widget.RelativeLayout
 import androidx.annotation.DimenRes
 import com.bumptech.glide.load.engine.DiskCacheStrategy
-import network.loki.messenger.R
-import network.loki.messenger.databinding.ViewProfilePictureBinding
+import network.qki.messenger.R
+import network.qki.messenger.databinding.ViewProfilePictureBinding
 import org.session.libsession.avatars.ContactColors
 import org.session.libsession.avatars.PlaceholderAvatarPhoto
 import org.session.libsession.avatars.ProfileContactPhoto

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java b/app/src/main/java/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
@@ -25,7 +25,7 @@
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.signature.MediaStoreSignature;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
 import org.thoughtcrime.securesms.database.loaders.RecentPhotosLoader;
 import org.thoughtcrime.securesms.mms.GlideApp;

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java b/app/src/main/java/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
@@ -9,7 +9,7 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class RemovableEditableMediaView extends FrameLayout {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java b/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
@@ -18,7 +18,7 @@
 
 import org.thoughtcrime.securesms.util.AnimationCompleteListener;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class SearchToolbar extends LinearLayout {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ShapeScrim.java b/app/src/main/java/org/thoughtcrime/securesms/components/ShapeScrim.java
@@ -12,7 +12,7 @@
 import android.util.AttributeSet;
 import android.view.View;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class ShapeScrim extends View {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/SquareFrameLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/SquareFrameLayout.java
@@ -8,7 +8,7 @@
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class SquareFrameLayout extends FrameLayout {
 

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/StickerView.java b/app/src/main/java/org/thoughtcrime/securesms/components/StickerView.java
@@ -14,7 +14,7 @@
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
 
-import network.loki.messenger.R;
+import network.qki.messenger.R;
 
 public class StickerView extends FrameLayout {
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,3 +16,4 @@ ffpr @@
     *.sh
     pkcs11.password
     play
+    app/website/release