From 72575ee22606748c4f231574925363d09a90078f Mon Sep 17 00:00:00 2001 From: Kilian Holzinger Date: Thu, 21 Nov 2013 10:46:41 +0100 Subject: [PATCH 1/2] Removed bug(sense) in TumCampus. So we can build it again. --- metadata/de.tum.in.tumcampus.txt | 14 +-- metadata/de.tum.in.tumcampus/bugsense.patch | 113 ++++++++++++++++++++ 2 files changed, 120 insertions(+), 7 deletions(-) create mode 100644 metadata/de.tum.in.tumcampus/bugsense.patch diff --git a/metadata/de.tum.in.tumcampus.txt b/metadata/de.tum.in.tumcampus.txt index d31c92ba0f..974312e807 100644 --- a/metadata/de.tum.in.tumcampus.txt +++ b/metadata/de.tum.in.tumcampus.txt @@ -1,4 +1,3 @@ -Disabled:Proprietary binaries Categories:Internet License:GPLv3 or New BSD Web Site:https://apps.wiki.tum.de/TUM+Campus+App @@ -20,19 +19,20 @@ This app displays: * Important links * RSS-feeds * Automatic muting of the phone during lectures +* Access to TUMonline +Bugsense has been removed for F-droid distribution. Status: Active Development. . Repo Type:git Repo:https://github.com/TCA-Team/TumCampusApp.git -Build Version:1.1,30,bcb179eb0d45ad697b350c1ba01ea4e79d626e55,subdir=TumCampusApp,prebuild=find src/ -type f |xargs -n 1 perl -pi -e "s/.*package(?=\W)/package/g" && \ -sed -i '30s/package:/Uri uri = Uri.parse("package:/g' src/de/tum/in/tumcampusapp/tumonline/TUMOnlineConst.java +Build Version:0.1.1,31,112dd285e2bcf218ed0eca18f8fd79b9072cd83c,subdir=TumCampusApp,patch=bugsense.patch,prebuild=find src/ -type f |xargs -n 1 perl -pi -e "s/.*package(?=\W)/package/g" && \ +sed -i '30s/package:/Uri uri = Uri.parse("package:/g' src/de/tum/in/tumcampusapp/tumonline/TUMOnlineConst.java &&\ +rm libs/bugsense* + Auto Update Mode:None -Update Check Mode:Static -Current Version:1.1 -Current Version Code:30 - +Update Check Mode:RepoManifest diff --git a/metadata/de.tum.in.tumcampus/bugsense.patch b/metadata/de.tum.in.tumcampus/bugsense.patch new file mode 100644 index 0000000000..34f3fe81eb --- /dev/null +++ b/metadata/de.tum.in.tumcampus/bugsense.patch @@ -0,0 +1,113 @@ +--- a/TumCampusApp/src/de/tum/in/tumcampusapp/activities/StartupActivity.java 2013-11-21 10:28:57.939199642 +0100 ++++ b/TumCampusApp/src/de/tum/in/tumcampusapp/activities/StartupActivity.java 2013-11-21 10:32:40.003212529 +0100 +@@ -1,53 +1,57 @@ +-package de.tum.in.tumcampusapp.activities; +- +-import android.app.Activity; +-import android.content.Intent; +-import android.os.Bundle; +-import android.os.StrictMode; +-import android.util.Log; +- +-import com.bugsense.trace.BugSenseHandler; +- +-import de.tum.in.tumcampusapp.auxiliary.DemoModeStartActivity; +- +-/** +- * Entrance point of the App. +- * +- * @author Sascha Moecker +- * +- */ +-public class StartupActivity extends Activity { +- public static final boolean DEMO_MODE = false; +- public static final boolean TRACK_ERRORS_WITH_BUG_SENSE = true; +- +- @Override +- protected void onCreate(Bundle savedInstanceState) { +- super.onCreate(savedInstanceState); +- +- // Init a Bug Report to https://www.bugsense.com +- if (TRACK_ERRORS_WITH_BUG_SENSE) { +- Log.d(this.getClass().getSimpleName(), "BugSense initialized"); +- BugSenseHandler.initAndStartSession(this, "19d18764"); +- } +- +- // Workaround for new API version. There was a security update which +- // disallows applications to execute HTTP request in the GUI main +- // thread. +- if (android.os.Build.VERSION.SDK_INT > 8) { +- StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder() +- .permitAll().build(); +- StrictMode.setThreadPolicy(policy); +- } +- +- // Start the demo Activity if demo mode is set +- if (DEMO_MODE) { +- Intent intent = new Intent(this, DemoModeStartActivity.class); +- startActivity(intent); +- finish(); +- } else { +- Intent intent = new Intent(this, StartActivity.class); +- startActivity(intent); +- finish(); +- } +- } +-} ++package de.tum.in.tumcampusapp.activities; ++ ++import android.app.Activity; ++import android.content.Intent; ++import android.os.Bundle; ++import android.os.StrictMode; ++import android.util.Log; ++ ++ ++ ++//import com.bugsense.trace.BugSenseHandler; ++//Goodbye! ++ ++ ++import de.tum.in.tumcampusapp.auxiliary.DemoModeStartActivity; ++ ++/** ++ * Entrance point of the App. ++ * ++ * @author Sascha Moecker ++ * ++ */ ++public class StartupActivity extends Activity { ++ public static final boolean DEMO_MODE = false; ++ public static final boolean TRACK_ERRORS_WITH_BUG_SENSE = true; ++ ++ @Override ++ protected void onCreate(Bundle savedInstanceState) { ++ super.onCreate(savedInstanceState); ++ ++ // Init a Bug Report to https://www.bugsense.com ++// if (TRACK_ERRORS_WITH_BUG_SENSE) { ++// Log.d(this.getClass().getSimpleName(), "BugSense initialized"); ++// BugSenseHandler.initAndStartSession(this, "19d18764"); ++// } ++ ++ // Workaround for new API version. There was a security update which ++ // disallows applications to execute HTTP request in the GUI main ++ // thread. ++ if (android.os.Build.VERSION.SDK_INT > 8) { ++ StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder() ++ .permitAll().build(); ++ StrictMode.setThreadPolicy(policy); ++ } ++ ++ // Start the demo Activity if demo mode is set ++ if (DEMO_MODE) { ++ Intent intent = new Intent(this, DemoModeStartActivity.class); ++ startActivity(intent); ++ finish(); ++ } else { ++ Intent intent = new Intent(this, StartActivity.class); ++ startActivity(intent); ++ finish(); ++ } ++ } ++} From 144695939ba0b8ed6ebad300aa2231cf13ac6695 Mon Sep 17 00:00:00 2001 From: Kilian Holzinger Date: Sat, 23 Nov 2013 16:36:15 +0100 Subject: [PATCH 2/2] TUMCampus: Better .diff file and newest version --- metadata/de.tum.in.tumcampus.txt | 2 +- metadata/de.tum.in.tumcampus/bugsense.patch | 138 ++++---------------- 2 files changed, 30 insertions(+), 110 deletions(-) diff --git a/metadata/de.tum.in.tumcampus.txt b/metadata/de.tum.in.tumcampus.txt index 974312e807..92b3f50a7c 100644 --- a/metadata/de.tum.in.tumcampus.txt +++ b/metadata/de.tum.in.tumcampus.txt @@ -28,7 +28,7 @@ Status: Active Development. Repo Type:git Repo:https://github.com/TCA-Team/TumCampusApp.git -Build Version:0.1.1,31,112dd285e2bcf218ed0eca18f8fd79b9072cd83c,subdir=TumCampusApp,patch=bugsense.patch,prebuild=find src/ -type f |xargs -n 1 perl -pi -e "s/.*package(?=\W)/package/g" && \ +Build Version:1.1.2,32,956e42b30a092a28c1748f5152d6779ca4399100,subdir=TumCampusApp,patch=bugsense.patch,prebuild=find src/ -type f |xargs -n 1 perl -pi -e "s/.*package(?=\W)/package/g" && \ sed -i '30s/package:/Uri uri = Uri.parse("package:/g' src/de/tum/in/tumcampusapp/tumonline/TUMOnlineConst.java &&\ rm libs/bugsense* diff --git a/metadata/de.tum.in.tumcampus/bugsense.patch b/metadata/de.tum.in.tumcampus/bugsense.patch index 34f3fe81eb..c917c30157 100644 --- a/metadata/de.tum.in.tumcampus/bugsense.patch +++ b/metadata/de.tum.in.tumcampus/bugsense.patch @@ -1,113 +1,33 @@ ---- a/TumCampusApp/src/de/tum/in/tumcampusapp/activities/StartupActivity.java 2013-11-21 10:28:57.939199642 +0100 -+++ b/TumCampusApp/src/de/tum/in/tumcampusapp/activities/StartupActivity.java 2013-11-21 10:32:40.003212529 +0100 -@@ -1,53 +1,57 @@ --package de.tum.in.tumcampusapp.activities; -- --import android.app.Activity; --import android.content.Intent; --import android.os.Bundle; --import android.os.StrictMode; --import android.util.Log; -- +--- a/TumCampusApp/src/de/tum/in/tumcampusapp/activities/StartupActivity.java 2013-11-23 12:45:50.093747730 +0100 ++++ b/TumCampusApp/src/de/tum/in/tumcampusapp/activities/StartupActivity.java 2013-11-23 16:31:20.752918783 +0100 +@@ -6,7 +6,7 @@ + import android.os.StrictMode; + import android.util.Log; + -import com.bugsense.trace.BugSenseHandler; -- --import de.tum.in.tumcampusapp.auxiliary.DemoModeStartActivity; -- --/** -- * Entrance point of the App. -- * -- * @author Sascha Moecker -- * -- */ --public class StartupActivity extends Activity { -- public static final boolean DEMO_MODE = false; ++//import com.bugsense.trace.BugSenseHandler; + + import de.tum.in.tumcampusapp.auxiliary.DemoModeStartActivity; + +@@ -18,18 +18,18 @@ + */ + public class StartupActivity extends Activity { + public static final boolean DEMO_MODE = false; - public static final boolean TRACK_ERRORS_WITH_BUG_SENSE = true; -- -- @Override -- protected void onCreate(Bundle savedInstanceState) { -- super.onCreate(savedInstanceState); -- ++ public static final boolean TRACK_ERRORS_WITH_BUG_SENSE = false; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + - // Init a Bug Report to https://www.bugsense.com -- if (TRACK_ERRORS_WITH_BUG_SENSE) { -- Log.d(this.getClass().getSimpleName(), "BugSense initialized"); -- BugSenseHandler.initAndStartSession(this, "19d18764"); -- } ++ /** Init a Bug Report to https://www.bugsense.com + if (TRACK_ERRORS_WITH_BUG_SENSE) { + Log.d(this.getClass().getSimpleName(), "BugSense initialized"); + BugSenseHandler.initAndStartSession(this, "19d18764"); + } - -- // Workaround for new API version. There was a security update which -- // disallows applications to execute HTTP request in the GUI main -- // thread. -- if (android.os.Build.VERSION.SDK_INT > 8) { -- StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder() -- .permitAll().build(); -- StrictMode.setThreadPolicy(policy); -- } -- -- // Start the demo Activity if demo mode is set -- if (DEMO_MODE) { -- Intent intent = new Intent(this, DemoModeStartActivity.class); -- startActivity(intent); -- finish(); -- } else { -- Intent intent = new Intent(this, StartActivity.class); -- startActivity(intent); -- finish(); -- } -- } --} -+package de.tum.in.tumcampusapp.activities; -+ -+import android.app.Activity; -+import android.content.Intent; -+import android.os.Bundle; -+import android.os.StrictMode; -+import android.util.Log; -+ -+ -+ -+//import com.bugsense.trace.BugSenseHandler; -+//Goodbye! -+ -+ -+import de.tum.in.tumcampusapp.auxiliary.DemoModeStartActivity; -+ -+/** -+ * Entrance point of the App. -+ * -+ * @author Sascha Moecker -+ * -+ */ -+public class StartupActivity extends Activity { -+ public static final boolean DEMO_MODE = false; -+ public static final boolean TRACK_ERRORS_WITH_BUG_SENSE = true; -+ -+ @Override -+ protected void onCreate(Bundle savedInstanceState) { -+ super.onCreate(savedInstanceState); -+ -+ // Init a Bug Report to https://www.bugsense.com -+// if (TRACK_ERRORS_WITH_BUG_SENSE) { -+// Log.d(this.getClass().getSimpleName(), "BugSense initialized"); -+// BugSenseHandler.initAndStartSession(this, "19d18764"); -+// } -+ -+ // Workaround for new API version. There was a security update which -+ // disallows applications to execute HTTP request in the GUI main -+ // thread. -+ if (android.os.Build.VERSION.SDK_INT > 8) { -+ StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder() -+ .permitAll().build(); -+ StrictMode.setThreadPolicy(policy); -+ } -+ -+ // Start the demo Activity if demo mode is set -+ if (DEMO_MODE) { -+ Intent intent = new Intent(this, DemoModeStartActivity.class); -+ startActivity(intent); -+ finish(); -+ } else { -+ Intent intent = new Intent(this, StartActivity.class); -+ startActivity(intent); -+ finish(); -+ } -+ } -+} ++**/ + // Workaround for new API version. There was a security update which + // disallows applications to execute HTTP request in the GUI main + // thread.