Remove support for Android versions older than 4.2

irccloud · Jul 20, 2018 · d255f05 · d255f05
1 parent a2c5733
commit d255f05
Show file tree

Hide file tree

Showing 26 changed files with 178 additions and 631 deletions.
diff --git a/build.gradle b/build.gradle
@@ -70,7 +70,7 @@ android {
     defaultConfig {
         versionCode 195
         versionName "4.10"
-        minSdkVersion 14
+        minSdkVersion 17
         targetSdkVersion 28
         multiDexEnabled true
         applicationId "com.irccloud.android"

diff --git a/res/drawable-nodpi/ic_sony_bw.png b/res/drawable-nodpi/ic_sony_bw.png
diff --git a/res/drawable-nodpi/ic_sony_extension.png b/res/drawable-nodpi/ic_sony_extension.png
diff --git a/res/drawable-nodpi/ic_sony_msg.png b/res/drawable-nodpi/ic_sony_msg.png
diff --git a/res/drawable-nodpi/ic_sony_msg_2.png b/res/drawable-nodpi/ic_sony_msg_2.png
diff --git a/res/drawable/badge_counter.png b/res/drawable/badge_counter.png
diff --git a/res/drawable/headset_pro_cancel_icn.png b/res/drawable/headset_pro_cancel_icn.png
diff --git a/res/drawable/headset_pro_focus_xs_icn.png b/res/drawable/headset_pro_focus_xs_icn.png
diff --git a/res/drawable/headset_pro_ok_icn.png b/res/drawable/headset_pro_ok_icn.png
diff --git a/res/layout/smart_watch_notification_widget.xml b/res/layout/smart_watch_notification_widget.xml
diff --git a/res/layout/smart_watch_widget.xml b/res/layout/smart_watch_widget.xml
diff --git a/res/xml-v14/preferences_message.xml b/res/xml-v14/preferences_message.xml
diff --git a/res/xml-v14/preferences_notifications.xml b/res/xml-v14/preferences_notifications.xml
diff --git a/res/xml/preferences_message.xml b/res/xml/preferences_message.xml
@@ -58,6 +58,14 @@
 			android:key="mode-showsymbol"
 			android:defaultValue="false"
 			android:summary="\@, +, etc." android:title="Show usermode symbols"/>
+        <SwitchPreference
+            android:key="emoji-disableconvert"
+            android:defaultValue="true"
+            android:title="Convert :emocodes: to emoji"/>
+		<SwitchPreference
+			android:key="emoji-nobig"
+			android:defaultValue="true"
+			android:title="Enlarge emoji-only messages"/>
         <SwitchPreference
             android:key="nick-colors"
             android:defaultValue="false"
@@ -66,6 +74,6 @@
 			android:key="mention-colors"
 			android:defaultValue="false"
 			android:title="Colourise mentions"/>
-    </PreferenceCategory>
+	</PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/preferences_notifications.xml b/res/xml/preferences_notifications.xml
@@ -37,6 +37,11 @@
 			android:key="notify_led_color"
 			android:defaultValue="1"
 			android:title="LED"/>
+		<SwitchPreference
+			android:key="notify_quickreply"
+			android:defaultValue="true"
+			android:summary="Quickly reply to messages from the notification tray"
+			android:title="Quick Reply"/>
 		<SwitchPreference
 			android:key="notifications_all"
 			android:defaultValue="false"

diff --git a/src/com/irccloud/android/IRCCloudApplicationBase.java b/src/com/irccloud/android/IRCCloudApplicationBase.java
@@ -66,8 +66,7 @@ public class IRCCloudApplicationBase extends MultiDexApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
-            TrustKit.initializeWithNetworkSecurityConfiguration(getApplicationContext(), R.xml.network_security_config);
+        TrustKit.initializeWithNetworkSecurityConfiguration(getApplicationContext(), R.xml.network_security_config);
         Fabric.with(this, new Crashlytics());
         Crashlytics.log(Log.INFO, "IRCCloud", "Crashlytics Initialized");
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

diff --git a/src/com/irccloud/android/IRCCloudLinkMovementMethod.java b/src/com/irccloud/android/IRCCloudLinkMovementMethod.java
@@ -88,7 +88,7 @@ public static void launchURI(Uri uri, Context context) {
             intent.intent.setData(uri);
             if(Build.VERSION.SDK_INT >= 22)
                 intent.intent.putExtra(Intent.EXTRA_REFERRER, Uri.parse(Intent.URI_ANDROID_APP_SCHEME + "//" + context.getPackageName()));
-            if (Build.VERSION.SDK_INT >= 16 && intent.startAnimationBundle != null) {
+            if (intent.startAnimationBundle != null) {
                 context.startActivity(intent.intent, intent.startAnimationBundle);
             } else {
                 context.startActivity(intent.intent);

diff --git a/src/com/irccloud/android/NetworkConnection.java b/src/com/irccloud/android/NetworkConnection.java
@@ -943,7 +943,7 @@ public JSONObject fetchConfig() {
 
     public void set_pastebin_cookie() {
         try {
-            if (Build.VERSION.SDK_INT >= 16 && config != null) {
+            if (config != null) {
                 CookieSyncManager sm = CookieSyncManager.createInstance(IRCCloudApplication.getInstance().getApplicationContext());
                 CookieManager cm = CookieManager.getInstance();
                 Uri u = Uri.parse(config.getString("pastebin_uri_template"));

diff --git a/src/com/irccloud/android/activity/AvatarsActivity.java b/src/com/irccloud/android/activity/AvatarsActivity.java
@@ -373,7 +373,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent imageRet
                 fileUploadTask = new MainActivity.FileUploadTask(uri, null);
                 fileUploadTask.avatar = true;
                 fileUploadTask.orgId = orgId;
-                if(Build.VERSION.SDK_INT >= 16 && ActivityCompat.checkSelfPermission(AvatarsActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                if(ActivityCompat.checkSelfPermission(AvatarsActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
                     ActivityCompat.requestPermissions(AvatarsActivity.this,
                             new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.WRITE_EXTERNAL_STORAGE},
                             REQUEST_EXTERNAL_MEDIA_IRCCLOUD);