Merge remote-tracking branch 'origin/main'

deltachat · Jan 27, 2025 · 2308fee · 2308fee
2 parents a3b0ee1 + bfda7ab
commit 2308fee
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -184,7 +184,6 @@ dependencies {
     annotationProcessor 'androidx.annotation:annotation:1.9.1'
     implementation 'com.makeramen:roundedimageview:2.1.0' // crops the avatars to circles
     implementation 'com.pnikosis:materialish-progress:1.5' // used only in the "Progress Wheel" in Share Activity.
-    implementation 'com.soundcloud.android:android-crop:1.0.1@aar' // used for profile and group avatar selection in Android SDK<19
     implementation 'com.nineoldandroids:library:2.4.0' // DEPRECATED! Used to slide in the half-camera.
     implementation 'com.github.amulyakhare:TextDrawable:558677ea31'  // number of unread messages,
     // the one-letter circle for the contacts (when there is not avatar) and a white background.

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -316,8 +316,6 @@
               android:theme="@style/TextSecure.ScribbleTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
-
     <activity android:name=".InstantOnboardingActivity"
               android:theme="@style/TextSecure.LightTheme"
               android:windowSoftInputMode="stateHidden|adjustResize"

diff --git a/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java b/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java
@@ -27,7 +27,6 @@
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
-import com.soundcloud.android.crop.Crop;
 
 import org.thoughtcrime.securesms.components.AvatarSelector;
 import org.thoughtcrime.securesms.components.InputAwareLayout;
@@ -143,10 +142,6 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
       case ScribbleActivity.SCRIBBLE_REQUEST_CODE:
         setAvatarView(data.getData());
         break;
-
-      case Crop.REQUEST_CROP:
-        setAvatarView(Crop.getOutput(data));
-        break;
     }
   }
 

diff --git a/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/main/java/org/thoughtcrime/securesms/GroupCreateActivity.java
@@ -25,7 +25,6 @@
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
-import com.soundcloud.android.crop.Crop;
 
 import org.thoughtcrime.securesms.components.AvatarSelector;
 import org.thoughtcrime.securesms.connect.DcHelper;
@@ -344,10 +343,6 @@ public void onActivityResult(int reqCode, int resultCode, final Intent data) {
       case ScribbleActivity.SCRIBBLE_REQUEST_CODE:
         setAvatarView(data.getData());
         break;
-
-      case Crop.REQUEST_CROP:
-        setAvatarView(Crop.getOutput(data));
-        break;
     }
   }
 

diff --git a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
@@ -39,7 +39,6 @@
 import com.bumptech.glide.request.transition.Transition;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
-import com.soundcloud.android.crop.Crop;
 
 import org.thoughtcrime.securesms.components.AvatarSelector;
 import org.thoughtcrime.securesms.connect.AccountManager;
@@ -190,10 +189,6 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         setAvatarView(data.getData());
         break;
 
-      case Crop.REQUEST_CROP:
-        setAvatarView(Crop.getOutput(data));
-        break;
-
       case IntentIntegrator.REQUEST_CODE:
         String qrRaw = data.getStringExtra(RegistrationQrActivity.QRDATA_EXTRA);
         if (qrRaw == null) {

diff --git a/src/main/java/org/thoughtcrime/securesms/profiles/AvatarHelper.java b/src/main/java/org/thoughtcrime/securesms/profiles/AvatarHelper.java
@@ -12,7 +12,6 @@
 import androidx.annotation.Nullable;
 
 import com.b44t.messenger.DcContext;
-import com.soundcloud.android.crop.Crop;
 
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.scribbles.ScribbleActivity;