Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated dependency version numbers, removed workaround for actionmode bug

Browse Source
This commit is contained in:
daniel oeh 2013-11-16 21:12:11 +01:00
parent 85975df9fb
commit ef922d018c
6 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -9,7 +9,7 @@
<uses-sdk <uses-sdk
android:minSdkVersion="10" android:minSdkVersion="10"
android:targetSdkVersion="18" /> android:targetSdkVersion="19" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

8
build.gradle
View File

@ -23,7 +23,7 @@ dependencies {
new URL('http://www.aocate.com/presto/client/presto_client-0.8.5.jar').withInputStream{ i -> prestoLib.withOutputStream{ it << i }} new URL('http://www.aocate.com/presto/client/presto_client-0.8.5.jar').withInputStream{ i -> prestoLib.withOutputStream{ it << i }}
} }
compile 'com.android.support:appcompat-v7:18.0.+' compile 'com.android.support:appcompat-v7:19.0.+'
compile 'org.apache.commons:commons-lang3:3.1' compile 'org.apache.commons:commons-lang3:3.1'
compile ('org.shredzone.flattr4j:flattr4j-core:2.7') { compile ('org.shredzone.flattr4j:flattr4j-core:2.7') {
exclude group: 'org.apache.httpcomponents', module: 'httpcore' exclude group: 'org.apache.httpcomponents', module: 'httpcore'
@ -37,12 +37,12 @@ dependencies {
} }
android { android {
compileSdkVersion 18 compileSdkVersion 19
buildToolsVersion "18.1.0" buildToolsVersion "19.0.0"
defaultConfig { defaultConfig {
minSdkVersion 10 minSdkVersion 10
targetSdkVersion 18 targetSdkVersion 19
testPackageName "de.test.antennapod" testPackageName "de.test.antennapod"
testInstrumentationRunner "instrumentationTest.de.test.antennapod.AntennaPodTestRunner" testInstrumentationRunner "instrumentationTest.de.test.antennapod.AntennaPodTestRunner"
} }

19
pom.xml
View File

@ -13,18 +13,18 @@
<dependency> <dependency>
<groupId>android.support</groupId> <groupId>android.support</groupId>
<artifactId>compatibility-v4</artifactId> <artifactId>compatibility-v4</artifactId>
<version>18</version> <version>19</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>android.support</groupId> <groupId>android.support</groupId>
<artifactId>compatibility-v7-appcompat</artifactId> <artifactId>compatibility-v7-appcompat</artifactId>
<version>18</version> <version>19</version>
<type>apklib</type> <type>apklib</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>android.support</groupId> <groupId>android.support</groupId>
<artifactId>compatibility-v7-appcompat</artifactId> <artifactId>compatibility-v7-appcompat</artifactId>
<version>18</version> <version>19</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
@ -58,15 +58,16 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.android</groupId> <groupId>android</groupId>
<artifactId>android</artifactId> <artifactId>android</artifactId>
<scope>provided</scope> <scope>provided</scope>
<version>4.1.1.4</version> <version>4.4_r1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.android</groupId> <groupId>com.google.android.annotations</groupId>
<artifactId>annotations</artifactId> <artifactId>annotations</artifactId>
<version>4.1.1.4</version> <version>22.3</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
@ -109,11 +110,11 @@
<plugin> <plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId> <groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId> <artifactId>android-maven-plugin</artifactId>
<version>3.6.1</version> <version>3.8.0</version>
<configuration> <configuration>
<sdk> <sdk>
<path>${env.ANDROID_HOME}</path> <path>${env.ANDROID_HOME}</path>
<platform>18</platform> <platform>19</platform>
</sdk> </sdk>
<manifest> <manifest>
<debuggable>true</debuggable> <debuggable>true</debuggable>

8
src/de/danoeh/antennapod/activity/DownloadActivity.java
View File

@ -240,19 +240,11 @@ public class DownloadActivity extends ActionBarActivity implements
return handled; return handled;
} }
private boolean actionModeDestroyWorkaround = false; // TODO remove this workaround
private boolean skipWorkAround = Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH;
@Override @Override
public void onDestroyActionMode(ActionMode mode) { public void onDestroyActionMode(ActionMode mode) {
if (skipWorkAround || actionModeDestroyWorkaround) {
mActionMode = null; mActionMode = null;
selectedDownload = null; selectedDownload = null;
dla.setSelectedItemIndex(DownloadlistAdapter.SELECTION_NONE); dla.setSelectedItemIndex(DownloadlistAdapter.SELECTION_NONE);
actionModeDestroyWorkaround = false;
} else {
actionModeDestroyWorkaround = true;
}
} }
private BroadcastReceiver contentChanged = new BroadcastReceiver() { private BroadcastReceiver contentChanged = new BroadcastReceiver() {

8
src/de/danoeh/antennapod/fragment/FeedlistFragment.java
View File

@ -244,19 +244,11 @@ public class FeedlistFragment extends Fragment implements
return true; return true;
} }
private boolean actionModeDestroyWorkaround = false; // TODO remove this workaround
private boolean skipWorkAround = Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH;
@Override @Override
public void onDestroyActionMode(ActionMode mode) { public void onDestroyActionMode(ActionMode mode) {
if (skipWorkAround || actionModeDestroyWorkaround) {
mActionMode = null; mActionMode = null;
selectedFeed = null; selectedFeed = null;
fla.setSelectedItemIndex(FeedlistAdapter.SELECTION_NONE); fla.setSelectedItemIndex(FeedlistAdapter.SELECTION_NONE);
actionModeDestroyWorkaround = false;
} else {
actionModeDestroyWorkaround = true;
}
} }
@Override @Override

2
submodules/dslv

@ -1 +1 @@
Subproject commit f294d8eec59f73b5594634cac6fe1dc4e2cb32b6 Subproject commit 1bb29afb91f41af53f136599cf349752c13f52ab