Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83fb936b authored by Gabor Keszthelyi's avatar Gabor Keszthelyi Committed by Marten Gajda
Browse files

Update minSdkLevel to 15. Remove all obsolete code and resources. #392 (#549)

parent e2c521a8
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
COMPILE_SDK_VERSION=25
BUILD_TOOLS_VERSION=27.0.1
MIN_SDK_VERSION=9
MIN_SDK_VERSION=15
TARGET_SDK_VERSION=25
# dependency versions
SUPPORT_LIBRARY_VERSION=25.4.0
+2 −17
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.content.UriMatcher;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
import android.os.Build;
import android.os.Handler;
import android.util.Log;

@@ -148,15 +147,8 @@ public enum ContentOperation
            SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
            Editor editor = prefs.edit();
            editor.putLong(PREFS_KEY_LAST_ALARM_TIMESTAMP, time.getTimestamp());
            if (Build.VERSION.SDK_INT >= 9)
            {
            editor.apply();
        }
            else
            {
                editor.commit();
            }
        }


        private DateTime getLastAlarmTimestamp(Context context)
@@ -285,15 +277,8 @@ public enum ContentOperation
            SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
            Editor editor = prefs.edit();
            editor.putLong(PREFS_KEY_LAST_ALARM_TIMESTAMP, time.getTimestamp());
            if (Build.VERSION.SDK_INT >= 9)
            {
            editor.apply();
        }
            else
            {
                editor.commit();
            }
        }


        private DateTime getLastAlarmTimestamp(Context context)
+1 −20
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package org.dmfs.provider.tasks;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.OnAccountsUpdateListener;
import android.annotation.TargetApi;
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues;
@@ -33,7 +32,6 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
import android.os.Build;
import android.os.Handler;
import android.os.HandlerThread;
import android.text.TextUtils;
@@ -77,7 +75,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;


@@ -948,7 +945,6 @@ public final class TaskProvider extends SQLiteContentProvider implements OnAccou
    }


    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
    @Override
    public int updateInTransaction(final SQLiteDatabase db, Uri uri, final ContentValues values, String selection, String[] selectionArgs,
                                   final boolean isSyncAdapter)
@@ -1120,22 +1116,7 @@ public final class TaskProvider extends SQLiteContentProvider implements OnAccou
                operation.run(getContext(), mAsyncHandler, uri, db, values);
        }

        // get the keys in values
        Set<String> keys;
        if (android.os.Build.VERSION.SDK_INT < 11)
        {
            keys = new HashSet<String>();
            for (Entry<String, Object> entry : values.valueSet())
            {
                keys.add(entry.getKey());
            }
        }
        else
        {
            keys = values.keySet();
        }

        if (!TASK_LIST_SYNC_COLUMNS.containsAll(keys))
        if (!TASK_LIST_SYNC_COLUMNS.containsAll(values.keySet()))
        {
            // send notifications, because non-sync columns have been updated
            postNotifyUri(uri);
+3 −65
Original line number Diff line number Diff line
@@ -141,72 +141,10 @@
        </activity>
        <service
                android:name="org.dmfs.tasks.homescreen.TaskListWidgetUpdaterService"
                android:permission="android.permission.BIND_REMOTEVIEWS"></service>

        <receiver
                android:name="org.dmfs.tasks.homescreen.TaskListWidgetProviderLegacy"
                android:enabled="@bool/preHoneycomb"
                android:label="@string/task_list_widget_title">
            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
            </intent-filter>
            <intent-filter>
                <action android:name="org.dmfs.tasks.action.TASKWIDGET_UPDATE"/>
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.PROVIDER_CHANGED"/>

                <data
                        android:host="@string/opentasks_authority"
                        android:scheme="content"/>
            </intent-filter>
            <intent-filter>
                <action android:name="org.dmfs.android.tasks.TASK_START"/>

                <data
                        android:scheme="content"
                        android:host="@string/opentasks_authority"
                        android:mimeType="vnd.android.cursor.item/org.dmfs.tasks.tasks"/>
            </intent-filter>

            <meta-data
                    android:name="android.appwidget.provider"
                    android:resource="@xml/task_widget_info"/>
        </receiver>
        <receiver
                android:name="org.dmfs.tasks.homescreen.TaskListWidgetProviderLargeLegacy"
                android:enabled="@bool/preHoneycomb"
                android:label="@string/task_list_widget_title_4x4">
            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
            </intent-filter>
            <intent-filter>
                <action android:name="org.dmfs.tasks.action.TASKWIDGET_UPDATE"/>
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.PROVIDER_CHANGED"/>

                <data
                        android:host="@string/opentasks_authority"
                        android:scheme="content"/>
            </intent-filter>
            <intent-filter>
                <action android:name="org.dmfs.android.tasks.TASK_START"/>

                <data
                        android:scheme="content"
                        android:host="@string/opentasks_authority"
                        android:mimeType="vnd.android.cursor.item/org.dmfs.tasks.tasks"/>
            </intent-filter>

            <meta-data
                    android:name="android.appwidget.provider"
                    android:resource="@xml/task_widget_info_large"/>
        </receiver>
                android:permission="android.permission.BIND_REMOTEVIEWS"/>

        <receiver
                android:name="org.dmfs.tasks.homescreen.TaskListWidgetProvider"
                android:enabled="@bool/postHoneycomb"
                android:label="@string/task_list_widget_title">
            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -236,7 +174,7 @@
        </receiver>
        <receiver
                android:name="org.dmfs.tasks.homescreen.TaskListWidgetProviderLarge"
                android:enabled="@bool/postHoneycomb"
                android:enabled="true"
                android:label="@string/task_list_widget_title_4x4">
            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -314,7 +252,7 @@
                android:name="org.dmfs.tasks.dashclock.DashClockPreferenceActivity"
                android:exported="true"
                android:label="@string/title_task_list"
                android:theme="@style/AppTheme"></activity>
                android:theme="@style/AppTheme"/>
        <!-- Color Picker -->
        <activity
                android:name="org.dmfs.android.colorpicker.ColorPickerActivity"
+1 −14
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@

package org.dmfs.tasks;

import android.annotation.TargetApi;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.RequiresApi;
import android.view.MenuItem;

import org.dmfs.tasks.utils.BaseActivity;
@@ -30,7 +27,6 @@ import org.dmfs.tasks.utils.BaseActivity;
 *
 * @author Gabor Keszthelyi
 */
@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
public final class AppSettingsActivity extends BaseActivity
{

@@ -43,7 +39,7 @@ public final class AppSettingsActivity extends BaseActivity
                .replace(android.R.id.content, new AppSettingsFragment())
                .commit();

        setupActionBar();
        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
    }


@@ -58,13 +54,4 @@ public final class AppSettingsActivity extends BaseActivity
        return super.onOptionsItemSelected(item);
    }


    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
    private void setupActionBar()
    {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
        {
            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
        }
    }
}
Loading