From 6eb5fa79b1106e109dd3772b411d8e8df7139112 Mon Sep 17 00:00:00 2001 From: tonsense Date: Mon, 7 Apr 2014 14:02:09 +0200 Subject: [PATCH 1/3] Added Service to check for new Captchas in Background even when screen is off (using AlarmManager) --- AndroidManifest.xml | 1 + res/menu/menu.xml | 5 + res/values-de/strings.xml | 1 + res/values/strings.xml | 1 + .../android/client/AddLinksActivity.java | 0 .../pyload/android/client/Preferences.java | 3 + .../pyload/android/client/RemoteSettings.java | 0 .../components/ExpandableListFragment.java | 0 .../FixedExpandableListActivity.java | 0 .../components/FragmentPagerAdapter.java | 0 .../client/components/FragmentTabsPager.java | 0 .../client/components/ScrollingTextView.java | 0 .../android/client/components/TabHandler.java | 0 .../android/client/dialogs/AccountDialog.java | 0 .../android/client/dialogs/CaptchaDialog.java | 0 .../client/dialogs/FileInfoDialog.java | 0 .../android/client/exceptions/WrongLogin.java | 0 .../client/exceptions/WrongServer.java | 0 .../fragments/AbstractPackageFragment.java | 0 .../client/fragments/CollectorFragment.java | 0 .../fragments/ConfigSectionFragment.java | 0 .../client/fragments/OverviewFragment.java | 3 + .../client/fragments/QueueFragment.java | 0 .../client/fragments/SettingsFragment.java | 0 .../client/module/AllTrustManager.java | 0 .../pyload/android/client/module/Eula.java | 0 .../android/client/module/FileChooser.java | 0 .../pyload/android/client/module/GuiTask.java | 0 .../client/module/SeparatedListAdapter.java | 0 .../android/client/module/TaskQueue.java | 0 .../pyload/android/client/module/Utils.java | 0 src/org/pyload/android/client/pyLoad.java | 49 ++++++++++ src/org/pyload/android/client/pyLoadApp.java | 7 ++ .../client/service/CheckCaptchaService.java | 92 +++++++++++++++++++ 34 files changed, 162 insertions(+) mode change 100644 => 100755 AndroidManifest.xml mode change 100644 => 100755 src/org/pyload/android/client/AddLinksActivity.java mode change 100644 => 100755 src/org/pyload/android/client/Preferences.java mode change 100644 => 100755 src/org/pyload/android/client/RemoteSettings.java mode change 100644 => 100755 src/org/pyload/android/client/components/ExpandableListFragment.java mode change 100644 => 100755 src/org/pyload/android/client/components/FixedExpandableListActivity.java mode change 100644 => 100755 src/org/pyload/android/client/components/FragmentPagerAdapter.java mode change 100644 => 100755 src/org/pyload/android/client/components/FragmentTabsPager.java mode change 100644 => 100755 src/org/pyload/android/client/components/ScrollingTextView.java mode change 100644 => 100755 src/org/pyload/android/client/components/TabHandler.java mode change 100644 => 100755 src/org/pyload/android/client/dialogs/AccountDialog.java mode change 100644 => 100755 src/org/pyload/android/client/dialogs/CaptchaDialog.java mode change 100644 => 100755 src/org/pyload/android/client/dialogs/FileInfoDialog.java mode change 100644 => 100755 src/org/pyload/android/client/exceptions/WrongLogin.java mode change 100644 => 100755 src/org/pyload/android/client/exceptions/WrongServer.java mode change 100644 => 100755 src/org/pyload/android/client/fragments/AbstractPackageFragment.java mode change 100644 => 100755 src/org/pyload/android/client/fragments/CollectorFragment.java mode change 100644 => 100755 src/org/pyload/android/client/fragments/ConfigSectionFragment.java mode change 100644 => 100755 src/org/pyload/android/client/fragments/OverviewFragment.java mode change 100644 => 100755 src/org/pyload/android/client/fragments/QueueFragment.java mode change 100644 => 100755 src/org/pyload/android/client/fragments/SettingsFragment.java mode change 100644 => 100755 src/org/pyload/android/client/module/AllTrustManager.java mode change 100644 => 100755 src/org/pyload/android/client/module/Eula.java mode change 100644 => 100755 src/org/pyload/android/client/module/FileChooser.java mode change 100644 => 100755 src/org/pyload/android/client/module/GuiTask.java mode change 100644 => 100755 src/org/pyload/android/client/module/SeparatedListAdapter.java mode change 100644 => 100755 src/org/pyload/android/client/module/TaskQueue.java mode change 100644 => 100755 src/org/pyload/android/client/module/Utils.java mode change 100644 => 100755 src/org/pyload/android/client/pyLoad.java mode change 100644 => 100755 src/org/pyload/android/client/pyLoadApp.java create mode 100755 src/org/pyload/android/client/service/CheckCaptchaService.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml old mode 100644 new mode 100755 index bdff19d..2d44416 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -97,5 +97,6 @@ + diff --git a/res/menu/menu.xml b/res/menu/menu.xml index d24935a..0ae8607 100644 --- a/res/menu/menu.xml +++ b/res/menu/menu.xml @@ -32,4 +32,9 @@ android:icon="@drawable/ic_menu_restart" android:title="@string/restart_failed" /> + diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index a05245b..e9326c4 100755 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -91,6 +91,7 @@ Konnte keine Verbindung zu pyLoad herstellen. Bitte überprüfen sie, ob pyLoad läuft und ihre Servereinstellungen korrekt sind. Sprache Sprache der App. Ein Neustart ist notwendig, damit die Änderungen in Kraft treten. + Prüfe auf Captchas im Hintergrund Warteschlange Linksammler diff --git a/res/values/strings.xml b/res/values/strings.xml index 91ec5d2..3d3f62a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -100,6 +100,7 @@ Could not connect to pyLoad. Check that pyLoad is running and server settings are correct. + Check for Captchas in Background Language Language of the app. Needs a restart before changes take effect. diff --git a/src/org/pyload/android/client/AddLinksActivity.java b/src/org/pyload/android/client/AddLinksActivity.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/Preferences.java b/src/org/pyload/android/client/Preferences.java old mode 100644 new mode 100755 index 70f1d5a..7ec467a --- a/src/org/pyload/android/client/Preferences.java +++ b/src/org/pyload/android/client/Preferences.java @@ -5,6 +5,9 @@ import android.view.MenuItem; public class Preferences extends PreferenceActivity { + + public static final String CHECK_CAPTCHA_SERVICE_ENABLE = "check_captcha_bg"; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/src/org/pyload/android/client/RemoteSettings.java b/src/org/pyload/android/client/RemoteSettings.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/components/ExpandableListFragment.java b/src/org/pyload/android/client/components/ExpandableListFragment.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/components/FixedExpandableListActivity.java b/src/org/pyload/android/client/components/FixedExpandableListActivity.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/components/FragmentPagerAdapter.java b/src/org/pyload/android/client/components/FragmentPagerAdapter.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/components/FragmentTabsPager.java b/src/org/pyload/android/client/components/FragmentTabsPager.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/components/ScrollingTextView.java b/src/org/pyload/android/client/components/ScrollingTextView.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/components/TabHandler.java b/src/org/pyload/android/client/components/TabHandler.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/dialogs/AccountDialog.java b/src/org/pyload/android/client/dialogs/AccountDialog.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/dialogs/CaptchaDialog.java b/src/org/pyload/android/client/dialogs/CaptchaDialog.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/dialogs/FileInfoDialog.java b/src/org/pyload/android/client/dialogs/FileInfoDialog.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/exceptions/WrongLogin.java b/src/org/pyload/android/client/exceptions/WrongLogin.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/exceptions/WrongServer.java b/src/org/pyload/android/client/exceptions/WrongServer.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/fragments/AbstractPackageFragment.java b/src/org/pyload/android/client/fragments/AbstractPackageFragment.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/fragments/CollectorFragment.java b/src/org/pyload/android/client/fragments/CollectorFragment.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/fragments/ConfigSectionFragment.java b/src/org/pyload/android/client/fragments/ConfigSectionFragment.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/fragments/OverviewFragment.java b/src/org/pyload/android/client/fragments/OverviewFragment.java old mode 100644 new mode 100755 index c9113f6..0de7d01 --- a/src/org/pyload/android/client/fragments/OverviewFragment.java +++ b/src/org/pyload/android/client/fragments/OverviewFragment.java @@ -15,11 +15,14 @@ import org.pyload.thrift.Pyload.Client; import org.pyload.thrift.ServerStatus; +import android.app.Service; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnDismissListener; +import android.content.Intent; import android.os.Bundle; import android.os.Handler; +import android.os.IBinder; import android.support.v4.app.ListFragment; import android.util.Log; import android.view.ContextMenu; diff --git a/src/org/pyload/android/client/fragments/QueueFragment.java b/src/org/pyload/android/client/fragments/QueueFragment.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/fragments/SettingsFragment.java b/src/org/pyload/android/client/fragments/SettingsFragment.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/module/AllTrustManager.java b/src/org/pyload/android/client/module/AllTrustManager.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/module/Eula.java b/src/org/pyload/android/client/module/Eula.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/module/FileChooser.java b/src/org/pyload/android/client/module/FileChooser.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/module/GuiTask.java b/src/org/pyload/android/client/module/GuiTask.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/module/SeparatedListAdapter.java b/src/org/pyload/android/client/module/SeparatedListAdapter.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/module/TaskQueue.java b/src/org/pyload/android/client/module/TaskQueue.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/module/Utils.java b/src/org/pyload/android/client/module/Utils.java old mode 100644 new mode 100755 diff --git a/src/org/pyload/android/client/pyLoad.java b/src/org/pyload/android/client/pyLoad.java old mode 100644 new mode 100755 index 443d72d..9bc7740 --- a/src/org/pyload/android/client/pyLoad.java +++ b/src/org/pyload/android/client/pyLoad.java @@ -7,7 +7,12 @@ import java.util.HashMap; import java.util.Locale; +import android.app.AlarmManager; +import android.app.NotificationManager; +import android.app.PendingIntent; +import android.content.SharedPreferences; import android.content.res.Configuration; +import android.os.Build; import android.view.*; import org.pyload.android.client.components.FragmentTabsPager; import org.pyload.android.client.dialogs.AccountDialog; @@ -16,6 +21,7 @@ import org.pyload.android.client.fragments.QueueFragment; import org.pyload.android.client.module.Eula; import org.pyload.android.client.module.GuiTask; +import org.pyload.android.client.service.CheckCaptchaService; import org.pyload.thrift.Destination; import org.pyload.thrift.PackageDoesNotExists; import org.pyload.thrift.Pyload.Client; @@ -30,6 +36,7 @@ import android.util.Log; import android.widget.TabHost; import android.support.v4.view.MenuItemCompat; +import android.widget.Toast; public class pyLoad extends FragmentTabsPager { @@ -38,6 +45,10 @@ public class pyLoad extends FragmentTabsPager { // keep reference to set indeterminateProgress private MenuItem refreshItem; + // AlarmManager and PendingIntent for CheckCaptchaService + private AlarmManager alarmManager; + private PendingIntent checkCaptchaIntent; + /** Called when the activity is first created. */ public void onCreate(Bundle savedInstanceState) { @@ -113,18 +124,41 @@ protected void onStart() { } intent.setData(null); } + + // get AlarmManager and create PendingIntent for CheckCaptchaService + alarmManager = (AlarmManager) getSystemService(ALARM_SERVICE); + checkCaptchaIntent = PendingIntent.getService(this.getApplication(), 0, + new Intent(this.getApplication(), + CheckCaptchaService.class), 0); + app.notificationManager = (NotificationManager)getSystemService(NOTIFICATION_SERVICE); } @Override protected void onResume() { super.onResume(); app.refreshTab(); + alarmManager.cancel(checkCaptchaIntent); + app.notificationManager.cancel(CheckCaptchaService.NOTIFICATION_ID); } @Override protected void onPause() { super.onPause(); app.clearTasks(); + // create background service to check for captchas + if(app.prefs.getBoolean(Preferences.CHECK_CAPTCHA_SERVICE_ENABLE, true)) { + int interval = 5; + try { + interval = Integer.parseInt(app.prefs + .getString("refresh_rate", "5")); + } catch (NumberFormatException e) { + interval = 5; + } + Toast.makeText(this, "Checking for Captcha every " + interval + "s", Toast.LENGTH_SHORT).show(); + interval *= 1000; + alarmManager.setRepeating(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + interval, + interval, checkCaptchaIntent); + } } @Override @@ -137,6 +171,9 @@ public boolean onCreateOptionsMenu(Menu menu) { MenuItemCompat.setShowAsAction(menu.findItem(R.id.add_links), MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); + menu.findItem(R.id.ic_menu_check_captcha).setChecked( + app.prefs.getBoolean(Preferences.CHECK_CAPTCHA_SERVICE_ENABLE, true)); + return true; } @@ -183,6 +220,17 @@ public void run() { return true; + case R.id.ic_menu_check_captcha: + SharedPreferences.Editor prefEdit = app.prefs.edit(); + Log.d("pyLoad", "CheckCaptcha: " + item.isChecked()); + prefEdit.putBoolean(Preferences.CHECK_CAPTCHA_SERVICE_ENABLE, !item.isChecked()); + if(Build.VERSION.SDK_INT >= 7) + prefEdit.apply(); + else + prefEdit.commit(); + item.setChecked(!item.isChecked()); + return true; + default: return super.onOptionsItemSelected(item); } @@ -312,4 +360,5 @@ public void run() { public MenuItem getRefreshItem() { return refreshItem; } + } diff --git a/src/org/pyload/android/client/pyLoadApp.java b/src/org/pyload/android/client/pyLoadApp.java old mode 100644 new mode 100755 index aca8ec9..e55c9eb --- a/src/org/pyload/android/client/pyLoadApp.java +++ b/src/org/pyload/android/client/pyLoadApp.java @@ -13,7 +13,11 @@ import javax.net.ssl.*; import android.annotation.TargetApi; +import android.app.NotificationManager; +import android.app.Service; import android.content.Context; +import android.content.Intent; +import android.os.IBinder; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -53,6 +57,9 @@ public class pyLoadApp extends Application { public SharedPreferences prefs; public ConnectivityManager cm; + /** NotificationManager used by CheckCaptchaService */ + public NotificationManager notificationManager; + private pyLoad main; private static final String[] clientVersion = {"0.4.8", "0.4.9"}; diff --git a/src/org/pyload/android/client/service/CheckCaptchaService.java b/src/org/pyload/android/client/service/CheckCaptchaService.java new file mode 100755 index 0000000..015c450 --- /dev/null +++ b/src/org/pyload/android/client/service/CheckCaptchaService.java @@ -0,0 +1,92 @@ +package org.pyload.android.client.service; + +import android.app.AlarmManager; +import android.app.Notification; +import android.app.NotificationManager; +import android.app.PendingIntent; +import android.app.Service; +import android.content.Intent; +import android.media.RingtoneManager; +import android.os.AsyncTask; +import android.os.Binder; +import android.os.IBinder; +import android.preference.PreferenceManager; +import android.util.Log; + +import org.pyload.android.client.R; +import org.pyload.android.client.pyLoad; +import org.pyload.android.client.pyLoadApp; +import org.pyload.thrift.Pyload; + +/** Background Service checking for new captchas */ +public class CheckCaptchaService extends Service { + + public static final int NOTIFICATION_ID = 1000; + + private pyLoadApp app; + private Pyload.Client client; + private final IBinder mBinder = new CheckCaptchaBinder(); + + @Override + public void onCreate() { + Log.d("pyLoad", "create CaptchaService"); + app = new pyLoadApp(); + } + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + Log.d("pyLoad", "Captcha check service"); + app.prefs = PreferenceManager.getDefaultSharedPreferences(this); + app.notificationManager = (NotificationManager)getSystemService(NOTIFICATION_SERVICE); + AsyncTask asyncTask = new AsyncTask() { + @Override + protected Void doInBackground(Void... params) { + Log.d("pyLoad", "getting client in background"); + client = app.getClient(); + if(client.isCaptchaWaiting()) { + showNotification(); + } + return null; + } + }; + asyncTask.execute(); + return START_NOT_STICKY; + } + + @Override + public IBinder onBind(Intent intent) { + Log.d("pyLoad", "CaptchaBinder"); + return mBinder; + } + + public class CheckCaptchaBinder extends Binder { + CheckCaptchaService getService() { + return CheckCaptchaService.this; + } + } + + private void showNotification() { + // Build notification + Notification notification = new Notification(R.drawable.ic_launcher, getText(R.string.retrieve_captcha), + System.currentTimeMillis()); + notification.sound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION); + notification.defaults |= Notification.DEFAULT_VIBRATE; + + // The PendingIntent to launch our activity if the user selects this notification + PendingIntent contentIntent; + contentIntent = PendingIntent.getActivity(this, 0, + new Intent(this, pyLoad.class), 0); + + // Set the info for the views that show in the notification panel. + notification.setLatestEventInfo(this, getText(R.string.app_name), + getText(R.string.retrieve_captcha), contentIntent); + + // Send the notification. + app.notificationManager.notify(NOTIFICATION_ID, notification); + + // disable repeating background service, as we notify now + ((AlarmManager) getSystemService(ALARM_SERVICE)).cancel(PendingIntent.getService( + this.getApplication(), 0, new Intent(this.getApplication(), + CheckCaptchaService.class), 0)); + } +} \ No newline at end of file From d90b37a672caee0075bb3bc34cd15b7a0390fbb1 Mon Sep 17 00:00:00 2001 From: tonsense Date: Mon, 7 Apr 2014 14:15:24 +0200 Subject: [PATCH 2/3] revert file mode changed --- src/org/pyload/android/client/AddLinksActivity.java | 0 src/org/pyload/android/client/Preferences.java | 0 src/org/pyload/android/client/RemoteSettings.java | 0 .../pyload/android/client/components/ExpandableListFragment.java | 0 .../android/client/components/FixedExpandableListActivity.java | 0 .../pyload/android/client/components/FragmentPagerAdapter.java | 0 src/org/pyload/android/client/components/FragmentTabsPager.java | 0 src/org/pyload/android/client/components/ScrollingTextView.java | 0 src/org/pyload/android/client/components/TabHandler.java | 0 src/org/pyload/android/client/dialogs/AccountDialog.java | 0 src/org/pyload/android/client/dialogs/CaptchaDialog.java | 0 src/org/pyload/android/client/dialogs/FileInfoDialog.java | 0 src/org/pyload/android/client/exceptions/WrongLogin.java | 0 src/org/pyload/android/client/exceptions/WrongServer.java | 0 .../pyload/android/client/fragments/AbstractPackageFragment.java | 0 src/org/pyload/android/client/fragments/CollectorFragment.java | 0 .../pyload/android/client/fragments/ConfigSectionFragment.java | 0 src/org/pyload/android/client/fragments/OverviewFragment.java | 0 src/org/pyload/android/client/fragments/QueueFragment.java | 0 src/org/pyload/android/client/fragments/SettingsFragment.java | 0 src/org/pyload/android/client/module/AllTrustManager.java | 0 src/org/pyload/android/client/module/Eula.java | 0 src/org/pyload/android/client/module/FileChooser.java | 0 src/org/pyload/android/client/module/GuiTask.java | 0 src/org/pyload/android/client/module/SeparatedListAdapter.java | 0 src/org/pyload/android/client/module/TaskQueue.java | 0 src/org/pyload/android/client/module/Utils.java | 0 src/org/pyload/android/client/pyLoad.java | 0 src/org/pyload/android/client/pyLoadApp.java | 0 src/org/pyload/android/client/service/CheckCaptchaService.java | 0 30 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/org/pyload/android/client/AddLinksActivity.java mode change 100755 => 100644 src/org/pyload/android/client/Preferences.java mode change 100755 => 100644 src/org/pyload/android/client/RemoteSettings.java mode change 100755 => 100644 src/org/pyload/android/client/components/ExpandableListFragment.java mode change 100755 => 100644 src/org/pyload/android/client/components/FixedExpandableListActivity.java mode change 100755 => 100644 src/org/pyload/android/client/components/FragmentPagerAdapter.java mode change 100755 => 100644 src/org/pyload/android/client/components/FragmentTabsPager.java mode change 100755 => 100644 src/org/pyload/android/client/components/ScrollingTextView.java mode change 100755 => 100644 src/org/pyload/android/client/components/TabHandler.java mode change 100755 => 100644 src/org/pyload/android/client/dialogs/AccountDialog.java mode change 100755 => 100644 src/org/pyload/android/client/dialogs/CaptchaDialog.java mode change 100755 => 100644 src/org/pyload/android/client/dialogs/FileInfoDialog.java mode change 100755 => 100644 src/org/pyload/android/client/exceptions/WrongLogin.java mode change 100755 => 100644 src/org/pyload/android/client/exceptions/WrongServer.java mode change 100755 => 100644 src/org/pyload/android/client/fragments/AbstractPackageFragment.java mode change 100755 => 100644 src/org/pyload/android/client/fragments/CollectorFragment.java mode change 100755 => 100644 src/org/pyload/android/client/fragments/ConfigSectionFragment.java mode change 100755 => 100644 src/org/pyload/android/client/fragments/OverviewFragment.java mode change 100755 => 100644 src/org/pyload/android/client/fragments/QueueFragment.java mode change 100755 => 100644 src/org/pyload/android/client/fragments/SettingsFragment.java mode change 100755 => 100644 src/org/pyload/android/client/module/AllTrustManager.java mode change 100755 => 100644 src/org/pyload/android/client/module/Eula.java mode change 100755 => 100644 src/org/pyload/android/client/module/FileChooser.java mode change 100755 => 100644 src/org/pyload/android/client/module/GuiTask.java mode change 100755 => 100644 src/org/pyload/android/client/module/SeparatedListAdapter.java mode change 100755 => 100644 src/org/pyload/android/client/module/TaskQueue.java mode change 100755 => 100644 src/org/pyload/android/client/module/Utils.java mode change 100755 => 100644 src/org/pyload/android/client/pyLoad.java mode change 100755 => 100644 src/org/pyload/android/client/pyLoadApp.java mode change 100755 => 100644 src/org/pyload/android/client/service/CheckCaptchaService.java diff --git a/src/org/pyload/android/client/AddLinksActivity.java b/src/org/pyload/android/client/AddLinksActivity.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/Preferences.java b/src/org/pyload/android/client/Preferences.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/RemoteSettings.java b/src/org/pyload/android/client/RemoteSettings.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/components/ExpandableListFragment.java b/src/org/pyload/android/client/components/ExpandableListFragment.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/components/FixedExpandableListActivity.java b/src/org/pyload/android/client/components/FixedExpandableListActivity.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/components/FragmentPagerAdapter.java b/src/org/pyload/android/client/components/FragmentPagerAdapter.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/components/FragmentTabsPager.java b/src/org/pyload/android/client/components/FragmentTabsPager.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/components/ScrollingTextView.java b/src/org/pyload/android/client/components/ScrollingTextView.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/components/TabHandler.java b/src/org/pyload/android/client/components/TabHandler.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/dialogs/AccountDialog.java b/src/org/pyload/android/client/dialogs/AccountDialog.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/dialogs/CaptchaDialog.java b/src/org/pyload/android/client/dialogs/CaptchaDialog.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/dialogs/FileInfoDialog.java b/src/org/pyload/android/client/dialogs/FileInfoDialog.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/exceptions/WrongLogin.java b/src/org/pyload/android/client/exceptions/WrongLogin.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/exceptions/WrongServer.java b/src/org/pyload/android/client/exceptions/WrongServer.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/fragments/AbstractPackageFragment.java b/src/org/pyload/android/client/fragments/AbstractPackageFragment.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/fragments/CollectorFragment.java b/src/org/pyload/android/client/fragments/CollectorFragment.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/fragments/ConfigSectionFragment.java b/src/org/pyload/android/client/fragments/ConfigSectionFragment.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/fragments/OverviewFragment.java b/src/org/pyload/android/client/fragments/OverviewFragment.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/fragments/QueueFragment.java b/src/org/pyload/android/client/fragments/QueueFragment.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/fragments/SettingsFragment.java b/src/org/pyload/android/client/fragments/SettingsFragment.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/module/AllTrustManager.java b/src/org/pyload/android/client/module/AllTrustManager.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/module/Eula.java b/src/org/pyload/android/client/module/Eula.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/module/FileChooser.java b/src/org/pyload/android/client/module/FileChooser.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/module/GuiTask.java b/src/org/pyload/android/client/module/GuiTask.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/module/SeparatedListAdapter.java b/src/org/pyload/android/client/module/SeparatedListAdapter.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/module/TaskQueue.java b/src/org/pyload/android/client/module/TaskQueue.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/module/Utils.java b/src/org/pyload/android/client/module/Utils.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/pyLoad.java b/src/org/pyload/android/client/pyLoad.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/pyLoadApp.java b/src/org/pyload/android/client/pyLoadApp.java old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/service/CheckCaptchaService.java b/src/org/pyload/android/client/service/CheckCaptchaService.java old mode 100755 new mode 100644 From e57dd8b0c36123eeea8f7981a099649ebb0ad43c Mon Sep 17 00:00:00 2001 From: tonsense Date: Mon, 7 Apr 2014 14:21:55 +0200 Subject: [PATCH 3/3] removed unused imports --- AndroidManifest.xml | 0 res/values-de/strings.xml | 0 src/org/pyload/android/client/fragments/OverviewFragment.java | 3 --- src/org/pyload/android/client/pyLoadApp.java | 3 --- src/org/pyload/android/client/service/CheckCaptchaService.java | 2 +- 5 files changed, 1 insertion(+), 7 deletions(-) mode change 100755 => 100644 AndroidManifest.xml mode change 100755 => 100644 res/values-de/strings.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml old mode 100755 new mode 100644 diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml old mode 100755 new mode 100644 diff --git a/src/org/pyload/android/client/fragments/OverviewFragment.java b/src/org/pyload/android/client/fragments/OverviewFragment.java index 0de7d01..c9113f6 100644 --- a/src/org/pyload/android/client/fragments/OverviewFragment.java +++ b/src/org/pyload/android/client/fragments/OverviewFragment.java @@ -15,14 +15,11 @@ import org.pyload.thrift.Pyload.Client; import org.pyload.thrift.ServerStatus; -import android.app.Service; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnDismissListener; -import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.os.IBinder; import android.support.v4.app.ListFragment; import android.util.Log; import android.view.ContextMenu; diff --git a/src/org/pyload/android/client/pyLoadApp.java b/src/org/pyload/android/client/pyLoadApp.java index e55c9eb..1a2378e 100644 --- a/src/org/pyload/android/client/pyLoadApp.java +++ b/src/org/pyload/android/client/pyLoadApp.java @@ -14,10 +14,7 @@ import android.annotation.TargetApi; import android.app.NotificationManager; -import android.app.Service; import android.content.Context; -import android.content.Intent; -import android.os.IBinder; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; diff --git a/src/org/pyload/android/client/service/CheckCaptchaService.java b/src/org/pyload/android/client/service/CheckCaptchaService.java index 015c450..a284735 100644 --- a/src/org/pyload/android/client/service/CheckCaptchaService.java +++ b/src/org/pyload/android/client/service/CheckCaptchaService.java @@ -89,4 +89,4 @@ private void showNotification() { this.getApplication(), 0, new Intent(this.getApplication(), CheckCaptchaService.class), 0)); } -} \ No newline at end of file +}