Skip to content

Commit d1694e8

Browse files
oliverschloebeoliverschloebe
committed
Revert "Revert "Release 1.0.1""
This reverts commit dc99fb2.
1 parent dc99fb2 commit d1694e8

File tree

8 files changed

+86
-53
lines changed

8 files changed

+86
-53
lines changed

‎app/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.1"
4+
compileSdkVersion 24
5+
buildToolsVersion "24.0.3"
66

77
defaultConfig {
88
minSdkVersion 15
9-
targetSdkVersion 23
10-
versionCode 1
11-
versionName "1.0"
9+
targetSdkVersion 24
10+
versionCode 5
11+
versionName "1.1.0"
1212
}
1313

1414
compileOptions {
@@ -24,7 +24,7 @@ android {
2424
}
2525

2626
dependencies {
27-
compile 'com.android.support:appcompat-v7:23.1.0'
28-
compile 'com.uwetrottmann.seriesguide:seriesguide-api:1.2.0'
27+
compile 'com.android.support:appcompat-v7:24.2.1'
28+
compile 'com.uwetrottmann.seriesguide:seriesguide-api:1.3.0'
2929
compile fileTree(dir: 'libs', include: ['*.jar'])
3030
}

‎app/src/main/java/de/schloebe/seriesguide/streamingfinder/MainActivity.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
11
package de.schloebe.seriesguide.streamingfinder;
22

3-
import android.content.Intent;
3+
import android.content.ComponentName;
4+
import android.content.pm.PackageManager;
45
import android.os.Bundle;
56
import android.support.v7.app.AppCompatActivity;
6-
import android.view.View;
7-
import com.battlelancer.seriesguide.api.Intents;
87

98
public class MainActivity extends AppCompatActivity {
109

1110
@Override
1211
protected void onCreate(Bundle savedInstanceState) {
1312
super.onCreate(savedInstanceState);
13+
14+
try {
15+
PackageManager p = getPackageManager();
16+
ComponentName componentName = new ComponentName(this, MainActivity.class);
17+
p.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
18+
} catch (Exception e) {
19+
e.printStackTrace();
20+
}
21+
1422
setContentView(R.layout.activity_main);
1523
}
1624
}

‎app/src/main/java/de/schloebe/seriesguide/streamingfinder/StreamingFinderExtension.java‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package de.schloebe.seriesguide.streamingfinder;
22

3-
import android.content.Context;
43
import android.content.Intent;
54
import android.content.SharedPreferences;
65
import android.net.Uri;
76
import android.preference.PreferenceManager;
8-
import android.widget.Toast;
97

108
import com.battlelancer.seriesguide.api.Action;
119
import com.battlelancer.seriesguide.api.Episode;
10+
import com.battlelancer.seriesguide.api.Movie;
1211
import com.battlelancer.seriesguide.api.SeriesGuideExtension;
1312

1413
public class StreamingFinderExtension extends SeriesGuideExtension {
@@ -19,21 +18,29 @@ public StreamingFinderExtension() {
1918

2019
@Override
2120
protected void onRequest(int episodeIdentifier, Episode episode) {
21+
publishGoogleAction(episodeIdentifier, episode.getShowTitle());
22+
}
23+
24+
@Override
25+
protected void onRequest(int movieIdentifier, Movie movie) {
26+
publishGoogleAction(movieIdentifier, movie.getTitle());
27+
}
28+
29+
private void publishGoogleAction(int identifier, String searchTerm) {
2230
SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
2331
String serviceKey = SP.getString("streamingService", "justwatchus");
2432

2533
String baseUrl = (String)getResources().getText(
2634
getResources().getIdentifier(
2735
"searchurl_" + serviceKey,
2836
"string",
29-
"de.schloebe.seriesguide.streamingfinder.app"
37+
"de.schloebe.seriesguide.streamingfinder"
3038
)
3139
);
3240

33-
publishAction(new Action.Builder(getString(R.string.app_name), episodeIdentifier)
41+
publishAction(new Action.Builder(getString(R.string.app_name), identifier)
3442
.viewIntent(new Intent(Intent.ACTION_VIEW)
35-
.setData(Uri.parse(baseUrl + episode.getShowTitle())))
43+
.setData(Uri.parse(baseUrl + searchTerm)))
3644
.build());
3745
}
38-
3946
}

‎app/src/main/res/values-de/strings.xml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,19 @@
66
<string name="setting_select_service">Streaming-Suchmaschine wählen</string>
77
<string name="setting_select_service_title">Streaming-Suchmaschine</string>
88

9-
<string name="searchurl_werstreamtes">https://www.werstreamt.es/filme-serien/?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
10-
<string name="searchurl_canistreamit">http://www.canistream.it/search/tv/</string>
11-
<string name="searchurl_justwatchus">https://www.justwatch.com/us/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
12-
<string name="searchurl_justwatchde">https://www.justwatch.com/de/Suche?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
13-
<string name="searchurl_justwatchca">https://www.justwatch.com/ca/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
14-
<string name="searchurl_justwatchuk">https://www.justwatch.com/uk/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
15-
<string name="searchurl_justwatchbr">https://www.justwatch.com/br/busca?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
16-
<string name="searchurl_justwatchau">https://www.justwatch.com/au/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
17-
<string name="searchurl_justwatchnz">https://www.justwatch.com/nz/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
18-
<string name="searchurl_swyrltv">https://www.swyrl.tv/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
19-
<string name="searchurl_streamcatcherde">http://www.streamcatcher.de/suchergebnis?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
9+
<string name="searchurl_werstreamtes">https://www.werstreamt.es/filme-serien/?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
10+
<string name="searchurl_justwatchau">https://www.justwatch.com/au/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
11+
<string name="searchurl_justwatchbr">https://www.justwatch.com/br/busca?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
12+
<string name="searchurl_justwatchca">https://www.justwatch.com/ca/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
13+
<string name="searchurl_justwatchde">https://www.justwatch.com/de/Suche?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
14+
<string name="searchurl_justwatches">https://www.justwatch.com/es/buscar?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
15+
<string name="searchurl_justwatchfi">https://www.justwatch.com/fi/buscar?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
16+
<string name="searchurl_justwatchit">https://www.justwatch.com/it/cerca?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
17+
<string name="searchurl_justwatchjp">https://www.justwatch.com/jp/検索?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
18+
<string name="searchurl_justwatchnz">https://www.justwatch.com/nz/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
19+
<string name="searchurl_justwatchru">https://www.justwatch.com/ru/поиск?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
20+
<string name="searchurl_justwatchuk">https://www.justwatch.com/uk/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
21+
<string name="searchurl_justwatchus">https://www.justwatch.com/us/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
22+
<string name="searchurl_swyrltv">https://www.swyrl.tv/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
23+
<string name="searchurl_streamcatcherde">http://www.streamcatcher.de/suchergebnis?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
2024
</resources>

‎app/src/main/res/values/array.xml‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,35 @@
11
<resources>
22
<string-array name="streamServiceArray">
3-
<item>Canistream.it (US)</item>
4-
<item>Justwatch.com (US)</item>
5-
<item>Justwatch.com (DE)</item>
6-
<item>Justwatch.com (CA)</item>
7-
<item>Justwatch.com (UK)</item>
8-
<item>Justwatch.com (BR)</item>
93
<item>Justwatch.com (AU)</item>
4+
<item>Justwatch.com (BR)</item>
5+
<item>Justwatch.com (CA)</item>
6+
<item>Justwatch.com (DE)</item>
7+
<item>Justwatch.com (ES)</item>
8+
<item>Justwatch.com (FI)</item>
9+
<item>Justwatch.com (IT)</item>
10+
<item>Justwatch.com (JP)</item>
1011
<item>Justwatch.com (NZ)</item>
12+
<item>Justwatch.com (RU)</item>
13+
<item>Justwatch.com (UK)</item>
14+
<item>Justwatch.com (US)</item>
1115
<item>WerStreamt.es (DE)</item>
1216
<item>Swyrl.tv (DE)</item>
1317
<item>Streamcatcher.de (DE)</item>
1418
</string-array>
1519

1620
<string-array name="streamServiceValues">
17-
<item>canistreamit</item>
18-
<item>justwatchus</item>
19-
<item>justwatchde</item>
20-
<item>justwatchca</item>
21-
<item>justwatchuk</item>
22-
<item>justwatchbr</item>
2321
<item>justwatchau</item>
22+
<item>justwatchbr</item>
23+
<item>justwatchca</item>
24+
<item>justwatchde</item>
25+
<item>justwatches</item>
26+
<item>justwatchfi</item>
27+
<item>justwatchit</item>
28+
<item>justwatchjp</item>
2429
<item>justwatchnz</item>
30+
<item>justwatchru</item>
31+
<item>justwatchuk</item>
32+
<item>justwatchus</item>
2533
<item>werstreamtes</item>
2634
<item>swyrltv</item>
2735
<item>streamcatcherde</item>

‎app/src/main/res/values/strings.xml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,19 @@
66
<string name="setting_select_service">Select streaming search service</string>
77
<string name="setting_select_service_title">Streaming search service</string>
88

9-
<string name="searchurl_werstreamtes">https://www.werstreamt.es/filme-serien/?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
10-
<string name="searchurl_canistreamit">http://www.canistream.it/search/tv/</string>
11-
<string name="searchurl_justwatchus">https://www.justwatch.com/us/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
12-
<string name="searchurl_justwatchde">https://www.justwatch.com/de/Suche?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
13-
<string name="searchurl_justwatchca">https://www.justwatch.com/ca/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
14-
<string name="searchurl_justwatchuk">https://www.justwatch.com/uk/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
15-
<string name="searchurl_justwatchbr">https://www.justwatch.com/br/busca?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
16-
<string name="searchurl_justwatchau">https://www.justwatch.com/au/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
17-
<string name="searchurl_justwatchnz">https://www.justwatch.com/nz/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
18-
<string name="searchurl_swyrltv">https://www.swyrl.tv/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
19-
<string name="searchurl_streamcatcherde">http://www.streamcatcher.de/suchergebnis?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder.app&amp;q=</string>
9+
<string name="searchurl_werstreamtes">https://www.werstreamt.es/filme-serien/?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
10+
<string name="searchurl_justwatchau">https://www.justwatch.com/au/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
11+
<string name="searchurl_justwatchbr">https://www.justwatch.com/br/busca?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
12+
<string name="searchurl_justwatchca">https://www.justwatch.com/ca/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
13+
<string name="searchurl_justwatchde">https://www.justwatch.com/de/Suche?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
14+
<string name="searchurl_justwatches">https://www.justwatch.com/es/buscar?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
15+
<string name="searchurl_justwatchfi">https://www.justwatch.com/fi/buscar?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
16+
<string name="searchurl_justwatchit">https://www.justwatch.com/it/cerca?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
17+
<string name="searchurl_justwatchjp">https://www.justwatch.com/jp/検索?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
18+
<string name="searchurl_justwatchnz">https://www.justwatch.com/nz/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
19+
<string name="searchurl_justwatchru">https://www.justwatch.com/ru/поиск?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
20+
<string name="searchurl_justwatchuk">https://www.justwatch.com/uk/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
21+
<string name="searchurl_justwatchus">https://www.justwatch.com/us/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
22+
<string name="searchurl_swyrltv">https://www.swyrl.tv/search?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
23+
<string name="searchurl_streamcatcherde">http://www.streamcatcher.de/suchergebnis?utm_source=app&amp;utm_medium=extension&amp;utm_campaign=de.schloebe.seriesguide.streamingfinder&amp;q=</string>
2024
</resources>

‎build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
buildscript {
22
repositories {
3+
jcenter()
34
mavenCentral()
45
}
56
dependencies {
6-
classpath 'com.android.tools.build:gradle:1.0.0'
7+
classpath 'com.android.tools.build:gradle:2.2.3'
78
}
89
}
910

1011
allprojects {
1112
repositories {
13+
jcenter()
1214
mavenCentral()
1315
}
1416
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Feb 16 16:03:42 CET 2015
1+
#Mon Dec 26 17:18:24 CET 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

0 commit comments

Comments
 (0)