From f569ea56b170c73e9f90667643c81bed4d9e0921 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 27 Sep 2018 08:07:36 +0300 Subject: gradle and dependency updates for android studio 3.2 remove deprecated tasker-related components --- org.fox.ttrss/src/main/AndroidManifest.xml | 14 --- .../java/org/fox/ttrss/tasker/TaskerReceiver.java | 103 --------------------- .../fox/ttrss/tasker/TaskerSettingsActivity.java | 94 ------------------- 3 files changed, 211 deletions(-) delete mode 100755 org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java delete mode 100644 org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerSettingsActivity.java (limited to 'org.fox.ttrss/src/main') diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 20d90005..82f15faf 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -69,13 +69,6 @@ android:name=".LogcatActivity" android:label="@string/logcat_title" > - - - - - @@ -223,13 +216,6 @@ - - - - - - - diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java deleted file mode 100755 index 52c600bf..00000000 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java +++ /dev/null @@ -1,103 +0,0 @@ -package org.fox.ttrss.tasker; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.os.Build; -import android.os.Bundle; -import android.preference.PreferenceManager; -import android.util.Log; -import android.widget.Toast; - -import org.fox.ttrss.ApiCommon; -import org.fox.ttrss.ApiRequest; -import org.fox.ttrss.offline.OfflineDownloadService; -import org.fox.ttrss.offline.OfflineUploadService; -import org.fox.ttrss.util.SimpleLoginManager; - -public class TaskerReceiver extends BroadcastReceiver { - private final String TAG = this.getClass().getSimpleName(); - - @Override - public void onReceive(Context context, Intent intent) { - Log.d(TAG, "Got action: " + intent.getAction()); - - final Context fContext = context; - - if (com.twofortyfouram.locale.Intent.ACTION_FIRE_SETTING.equals(intent.getAction())) { - - final Bundle settings = intent.getBundleExtra(com.twofortyfouram.locale.Intent.EXTRA_BUNDLE); - final int actionId = settings != null ? settings.getInt("actionId", -1) : -1; - - Log.d(TAG, "received action id=" + actionId); - - SimpleLoginManager loginMgr = new SimpleLoginManager() { - - @Override - protected void onLoginSuccess(int requestId, String sessionId, int apiLevel) { - - switch (actionId) { - case TaskerSettingsActivity.ACTION_DOWNLOAD: - if (true) { - Intent intent = new Intent(fContext, - OfflineDownloadService.class); - intent.putExtra("sessionId", sessionId); - intent.putExtra("batchMode", true); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - fContext.startForegroundService(intent); - } else { - fContext.startService(intent); - } - } - break; - case TaskerSettingsActivity.ACTION_UPLOAD: - if (true) { - Intent intent = new Intent(fContext, - OfflineUploadService.class); - intent.putExtra("sessionId", sessionId); - intent.putExtra("batchMode", true); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - fContext.startForegroundService(intent); - } else { - fContext.startService(intent); - } - - } - break; - default: - Log.d(TAG, "unknown action id=" + actionId); - } - } - - @Override - protected void onLoginFailed(int requestId, ApiRequest ar) { - Toast toast = Toast.makeText(fContext, fContext.getString(ar.getErrorMessage()), Toast.LENGTH_SHORT); - toast.show(); - } - - @Override - protected void onLoggingIn(int requestId) { - // - } - }; - - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - - String login = prefs.getString("login", "").trim(); - String password = prefs.getString("password", "").trim(); - String ttrssUrl = prefs.getString("ttrss_url", "").trim(); - ApiCommon.trustAllHosts(prefs.getBoolean("ssl_trust_any", false), prefs.getBoolean("ssl_trust_any_host", false)); - - if (ttrssUrl.equals("")) { - Toast toast = Toast.makeText(fContext, "Could not download articles: not configured?", Toast.LENGTH_SHORT); - toast.show(); - } else { - loginMgr.logIn(context, 1, login, password); - } - } - } - -} diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerSettingsActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerSettingsActivity.java deleted file mode 100644 index 21c65e20..00000000 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerSettingsActivity.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.fox.ttrss.tasker; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.util.Log; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.Button; -import android.widget.RadioGroup; -import android.widget.RadioGroup.OnCheckedChangeListener; - -import org.fox.ttrss.R; - -public class TaskerSettingsActivity extends Activity { - protected static final int ACTION_DOWNLOAD = 0; - protected static final int ACTION_UPLOAD = 1; - - private final String TAG = this.getClass().getSimpleName(); - - protected Bundle m_settings = new Bundle(); - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - Bundle settings = getIntent().getBundleExtra(com.twofortyfouram.locale.Intent.EXTRA_BUNDLE); - - int actionId = settings != null ? settings.getInt("actionId", -1) : -1; - - setContentView(R.layout.activity_tasker_settings); - - RadioGroup radioGroup = (RadioGroup) findViewById(R.id.taskerActions); - - switch (actionId) { - case TaskerSettingsActivity.ACTION_DOWNLOAD: - radioGroup.check(R.id.actionDownload); - break; - case TaskerSettingsActivity.ACTION_UPLOAD: - radioGroup.check(R.id.actionUpload); - break; - default: - Log.d(TAG, "unknown action id=" + actionId); - } - - radioGroup.setOnCheckedChangeListener(new OnCheckedChangeListener() { - @Override - public void onCheckedChanged(RadioGroup group, int checkedId) { - switch (checkedId) { - case R.id.actionDownload: - m_settings.putInt("actionId", ACTION_DOWNLOAD); - break; - case R.id.actionUpload: - m_settings.putInt("actionId", ACTION_UPLOAD); - break; - } - } - }); - - Button button = (Button)findViewById(R.id.close_button); - - button.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - - @Override - public void finish() { - final Intent intent = new Intent(); - - intent.putExtra(com.twofortyfouram.locale.Intent.EXTRA_BUNDLE, m_settings); - - String blurb = "?"; - - switch (m_settings.getInt("actionId")) { - case TaskerSettingsActivity.ACTION_DOWNLOAD: - blurb = getString(R.string.download_articles_and_go_offline); - break; - case TaskerSettingsActivity.ACTION_UPLOAD: - blurb = getString(R.string.synchronize_read_articles_and_go_online); - break; - } - - intent.putExtra(com.twofortyfouram.locale.Intent.EXTRA_STRING_BLURB, blurb); - - setResult(RESULT_OK, intent); - - super.finish(); - - } -} -- cgit v1.2.3